Section_edit: Add lead paragraph edit

400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_wkr.java

@@ -96,7 +96,7 @@ public class Xoh_page_wtr_wkr {
 		fmtr.Bld_bfr_many(bfr
 		, root_dir_bry, Xoa_app_.Version, Xoa_app_.Build_date, app.Tcp_server().Running_str()
 		, page.Db().Page().Id(), page.Ttl().Full_db()
-		, page_name, page.Html_data().Page_heading().Init(page.Html_data(), page_display_title)
+		, page_name, page.Html_data().Page_heading().Init(wiki, html_gen_tid == Xopg_page_.Tid_read, page.Html_data(), page.Ttl().Full_db(), page_display_title)
 		, modified_on_msg
 		, mgr.Css_common_bry(), mgr.Css_wiki_bry(), page.Html_data().Head_mgr().Init(app, wiki, page).Init_dflts()
 		, page.Lang().Dir_ltr_bry(), page.Html_data().Indicators(), page_content_sub, wiki.Html_mgr().Portal_mgr().Div_jump_to(), wiki.Xtn_mgr().Xtn_pgbnr().Write_html(page, ctx, hctx), page_body_class, html_content_editable

400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_html.java

@@ -66,8 +66,10 @@ public class Xoh_hdr_html {
 				bfr.Add(Gfh_tag_.Span_rhs);									// '</span>'
 
 			// write section editable
-			if (wiki.Parser_mgr().Hdr__section_editable__mgr().Enabled())
+			if (wiki.Parser_mgr().Hdr__section_editable__mgr().Enabled()) {
-				wiki.Parser_mgr().Hdr__section_editable__mgr().Write_html(bfr, src, page.Ttl().Full_db(), hdr, toc_itm.Anch());
+				byte[] section_key = toc_itm.Anch();
+				wiki.Parser_mgr().Hdr__section_editable__mgr().Write_html(bfr, page.Ttl().Full_db(), section_key, section_key);
+			}
 
 			bfr.Add(Bry__hdr_rhs_bgn).Add_int(hdr_num, 1, 1);				// '</h', '2'
 			bfr.Add(Bry__hdr_rhs_end);										// '>\n'

400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list.java

@@ -39,47 +39,58 @@ class Xop_section_list implements Xomw_hdr_cbk {
 		return this;
 	}
 	public byte[] Slice_bry_or_null(byte[] key) {
-		// find section matching key
+		int[] bounds = Get_section_bounds(key);
-		Xop_section_itm itm = (Xop_section_itm)hash.Get_by(key);
+		if (bounds == null) return null;	// handle missing key
-		if (itm == null) return null;
 
-		int src_bgn = Get_src_bgn(itm.Src_bgn());
+		// return slice
-		int src_end = Get_src_end(itm);
+		return Bry_.Mid(src, bounds[0], bounds[1]);
-
-		return Bry_.Mid(src, src_bgn, src_end);
 	}
 	public byte[] Merge_bry_or_null(byte[] key, byte[] edit) {
-		// find section matching key
+		int[] bounds = Get_section_bounds(key);
-		Xop_section_itm itm = (Xop_section_itm)hash.Get_by(key);
+		if (bounds == null) return null;	// handle missing key
-		if (itm == null) return null;
-
-		int src_bgn = Get_src_bgn(itm.Src_bgn());
-		int src_end = Get_src_end(itm);
 
 		// merge edit into orig
 		Bry_bfr bfr = Bry_bfr_.New();
-		bfr.Add_mid(src, 0, src_bgn);
+		bfr.Add_mid(src, 0, bounds[0]);
 		bfr.Add(edit);
-		bfr.Add_mid(src, src_end, src.length);
+		bfr.Add_mid(src, bounds[1], src.length);
 
 		return bfr.To_bry_and_clear();
 	}
-	private int Get_src_bgn(int src_bgn) {
+	private int[] Get_section_bounds(byte[] key) {
-		if (src[src_bgn] == Byte_ascii.Nl) src_bgn++;
+		int src_bgn = -1, src_end = -1;
-		return src_bgn;
-	}
-	private int Get_src_end(Xop_section_itm itm) {
-		int src_end = -1;	// default to last
 		int hash_len = hash.Len();
-		for (int i = itm.Idx() + 1; i < hash_len; i++) {
+
-			Xop_section_itm nxt = (Xop_section_itm)hash.Get_at(i);
+		// if key == "", get lead section
-			if (nxt.Num() > itm.Num()) continue;	// skip headers that are at lower level; EX: == H2 == should skip === H3 ===
+		if (Bry_.Eq(key, Bry_.Empty)) {
-			src_end = nxt.Src_bgn();
+			src_bgn = 0;
-			break;
+			src_end = src.length;
+			if (hash_len > 0) {
+				Xop_section_itm itm = (Xop_section_itm)hash.Get_at(0);
+				src_end = itm.Src_bgn();	// -1 to skip "\n" in "\n=="
+			}
 		}
-		if (src_end == -1) src_end = src.length;	// no headers found; default to EOS
+		// else, get section matching key
-		src_end = Bry_find_.Find_bwd__skip_ws(src, src_end, itm.Src_bgn());
+		else {
-		return src_end;
+			Xop_section_itm itm = (Xop_section_itm)hash.Get_by(key);
+			if (itm == null) return null;
+
+			// get bgn
+			src_bgn = itm.Src_bgn();
+			if (src[src_bgn] == Byte_ascii.Nl) src_bgn++;	// skip "\n" in "\n=="
+
+			// get end
+			for (int i = itm.Idx() + 1; i < hash_len; i++) {
+				Xop_section_itm nxt = (Xop_section_itm)hash.Get_at(i);
+				if (nxt.Num() > itm.Num()) continue;	// skip headers that are at lower level; EX: == H2 == should skip === H3 ===
+				src_end = nxt.Src_bgn();
+				break;
+			}
+			if (src_end == -1) src_end = src.length;	// no headers found; default to EOS
+			src_end = Bry_find_.Find_bwd__skip_ws(src, src_end, src_bgn);	// always remove ws at end
+		}
+
+		return new int[] {src_bgn, src_end};
 	}
 	public void On_hdr_seen(Xomw_parser_ctx pctx, Xomw_hdr_wkr wkr) {
 		// get key by taking everything between ==; EX: "== abc ==" -> " abc "

400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list__merge__tst.java

@@ -141,4 +141,39 @@ public class Xop_section_list__merge__tst {
 		)
 		);
 	}
+	@Test   public void Lead() {
+		fxt.Exec__parse
+		( "lead para"
+		, ""
+		, "== Hdr 1 =="
+		, "Para 1"
+		);
+		fxt.Test__merge_bry_or_null("", String_.Concat_lines_nl_skip_last
+		( "lead para 1"
+		, ""
+		, "lead para 2"
+		), String_.Concat_lines_nl_skip_last
+		( "lead para 1"
+		, ""
+		, "lead para 2"
+		, "== Hdr 1 =="
+		, "Para 1"
+		)
+		);
+	}
+	@Test   public void Lead__new() {
+		fxt.Exec__parse
+		( "== Hdr 1 =="
+		, "Para 1"
+		);
+		fxt.Test__merge_bry_or_null("", String_.Concat_lines_nl_skip_last
+		( "lead para 1"
+		, ""
+		), String_.Concat_lines_nl_skip_last
+		( "lead para 1"
+		, "== Hdr 1 =="
+		, "Para 1"
+		)
+		);
+	}
 }

400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list__slice__tst.java

@@ -108,6 +108,40 @@ public class Xop_section_list__slice__tst {
 		, "Para 1"
 		));
 	}
+	@Test   public void Lead() {
+		fxt.Exec__parse
+		( "lead text"
+		, ""
+		, "== Hdr 1 =="
+		, "Para 1"
+		, ""
+		);
+		fxt.Test__slice_bry_or_null(""
+		, "lead text"
+		);
+	}
+	@Test   public void Lead__none() {
+		fxt.Exec__parse
+		( ""
+		, "== Hdr 1 =="
+		, "Para 1"
+		, ""
+		);
+		fxt.Test__slice_bry_or_null("");
+	}
+	@Test   public void Lead__eos() {
+		fxt.Exec__parse
+		( "lead text"
+		, ""
+		, "para 1"
+		, ""
+		);
+		fxt.Test__slice_bry_or_null(""
+		, "lead text"
+		, ""
+		, "para 1"
+		);
+	}
 }
 class Xop_section_list__fxt {
 	private final    Xop_section_list list = new Xop_section_list();

400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_mgr.java

@@ -67,15 +67,15 @@ public class Xop_section_mgr implements Gfo_invk {
 			throw Err_.new_wo_type("could not merge section_key", "page", url.To_str(), "section_key", section_key);
 		return rv;
 	}
-	public void Write_html(Bry_bfr bfr, byte[] src, byte[] page_ttl, Xop_hdr_tkn hdr, byte[] toc_text) {
+	public void Write_html(Bry_bfr bfr, byte[] page_ttl, byte[] section_key, byte[] section_hint) {
 		if (bry__edit_text == null) {	// LAZY: cannot call in Init_by_wiki b/c of circularity; section_mgr is init'd by parser_mgr which is init'd before msg_mgr which is used below
 			this.bry__edit_text = wiki.Msg_mgr().Val_by_key_obj("editlink");
 			this.fmt__edit_hint.Fmt_(String_.new_u8(wiki.Msg_mgr().Val_by_key_obj("editsectionhint")));
 		}
 
-		toc_text = wiki.Parser_mgr().Uniq_mgr().Convert(toc_text);	// need to swap out uniqs for Math; DATE:2016-12-09
+		section_key = wiki.Parser_mgr().Uniq_mgr().Convert(section_key);	// need to swap out uniqs for Math; DATE:2016-12-09
-		byte[] edit_hint = fmt__edit_hint.Bld_many_to_bry(tmp_bfr, toc_text);
+		byte[] edit_hint = fmt__edit_hint.Bld_many_to_bry(tmp_bfr, section_hint);
-		fmt__section_editable.Bld_many(bfr, page_ttl, toc_text, edit_hint, bry__edit_text);
+		fmt__section_editable.Bld_many(bfr, page_ttl, section_key, edit_hint, bry__edit_text);
 	}
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, gplx.xowa.htmls.core.wkrs.hdrs.Xoh_section_editable_.Cfg__section_editing__enabled)) enabled = m.ReadBool("v");

400_xowa/src/gplx/xowa/wikis/pages/Xopg_page_heading.java

@@ -19,16 +19,31 @@ package gplx.xowa.wikis.pages; import gplx.*; import gplx.xowa.*; import gplx.xo
 import gplx.core.brys.*; import gplx.core.brys.fmtrs.*;
 import gplx.xowa.wikis.pages.htmls.*;
 public class Xopg_page_heading implements Bfr_arg {
+	private Xowe_wiki wiki;
 	private Xopg_html_data html_data;
+	private byte[] ttl_full_db;
 	private byte[] display_title;
-	public Xopg_page_heading Init(Xopg_html_data html_data, byte[] display_title) {
+	private boolean mode_is_read;
+	public Xopg_page_heading Init(Xowe_wiki wiki, boolean mode_is_read, Xopg_html_data html_data, byte[] ttl_full_db, byte[] display_title) {
+		this.wiki = wiki;
+		this.mode_is_read = mode_is_read;
+		this.ttl_full_db = ttl_full_db;
 		this.html_data = html_data;
 		this.display_title = display_title;
 		return this;
 	}
 	public void Bfr_arg__add(Bry_bfr bfr) {
 		if (html_data.Xtn_pgbnr() != null) return;	// pgbnr exists; don't add title
-		fmtr.Bld_many(bfr, display_title);
+		byte[] edit_lead_section = Bry_.Empty;
+		if (	wiki.Parser_mgr().Hdr__section_editable__mgr().Enabled()
+			&&	mode_is_read) {
+			Bry_bfr tmp_bfr = Bry_bfr_.New();
+			wiki.Parser_mgr().Hdr__section_editable__mgr().Write_html(tmp_bfr, ttl_full_db, Bry_.Empty, Bry__lead_section_hint);
+			edit_lead_section = tmp_bfr.To_bry_and_clear();
+		}
+
+		fmtr.Bld_many(bfr, display_title, edit_lead_section);
 	}
-	private final    Bry_fmt fmtr = Bry_fmt.New(Bry_.New_u8_nl_apos("<h1 id='firstHeading' class='firstHeading'>~{page_title}</h1>"), "page_title");	// <span>~{page_title}</span>
+	private static final    byte[] Bry__lead_section_hint = Bry_.new_u8("(Lead)");
+	private final    Bry_fmt fmtr = Bry_fmt.Auto_nl_apos("<h1 id='firstHeading' class='firstHeading'>~{page_title}~{edit_lead_section}</h1>");	// <span>~{page_title}</span>
 }