Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2025-06-02 07:24:19 +00:00
Code Issues Projects Releases Wiki Activity

SyntaxHighlight: Treat syntaxHighlight inline as enclose=none [#794]

Browse Source
This commit is contained in:
gnosygnu 2020-08-27 05:25:59 -04:00
parent 4f87d1a195
commit 1eea3682ca
2 changed files with 263 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
400_xowa/src/gplx/xowa/xtns/syntax_highlights/Synh_xtn_nde.java
View File

@ -1,6 +1,6 @@
/* /*
XOWA: the XOWA Offline Wiki Application XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012-2017 gnosygnu@gmail.com Copyright (C) 2012-2020 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3, XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0. or alternatively under the terms of the Apache License Version 2.0.
@ -13,13 +13,34 @@ The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/ */
package gplx.xowa.xtns.syntax_highlights; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; package gplx.xowa.xtns.syntax_highlights;
import gplx.core.primitives.*;
import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*; import gplx.Bry_;
import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.htmls.*; import gplx.Bry_bfr;
import gplx.Err_;
import gplx.Hash_adp_bry;
import gplx.core.primitives.Byte_obj_val;
import gplx.xowa.Xoae_app;
import gplx.xowa.Xoae_page;
import gplx.xowa.Xowe_wiki;
import gplx.xowa.htmls.core.htmls.Xoh_html_wtr;
import gplx.xowa.htmls.core.htmls.Xoh_wtr_ctx;
import gplx.xowa.parsers.Xop_ctx;
import gplx.xowa.parsers.Xop_root_tkn;
import gplx.xowa.parsers.htmls.Mwh_atr_itm;
import gplx.xowa.parsers.htmls.Mwh_atr_itm_owner1;
import gplx.xowa.parsers.xndes.Xop_xnde_tag;
import gplx.xowa.parsers.xndes.Xop_xnde_tkn;
import gplx.xowa.xtns.Xox_xnde;
import gplx.xowa.xtns.Xox_xnde_;
public class Synh_xtn_nde implements Xox_xnde, Mwh_atr_itm_owner1 { public class Synh_xtn_nde implements Xox_xnde, Mwh_atr_itm_owner1 {
private byte[] lang = Bry_.Empty; private byte[] style = null; private byte[] enclose = Bry_.Empty; private byte[] lang = Bry_.Empty;
private boolean line_enabled = false; private int start = 1; private Int_rng_mgr highlight_idxs = Int_rng_mgr_null.Instance; private byte[] style = null;
private byte[] enclose = Bry_.Empty;
private boolean line_enabled = false;
private int start = 1;
private Int_rng_mgr highlight_idxs = Int_rng_mgr_null.Instance;
public Xop_xnde_tkn Xnde() {throw Err_.new_unimplemented();} public Xop_xnde_tkn Xnde() {throw Err_.new_unimplemented();}
public void Xatr__set(Xowe_wiki wiki, byte[] src, Mwh_atr_itm xatr, Object xatr_id_obj) { public void Xatr__set(Xowe_wiki wiki, byte[] src, Mwh_atr_itm xatr, Object xatr_id_obj) {
if (xatr_id_obj == null) return; if (xatr_id_obj == null) return;
@ -27,6 +48,7 @@ public class Synh_xtn_nde implements Xox_xnde, Mwh_atr_itm_owner1 {
switch (xatr_id.Val()) { switch (xatr_id.Val()) {
case Xatr_line: line_enabled = true; break; case Xatr_line: line_enabled = true; break;
case Xatr_enclose: enclose = xatr.Val_as_bry(); break; case Xatr_enclose: enclose = xatr.Val_as_bry(); break;
case Xatr_inline: enclose = Bry_.new_a7("none"); break; // 2020-08-27|ISSUE#:794|inline should be enclose=none
case Xatr_lang: lang = xatr.Val_as_bry(); break; case Xatr_lang: lang = xatr.Val_as_bry(); break;
case Xatr_style: style = xatr.Val_as_bry(); break; case Xatr_style: style = xatr.Val_as_bry(); break;
case Xatr_start: start = xatr.Val_as_int_or(1); break; case Xatr_start: start = xatr.Val_as_int_or(1); break;
@ -42,10 +64,10 @@ public class Synh_xtn_nde implements Xox_xnde, Mwh_atr_itm_owner1 {
public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xoae_page wpg, Xop_xnde_tkn xnde, byte[] src) { public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xoae_page wpg, Xop_xnde_tkn xnde, byte[] src) {
Synh_xtn_nde_.Make(bfr, app, src, xnde.Tag_open_end(), xnde.Tag_close_bgn(), lang, enclose, style, line_enabled, start, highlight_idxs); Synh_xtn_nde_.Make(bfr, app, src, xnde.Tag_open_end(), xnde.Tag_close_bgn(), lang, enclose, style, line_enabled, start, highlight_idxs);
} }
private static final byte Xatr_enclose = 1, Xatr_lang = 2, Xatr_style = 3, Xatr_line = 4, Xatr_start = 5, Xatr_highlight = 6; private static final byte Xatr_enclose = 1, Xatr_lang = 2, Xatr_style = 3, Xatr_line = 4, Xatr_start = 5, Xatr_highlight = 6, Xatr_inline = 7;
private static final Hash_adp_bry xatrs_hash = Hash_adp_bry.ci_a7() private static final Hash_adp_bry xatrs_hash = Hash_adp_bry.ci_a7()
.Add_str_byte("enclose" , Xatr_enclose) .Add_str_byte("enclose" , Xatr_enclose)
.Add_str_byte("inline" , Xatr_enclose) .Add_str_byte("inline" , Xatr_inline)
.Add_str_byte("lang" , Xatr_lang) .Add_str_byte("lang" , Xatr_lang)
.Add_str_byte("style" , Xatr_style) .Add_str_byte("style" , Xatr_style)
.Add_str_byte("line" , Xatr_line) .Add_str_byte("line" , Xatr_line)

33
400_xowa/src/gplx/xowa/xtns/syntax_highlights/Synh_xtn_nde_tst.java
View File

@ -1,6 +1,6 @@
/* /*
XOWA: the XOWA Offline Wiki Application XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012-2017 gnosygnu@gmail.com Copyright (C) 2012-2020 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3, XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0. or alternatively under the terms of the Apache License Version 2.0.
@ -13,8 +13,12 @@ The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/ */
package gplx.xowa.xtns.syntax_highlights; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; package gplx.xowa.xtns.syntax_highlights;
import org.junit.*;
import gplx.String_;
import gplx.xowa.Xop_fxt;
import org.junit.Test;
public class Synh_xtn_nde_tst { public class Synh_xtn_nde_tst {
private final Xop_fxt fxt = new Xop_fxt(); private final Xop_fxt fxt = new Xop_fxt();
@Test public void Basic() { @Test public void Basic() {
@ -184,4 +188,27 @@ public class Synh_xtn_nde_tst {
)); ));
fxt.Init_para_n_(); fxt.Init_para_n_();
} }
@Test public void Inline() {
// 2020-08-27|ISSUE#:794|inline should be enclose=none
fxt.Init_para_y_();
fxt.Test_parse_page_all_str(String_.Concat_lines_nl
( "a"
, ""
, " <syntaxHighlight inline>"
, " b"
, " </syntaxHighlight>" // trim ws here
, ""
, "c"
), String_.Concat_lines_nl
( "<p>a"
, "</p>"
, " <code class=\"mw-highlight\">" // fails with <div class="mw-highlight"><pre style="overflow:auto">
, " b"
, "</code>"
, ""
, "<p>c"
, "</p>"
));
fxt.Init_para_n_();
}
} }