Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Parser: Fix anchorencode for trailing lnki [#373]

Browse Source
This commit is contained in:
gnosygnu
2019-03-10 10:09:08 -04:00
parent dd750c6c4e
commit 91a100f154
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode_mgr.java
View File

@@ -76,18 +76,21 @@ public class Pfunc_anchorencode_mgr { // TS
tmp_bfr.Add_mid(src, lnke_sub.Src_bgn_grp(lnke, i), lnke_sub.Src_end_grp(lnke, i));
}
}
private static void Lnki(byte[] src, Xop_lnki_tkn lnki, Bry_bfr tmp_bfr) {
int src_end = lnki.Src_end();
int trg_end = lnki.Trg_tkn().Src_end();
if (trg_end == src_end - Xop_tkn_.Lnki_end_len) { // only trg
private static void Lnki(byte[] src, Xop_lnki_tkn lnki, Bry_bfr tmp_bfr) {
int trg_end = lnki.Trg_tkn().Src_end(); // pos after last trg char; EX: "]" in "[[A]]"; "|" in "[[A|b]]"
if (lnki.Pipe_count_is_zero()) { // trg only; EX: [[A]]
int trg_bgn = lnki.Trg_tkn().Src_bgn();
if (lnki.Ttl().ForceLiteralLink()) ++trg_bgn; // literal link; skip colon; EX: [[:a]] -> a
tmp_bfr.Add_mid(src, trg_bgn, trg_end);
if (lnki.Ttl().ForceLiteralLink()) // literal link; skip colon; EX: [[:a]] -> a
++trg_bgn;
// add trg only
tmp_bfr.Add_mid(src, trg_bgn, trg_end);
}
else {
tmp_bfr.Add_mid(src, trg_end + 1, src_end - Xop_tkn_.Lnki_end_len); //+1 is len of pipe
else { // trg + caption + other; EX: [[A|b]]; [[File:A.png|thumb|caption]]
tmp_bfr.Add_mid(src, trg_end + 1, lnki.Brack_end_pos()); //+1 is len of pipe
}
if (lnki.Tail_bgn() != -1)
tmp_bfr.Add_mid(src, lnki.Tail_bgn(), lnki.Tail_end());
}
private static void Xnde(Xop_ctx ctx, byte[] src, Xop_xnde_tkn xnde, Bry_bfr tmp_bfr) {
int subs_len = xnde.Subs_len();

1
400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode_tst.java
View File

@@ -24,6 +24,7 @@ public class Pfunc_anchorencode_tst {
@Test public void Lnki_trg() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a [[b]] c}}" , "{{test}}" , "a_b_c");}
@Test public void Lnki_caption() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a [[b|c]] c}}" , "{{test}}" , "a_c_c");}
@Test public void Lnki_file() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a [[Image:b|thumb|c]] d}}" , "{{test}}" , "a_thumb.7Cc_d");}
@Test public void Lnki_trailing() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a [[b]]c d}}" , "{{test}}" , "a_bc_d");}
@Test public void Xnde() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a <i>b</i> c}}" , "{{test}}" , "a_b_c");}
@Test public void Html_ncr() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a &#34; b}}" , "{{test}}" , "a_.22_b");}
@Test public void Html_ref() {fxt.Test_parse_tmpl_str_test("{{anchorencode:a &quot; b}}" , "{{test}}" , "a_.22_b");}

11
400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_uri.java
View File

@@ -47,11 +47,12 @@ public class Scrib_lib_uri implements Scrib_lib {
public boolean AnchorEncode(Scrib_proc_args args, Scrib_proc_rslt rslt) {
byte[] raw_bry = args.Pull_bry(0);
Bry_bfr bfr = core.Wiki().Utl__bfr_mkr().Get_b512();
// Pfunc_anchorencode.Func_init(core.Ctx());
Pfunc_anchorencode.Anchor_encode(bfr, core.Ctx(), raw_bry);
// Bry_bfr tmp_bfr = core.Wiki().Utl__bfr_mkr().Get_b512();
// tmp_bfr.Clear_and_rls();
return rslt.Init_obj(bfr.To_str_and_rls());
try {
Pfunc_anchorencode.Anchor_encode(bfr, core.Ctx(), raw_bry);
return rslt.Init_obj(bfr.To_str_and_rls());
} finally {
bfr.Mkr_rls();
}
}
public boolean Url_func(Scrib_proc_args args, Scrib_proc_rslt rslt, byte url_tid) {
Xowe_wiki wiki = core.Wiki();