1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

Scribunto: Evaluate template-args when expanding template, not separately afterwards

This commit is contained in:
gnosygnu
2017-09-04 08:30:33 -04:00
parent 9f6ef68bfa
commit b101b356ad
8 changed files with 26 additions and 18 deletions

View File

@@ -28,7 +28,7 @@ public class Xoh_thm_caption_data {
public int Capt_3_bgn() {return capt_3_bgn;} private int capt_3_bgn;
public int Capt_3_end() {return capt_3_end;} private int capt_3_end;
public boolean Capt_3_exists() {return capt_3_end > capt_3_bgn;}
public Xoh_thm_magnify_data Magnify_data() {return magnify_data;} private final Xoh_thm_magnify_data magnify_data = new Xoh_thm_magnify_data();
public Xoh_thm_magnify_data Magnify_data() {return magnify_data;} private final Xoh_thm_magnify_data magnify_data = new Xoh_thm_magnify_data();
public void Clear() {
this.capt_2_is_tidy = false;
this.src_bgn = src_end = capt_1_bgn = capt_1_end = capt_2_bgn = capt_2_end = capt_3_bgn = capt_3_end = -1;
@@ -69,5 +69,5 @@ public class Xoh_thm_caption_data {
}
}
public void Capt_3_(int bgn, int end) {this.capt_3_bgn = bgn; this.capt_3_end = end;}
public static final byte[] Bry__div_1_tail_bgn = Bry_.new_a7("\n</div>");
public static final byte[] Bry__div_1_tail_bgn = Bry_.new_a7("\n</div>");
}

View File

@@ -217,7 +217,7 @@ public class Xow_popup_parser {
int subs_len = tmpl_root.Subs_len();
for (int i = 0; i < subs_len; i++)
tmpl_root.Subs_get(i).Tmpl_compile(tmpl_ctx, src, tmpl_props);
return Xot_tmpl_wtr.Write_all(tmpl_ctx, tmpl_root, src);
return Xot_tmpl_wtr.Write_all(tmpl_ctx, Xot_invk_temp.Null_frame, tmpl_root, src);
}
}
class Xow_popup_parser_ {