support rendering of markdown statements

Author: blackav

csp/contests/priv_submit_page.csp

@@ -43,6 +43,7 @@ ns_unparse_answers(
   path_t variant_stmt_file;
   unsigned char title[1024];
   int enable_main_menu = 0;
+  struct md_content *pmd = NULL;
 
   if (cs) global = cs->global;
 
@@ -238,11 +239,22 @@ ns_unparse_answers(
 
 <%
   /* output the problem statement */
+  pmd = NULL;
+  if (prob && prob->variant_num > 0 && variant > 0 && prob->md_size > 0 && variant <= prob->md_size) {
+    pmd = &prob->md_files[variant-1];
+  } else if (prob && prob->variant_num <= 0 && prob->md_size == 1) {
+    pmd = &prob->md_files[0];
+  }
+  if (pmd && pmd->data) {
+    putc_unlocked('\n', out_f);
+    fwrite_unlocked(pmd->data, 1, pmd->size, out_f);
+    putc_unlocked('\n', out_f);
+  }
   px = 0; pw = 0; pw_path = 0;
-  if (prob && prob->variant_num > 0 && variant > 0 && prob->xml.a
+  if (!pmd && prob && prob->variant_num > 0 && variant > 0 && prob->xml.a
       && prob->xml.a[variant - 1]) {
     px = prob->xml.a[variant - 1];
-  } else if (prob && prob->variant_num <= 0 && prob->xml.p) {
+  } else if (!pmd && prob && prob->variant_num <= 0 && prob->xml.p) {
     px = prob->xml.p;
   }
   if (px && px->stmts) {

csp/contests/unpriv_main_page.csp

@@ -69,6 +69,7 @@ ns_unparse_answers(
   avatar_url[0] = 0;
   struct virtual_end_info_s *vend_info = NULL;
   int summoned_count = 0;
+  struct md_content *pmd = NULL;
 
 %><s:read var="telegram_token" ignoreerrors="yes" /><%
 %><s:read var="all_runs" ignoreerrors="yes" default="0" /><%

csp/contests/unpriv_main_run_submit.csp

@@ -236,6 +236,12 @@
 
 <%
       px = 0;
+      pmd = NULL;
+      if (prob->variant_num > 0 && variant > 0 && prob->md_size > 0 && variant <= prob->md_size) {
+        pmd = &prob->md_files[variant - 1];
+      } else if (prob->variant_num <= 0 && variant <= 0 && prob->md_size == 1) {
+        pmd = &prob->md_files[0];
+      }
       if (variant > 0 && prob->xml.a && prob->xml.a[variant - 1]) {
         px = prob->xml.a[variant - 1];
       } else if (variant <= 0 && prob->xml.p) {
@@ -244,7 +250,11 @@
 
       /* put problem statement */
       if (is_viewable) {
-        if (px && px->stmts) {
+        if (pmd && pmd->data) {
+          putc_unlocked('\n', out_f);
+          fwrite_unlocked(pmd->data, 1, pmd->size, out_f);
+          putc_unlocked('\n', out_f);
+        } else if (px && px->stmts) {
           ns_unparse_statement(out_f, phr, cnts, extra, prob, 0, px, NULL,
                                pinfo[prob_id].status & PROB_STATUS_SUBMITTABLE);
         } else if (prob->statement_file && prob->statement_file[0] && is_viewable) {