Source: Restore broken commit

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_html__hdump__tst.java

@@ -0,0 +1,48 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import org.junit.*;
+import gplx.xowa.htmls.core.htmls.*;
+public class Imap_html__hdump__tst {
+	@Before public void init() {fxt.Reset(); fxt.Fxt().Hctx_(Xoh_wtr_ctx.Hdump);} private final    Imap_xnde_html_fxt fxt = new Imap_xnde_html_fxt();
+	@Test  public void Basic() {
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|100x200px|a1"
+		, "circle 0 0 5 [[B|b1]]"
+		, "rect 0 0 4 8 [[C|c1]]"
+		, "desc none"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div class=\"thumb tright\">"
+		, "  <div class=\"thumbinner\" style=\"width:100px;\">"	// NOTE:220px is default w for "non-found" thumb; DATE:2014-09-24
+		, "    <div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "        <area href=\"/wiki/B\" shape=\"circle\" coords=\"0,0,5\" alt=\"b1\" title=\"b1\"/>"
+		, "        <area href=\"/wiki/C\" shape=\"rect\" coords=\"0,0,4,8\" alt=\"c1\" title=\"c1\"/>"
+		, "      </map>"
+		, "      <img data-xowa-title=\"A.png\" data-xoimg=\"1|100|200|-1|-1|-1\" src=\"\" width=\"0\" height=\"0\" alt=\"\" usemap=\"#imagemap_1_1\"/>"
+		, "    </div>"
+		, "    <div class=\"thumbcaption\">"
+		,       "<div class=\"magnify\"><a href=\"/wiki/File:A.png\" class=\"internal\" title=\"Enlarge\"></a></div>a1"
+		, "    </div>"
+		, "  </div>"
+		, "</div>"
+		));
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_html__hview__tst.java

@@ -0,0 +1,208 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import org.junit.*; import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*;
+public class Imap_html__hview__tst {
+	@Before public void init() {fxt.Reset();} private final    Imap_xnde_html_fxt fxt = new Imap_xnde_html_fxt();
+	@Test  public void Basic() {
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|123px|a1"
+		, "circle 0 0 5 [[B|b1]]"
+		, "rect 0 0 4 8 [[C|c1]]"
+		, "desc none"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div class=\"thumb tright\">"
+		, "  <div id=\"xowa_file_div_0\" class=\"thumbinner\" style=\"width:220px;\">"	// NOTE:220px is default w for "non-found" thumb; DATE:2014-09-24
+		, "    <div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "        <area href=\"/wiki/B\" shape=\"circle\" coords=\"0,0,5\" alt=\"b1\" title=\"b1\"/>"
+		, "        <area href=\"/wiki/C\" shape=\"rect\" coords=\"0,0,4,8\" alt=\"c1\" title=\"c1\"/>"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "    </div>"
+		, "    <div class=\"thumbcaption\">"
+		,       "<div class=\"magnify\"><a href=\"/wiki/File:A.png\" class=\"internal\" title=\"Enlarge\"></a></div>a1"
+		, "    </div>"
+		, "  </div>"
+		, "</div>"
+		));
+	}
+	@Test  public void Caption_xml() {	// PURPOSE: xnde in caption was being escaped; PAGE:en.w:Council_of_Europe; DATE:2014-07-25
+		fxt.Test_html_full_frag("<imagemap>File:A.png|thumb|<b>c</b>\n</imagemap>", "<b>c</b>");
+	}
+	@Test  public void Default() {
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|123px|a1"
+		, "default [[B|b1]]"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div class=\"thumb tright\">"
+		, "  <div id=\"xowa_file_div_0\" class=\"thumbinner\" style=\"width:220px;\">"	// NOTE:220px is default w for "non-found" thumb; DATE:2014-09-24
+		, "    <div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "      </map>"
+		, "      <a href=\"/wiki/B\" title=\"b1\">"
+		, "        <img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "      </a>"
+		, "    </div>"
+		, "    <div class=\"thumbcaption\">"
+		,       "<div class=\"magnify\"><a href=\"/wiki/File:A.png\" class=\"internal\" title=\"Enlarge\"></a></div>a1"
+		, "    </div>"
+		, "  </div>"
+		, "</div>"
+		));
+	}
+	@Test  public void Desc() {
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|123px|a1"
+		, "desc top-left"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div id=\"imap_div_0\" class=\"noresize\" style=\"height:0px; width: 123px;\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"a1\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "      <div style=\"margin-left:0px; margin-top:1px; text-align:left;\">"
+		, "        <a href=\"/wiki/File:A.png\" title=\"click here\">"
+		, "          <img alt=\"click here\" src=\"file:///mem/xowa/bin/any/xowa/xtns/ImageMap/imgs/desc-20.png\" style=\"border: none;\" />"
+		, "        </a>"
+		, "      </div>"
+		, "    </div>"
+		));
+	}
+	@Test  public void Lnke() {	// PURPOSE: handle shapes with lnke; PAGE:en.w:Cholesterolt DATE:2014-07-25
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|123px|a1"
+		, "circle 0 0 5 [[http://b.org b1]]"
+		, "desc none"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div class=\"thumb tright\">"
+		, "  <div id=\"xowa_file_div_0\" class=\"thumbinner\" style=\"width:220px;\">"	// NOTE:220px is default w for "non-found" thumb; DATE:2014-09-24
+		, "    <div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "        <area href=\"http://b.org\" shape=\"circle\" coords=\"0,0,5\" alt=\"b1\" title=\"b1\"/>"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "    </div>"
+		, "    <div class=\"thumbcaption\">"
+		,       "<div class=\"magnify\"><a href=\"/wiki/File:A.png\" class=\"internal\" title=\"Enlarge\"></a></div>a1"
+		, "    </div>"
+		, "  </div>"
+		, "</div>"
+		));
+	}
+	@Test  public void Err_trailing_ws() {	// PURPOSE: empty 1st line causes failure
+		fxt.Test_html_full_frag(String_.Concat_lines_nl_skip_last
+		( "<imagemap> "
+		, "File:A.png|thumb|test_caption"
+		, "</imagemap>"
+		), "test_caption"		// no error if test_caption appears; 
+		);
+	}
+	@Test  public void Para_omitted() {	// PURPOSE: imagemap should not be automatically enclosed in para; PAGE:cs.w:Seznam_clenu_ctrn<72>ct<63>ho_Knesetu; DATE:2014-05-08;
+		fxt.Fxt().Init_para_y_();
+		fxt.Test_html_full_str("<imagemap>File:A.png</imagemap> a", fxt.Frag_html_full() + " a"); // NOTE: "a" no longer enclosed in <p>; DATE:2014-07-25
+		fxt.Fxt().Init_para_n_();
+	}
+	@Test  public void Xnde_double_pipe() {// PURPOSE: if || is inside table and imagemap, treat as lnki; EX:w:United_States_presidential_election,_1992; DATE:2014-03-29; DATE:2014-05-06
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "{|"
+		, "|-"
+		, "| z"
+		, "<imagemap>"
+		, "File:A.png||123px|b"	// NOTE: "||" should not be tblw; also should not be pipe + text; if it is pipe + text, then caption will be "|123px" and width will be -1; DATE:2014-05-06
+		, "</imagemap>"
+		, "|}"
+		) , String_.Concat_lines_nl_skip_last
+		( "<table>"
+		, "  <tr>"
+		, "    <td> z"
+		, "<div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"b\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"	// NOTE: width must be 123, not 0
+		, "    </div>"
+		, "    </td>"
+		, "  </tr>"
+		, "</table>"
+		, ""
+		)
+		);
+	}
+	@Test  public void Template_image() {	// PURPOSE: handle templates in caption; PAGE:en.w:Kilauea; DATE:2014-07-27
+		fxt.Fxt().Init_page_create("Template:Test_template", "xyz");
+		fxt.Test_html_full_frag("<imagemap>File:A.png|thumb|{{Test_template}}\n</imagemap>", "xyz");
+	}
+	@Test  public void Template_shape() {	// PURPOSE: handle templates in shape; PAGE:fr.w:Arrondissements_de_Lyon DATE:2014-08-12
+		fxt.Fxt().Init_page_create("Template:B1", "<b>b1</b>");	// note that an xnde is a better example as it will throw ArrayOutOfBounds error
+		fxt.Test_html_full_str(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|123px|a1"
+		, "circle 0 0 5 [[B|{{b1}}]]"
+		, "desc none"
+		, "</imagemap>"
+		), String_.Concat_lines_nl_skip_last
+		( "<div class=\"thumb tright\">"
+		, "  <div id=\"xowa_file_div_0\" class=\"thumbinner\" style=\"width:220px;\">"	// NOTE:220px is default w for "non-found" thumb; DATE:2014-09-24
+		, "    <div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "        <area href=\"/wiki/B\" shape=\"circle\" coords=\"0,0,5\" alt=\"b1\" title=\"b1\"/>"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/thumb/7/0/A.png/123px.png\" width=\"123\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "    </div>"
+		, "    <div class=\"thumbcaption\">"
+		,       "<div class=\"magnify\"><a href=\"/wiki/File:A.png\" class=\"internal\" title=\"Enlarge\"></a></div>a1"
+		, "    </div>"
+		, "  </div>"
+		, "</div>"
+		));
+	}
+	@Test  public void Template_multi_line() {	// PURPOSE: handle multiple-line captions; PAGE:en.w:Archaea; DATE:2014-08-22			
+		fxt.Test_html_full_frag(String_.Concat_lines_nl_skip_last
+		( "<imagemap>"
+		, "File:A.png|thumb|<ref>text"
+		, "</ref>"
+		, "</imagemap>"
+		), "id=\"cite_ref-0\"");
+	}
+}
+class Imap_xnde_html_fxt {
+	public void Reset() {
+		fxt.Reset();
+		Xol_msg_itm msg = fxt.Wiki().Msg_mgr().Get_or_make(Bry_.new_a7("imagemap_description"));
+		msg.Atrs_set(Bry_.new_a7("click here"), false, false);
+	}
+	public Xop_fxt Fxt() {return fxt;} private final    Xop_fxt fxt = new Xop_fxt();
+	public void Test_html_full_str(String raw, String expd) {fxt.Test_html_full_str(raw, expd);}
+	public void Test_html_full_frag(String raw, String expd) {fxt.Test_html_full_frag(raw, expd);}
+	public String Frag_html_full() {
+		return String_.Concat_lines_nl_skip_last
+		( "<div id=\"imap_div_0\" class=\"noresize\">"
+		, "      <map name=\"imageMap_1_1\">"
+		, "      </map>"
+		, "      <img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/orig/7/0/A.png\" width=\"0\" height=\"0\" usemap=\"#imageMap_1_1\"/>"
+		, "    </div>"
+		);
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_html_fmtrs.java

@@ -0,0 +1,65 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import gplx.core.brys.fmtrs.*;
+public class Imap_html_fmtrs {
+	public static final    Bry_fmtr
+	  All = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( "<div id=\"imap_div_~{imap_id}\" class=\"noresize\"~{desc_style}>~{map}~{img}"
+	, "    </div>"
+	), "imap_id", "desc_style", "map", "img"
+	)
+	, Map = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( ""
+	, "      <map name=\"imageMap_1_~{imap_id}\">~{shapes}"
+	, "      </map>"
+	), "imap_id", "shapes"
+	)
+	, Area = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( "\n        <area href=\"~{href}\" shape=\"~{shape}\" coords=\"~{coords}\" alt=\"~{title}\" title=\"~{title}\"/>"
+	), "href", "shape", "coords", "title")
+	, Img_anchor_none = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( ""
+	, "      <img id=\"xoimg_~{img_elem_id}\" alt=\"~{img_alt}\"~{img_core}~{img_cls} usemap=\"#imageMap_1_~{imap_id}\"/>"
+	), "imap_id", "img_elem_id", "img_alt", "img_core", "img_cls", "anchor_href", "anchor_title"
+	)
+	, Img_anchor_lnki = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( ""
+	, "      <a href=\"~{anchor_href}\" title=\"~{anchor_title}\">"
+	, "        <img id=\"xoimg_~{img_elem_id}\" alt=\"~{img_alt}\"~{img_core}~{img_cls} usemap=\"#imageMap_1_~{imap_id}\"/>"
+	, "      </a>"
+	), "imap_id", "img_elem_id", "img_alt", "img_core", "img_cls", "anchor_href", "anchor_title"
+	)
+	, Img_anchor_lnke = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( ""
+	, "      <a href=\"~{anchor_href}\" title=~{anchor_title} class=\"plainlinks\" rel=\"nofollow\">"
+	, "        <img id=\"xoimg_~{img_elem_id}\" alt=\"~{img_alt}\"~{img_core}~{img_cls} usemap=\"#imageMap_1_~{imap_id}\"/>"
+	, "      </a>"
+	), "imap_id", "img_elem_id", "img_alt", "img_core", "img_cls", "anchor_href", "anchor_title"
+	)
+	, Desc_style = Bry_fmtr.new_(" style=\"height:~{div_h}px; width: ~{div_w}px;\"", "div_w", "div_h")
+	, Desc_main = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	( ""
+	, "      <div style=\"margin-left:~{margin_left}px; margin-top:~{margin_top}px; text-align:left;\">"
+	, "        <a href=\"~{img_href}\" title=\"~{msg_desc}\">"
+	, "          <img alt=\"~{msg_desc}\" src=\"~{icon_url}\" style=\"border: none;\" />"
+	, "        </a>"
+	, "      </div>"
+	), "margin_left", "margin_top", "img_href", "msg_desc", "icon_url"
+	);
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_img_arg.java

@@ -0,0 +1,78 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import gplx.core.primitives.*; import gplx.core.brys.fmtrs.*;
+import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.langs.htmls.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.htmls.core.wkrs.imgs.*; import gplx.xowa.htmls.core.wkrs.imgs.atrs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.xtns.imaps.itms.*;
+public class Imap_img_arg implements gplx.core.brys.Bfr_arg {
+	private final    Xoh_wtr_ctx hctx; private final    Imap_map map; private final    Imap_xtn_mgr xtn_mgr;
+	private final    int img_elem_id, img_w, img_h;
+	private final    byte[] img_alt, img_src, img_cls, img_href, lnki_ttl;
+	private final    Int_2_ref margin_calc = new Int_2_ref();
+	private final    boolean orig_exists;
+	public Imap_img_arg(Xoh_wtr_ctx hctx, Imap_xtn_mgr xtn_mgr, Imap_map map
+		, int img_elem_id, byte[] img_alt, byte[] img_src, int img_w, int img_h, byte[] img_cls, byte[] img_href, byte[] lnki_ttl, boolean orig_exists) {
+		this.hctx = hctx; this.map = map; this.xtn_mgr = xtn_mgr;
+		this.img_elem_id = img_elem_id; this.img_w = img_w; this.img_h = img_h;
+		this.img_alt = img_alt; this.img_src = img_src; this.img_cls = img_cls; this.img_href = img_href;
+		this.lnki_ttl = lnki_ttl;
+		this.orig_exists = orig_exists;
+	}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		Bry_fmtr fmtr = Imap_html_fmtrs.Img_anchor_none;
+		byte[] anchor_href = Bry_.Empty, anchor_text = Bry_.Empty;
+		Imap_part_dflt itm_dflt = map.Dflt();
+		if (hctx.Mode_is_hdump()) {				
+			Bry_bfr tmp_bfr = Bry_bfr_.Get();
+			try {
+				byte[] data_xowa_image = Xoh_file_fmtr__hdump.Bld_xowa_image_data(tmp_bfr, Xop_lnki_type.Id_none, img_w, img_h, Xop_lnki_tkn.Upright_null, Xof_lnki_time.Null, Xof_lnki_page.Null);
+				byte[] data_xowa_title = Gfh_atr_.Make(tmp_bfr, Xoh_img_xoimg_data.Bry__data_xowa_title, lnki_ttl);
+				byte[] usemap = tmp_bfr.Add(Imap_xtn_mgr.Bry__usemap__html).Add_int_variable(map.Id()).Add_byte_quote().To_bry_and_clear();
+				int img_w_tmp = img_w; int img_h_tmp = img_h;
+				byte[] img_src_tmp = img_src;
+				if (orig_exists) {
+					data_xowa_image = data_xowa_title = Bry_.Empty;
+				}
+				else {
+					img_w_tmp = img_h_tmp = 0;
+					img_src_tmp = Bry_.Empty;
+				}
+				Xoh_file_fmtr__hdump.Add_anch_n(tmp_bfr, data_xowa_title, data_xowa_image, img_src_tmp, img_w_tmp, img_h_tmp, Xoh_img_cls_.Tid__none, Bry_.Empty, Bry_.Empty, usemap);
+				bfr.Add_byte_nl().Add_byte_repeat(Byte_ascii.Space, 6);
+				bfr.Add_bfr_and_clear(tmp_bfr);
+			} finally {tmp_bfr.Mkr_rls();}
+		}
+		else {
+			Xoh_arg_img_core img_core_fmtr = xtn_mgr.Img_core_arg();
+			img_core_fmtr.Init(img_elem_id, img_src, img_w, img_h);
+			if (itm_dflt != null) {
+				fmtr = itm_dflt.Link_tid() == Xop_tkn_itm_.Tid_lnki ? Imap_html_fmtrs.Img_anchor_lnki : Imap_html_fmtrs.Img_anchor_lnke;
+				anchor_href = itm_dflt.Link_href();
+				anchor_text = itm_dflt.Link_text();
+			}
+			fmtr.Bld_bfr_many(bfr, map.Id(), img_elem_id, img_alt, img_core_fmtr, img_cls, anchor_href, anchor_text);
+		}
+		Imap_part_desc itm_desc = map.Desc();
+		if (itm_desc != null) {
+			Imap_desc_tid.Calc_margins(margin_calc, itm_desc.Desc_tid(), img_w, img_h);
+			Imap_html_fmtrs.Desc_main.Bld_bfr_many(bfr, margin_calc.Val_0(), margin_calc.Val_1(), img_href, xtn_mgr.Desc_msg(), xtn_mgr.Desc_icon_url());
+		}
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_map_arg.java

@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import gplx.core.brys.fmtrs.*;
+import gplx.xowa.xtns.imaps.itms.*;
+public class Imap_map_arg implements gplx.core.brys.Bfr_arg {
+	private final    int imap_id;
+	private final    Imap_shapes_arg shapes_arg;
+	public Imap_map_arg(int imap_id, Imap_part_shape[] shapes, double scale) {
+		this.imap_id = imap_id;
+		this.shapes_arg = new Imap_shapes_arg(shapes, scale);
+	}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		Imap_html_fmtrs.Map.Bld_bfr_many(bfr, imap_id, shapes_arg);
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_shape_pts_arg.java

@@ -0,0 +1,36 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import gplx.core.primitives.*;
+public class Imap_shape_pts_arg implements gplx.core.brys.Bfr_arg {
+	private final    double scale; private Double_obj_val[] pts;
+	public Imap_shape_pts_arg(double scale) {
+		this.scale = scale;
+	}
+	public void Pts_(Double_obj_val[] v) {this.pts = v;}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		int pts_len = pts.length;
+		for (int i = 0; i < pts_len; ++i) {
+			Double_obj_val pt = pts[i];
+			int pt_int = (int)pt.Val();
+			pt_int = (int)Math_.Round(scale * pt_int, 0);
+			if (i != 0) bfr.Add_byte_comma();
+			bfr.Add_int_variable(pt_int);
+		}
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_shapes_arg.java

@@ -0,0 +1,42 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import gplx.xowa.xtns.imaps.itms.*; import gplx.core.brys.fmtrs.*;
+public class Imap_shapes_arg implements gplx.core.brys.Bfr_arg {
+	private final    Imap_part_shape[] shapes;
+	private final    Imap_shape_pts_arg pts_arg;
+	public Imap_shapes_arg(Imap_part_shape[] shapes, double scale) {
+		this.shapes = shapes;
+		this.pts_arg = new Imap_shape_pts_arg(scale);
+	}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		Bry_fmtr fmtr = Imap_html_fmtrs.Area;
+		int len = shapes.length;
+		for (int i = 0; i < len; ++i)
+			Fmt_shape(bfr, fmtr, pts_arg, shapes[i]);
+	}
+	public static void Fmt_shape(Bry_bfr bfr, Bry_fmtr fmtr, Imap_shape_pts_arg pts_arg, Imap_part_shape shape) {
+		pts_arg.Pts_(shape.Shape_pts());
+		fmtr.Bld_bfr_many(bfr
+		, shape.Link_href()
+		, Imap_part_.To_shape_key(shape.Part_tid())
+		, pts_arg
+		, shape.Link_text()
+		);
+	}
+}

400_xowa/src/gplx/xowa/xtns/imaps/htmls/Imap_shapes_arg_tst.java

@@ -0,0 +1,33 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.imaps.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.imaps.*;
+import org.junit.*; import gplx.xowa.xtns.imaps.itms.*;
+public class Imap_shapes_arg_tst {
+	@Before public void init() {fxt.Reset();} private Imap_shapes_arg_fxt fxt = new Imap_shapes_arg_fxt();
+	@Test  public void Rect()	{fxt.Test_shape_html(fxt.itm_rect_("[[A|b]]", 1, 2, 3, 4), "\n        <area href=\"/wiki/A\" shape=\"rect\" coords=\"1,2,3,4\" alt=\"b\" title=\"b\"/>");}
+	@Test  public void Circle() {fxt.Test_shape_html(fxt.itm_circle_("[[A|b]]", 1, 2, 3 ), "\n        <area href=\"/wiki/A\" shape=\"circle\" coords=\"1,2,3\" alt=\"b\" title=\"b\"/>");}
+	@Test  public void Poly()	{fxt.Test_shape_html(fxt.itm_poly_("[[A|b]]", 1, 2, 3, 4), "\n        <area href=\"/wiki/A\" shape=\"poly\" coords=\"1,2,3,4\" alt=\"b\" title=\"b\"/>");}
+}
+class Imap_shapes_arg_fxt extends Imap_base_fxt {
+	public void Test_shape_html(Imap_part_shape shape, String expd) {
+		Bry_bfr bfr = Bry_bfr_.New();
+		Imap_shape_pts_arg pts_fmtr_arg = new Imap_shape_pts_arg(1);
+		Imap_shapes_arg.Fmt_shape(bfr, Imap_html_fmtrs.Area, pts_fmtr_arg, shape);
+		Tfds.Eq(expd, bfr.To_str_and_clear());
+	}
+}