Kattis · jsannemo · Mar 17, 2021 · Mar 17, 2021 · pehrsoderman · Mar 23, 2021
diff --git a/Dockerfile b/Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update && \
             python3-minimal \
             python3-pip \
             python3-plastex \
+            python3-markdown \
             python3-yaml \
             sudo \
             texlive-fonts-recommended \

diff --git a/README.md b/README.md
@@ -207,13 +207,13 @@ The dependencies needed to *build/install* problemtools can be installed with:
 
 And the dependencies needed to *run* problemtools can be installed with:
 
-    sudo apt install ghostscript libgmpxx4ldbl python-minimal python-pkg-resources python-plastex python-yaml texlive-fonts-recommended texlive-lang-cyrillic texlive-latex-extra texlive-plain-generic tidy
+    sudo apt install ghostscript libgmpxx4ldbl python3-minimal python-pkg-resources python3-plastex python3-markdown python3-yaml texlive-fonts-recommended texlive-lang-cyrillic texlive-latex-extra texlive-plain-generic tidy
 
 ### Fedora
 
 On Fedora, these dependencies can be installed with:
 
-    sudo dnf install boost-regex gcc gmp-devel gmp-c++ python3 python3-pyyaml texlive-latex texlive-collection-fontsrecommended texlive-fancyhdr texlive-subfigure texlive-wrapfig texlive-import texlive-ulem texlive-xifthen texlive-overpic texlive-pbox tidy ghostscript
+    sudo dnf install boost-regex gcc gmp-devel gmp-c++ python3 python3-pyyaml python3-markdown texlive-latex texlive-collection-fontsrecommended texlive-fancyhdr texlive-subfigure texlive-wrapfig texlive-import texlive-ulem texlive-xifthen texlive-overpic texlive-pbox tidy ghostscript
 
 Followed by:
 

diff --git a/admin/docker/Dockerfile.minimal b/admin/docker/Dockerfile.minimal
@@ -24,6 +24,7 @@ RUN apt update && \
         python3-minimal \
         python3-yaml \
         python3-plastex \
+        python3-markdown \
         texlive-fonts-recommended \
         texlive-lang-cyrillic \
         texlive-latex-extra \

diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ Homepage: https://github.com/Kattis/problemtools
 
 Package: kattis-problemtools
 Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}, python3-plastex, python-pkg-resources, texlive-plain-generic, texlive-fonts-recommended, texlive-latex-extra, texlive-lang-cyrillic, tidy, ghostscript
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}, python3-plastex, python3-markdown, python-pkg-resources, texlive-plain-generic, texlive-fonts-recommended, texlive-latex-extra, texlive-lang-cyrillic, tidy, ghostscript
 Recommends: gcc, g++
 Description: Kattis Problem Tools
  These are tools to manage and verify problem packages in the

diff --git a/examples/different/problem_statement/problem.sv.md b/examples/different/problem_statement/problem.sv.md
@@ -0,0 +1,9 @@
+Skriv ett program som beräknar differensen mellan icke-negativa heltal.
+
+## Indata
+Indatan består av flera testfall (minst \(1\) och som mest \(40\)), ett per rad.
+Varje testfall består av ett par av heltal mellan \(0\) och \(10^{15}\) (inklusive). 
+Indatan avslutas med vid indatans slut (end of file).
+
+## Utdata
+För varje par av heltal i indatan, skriv ut en rad med absolutbeloppet av deras differens.
diff --git a/examples/echo/data/sample/1.ans b/examples/echo/data/sample/1.ans
@@ -0,0 +1,3 @@
+hello
+am
+echo
diff --git a/examples/echo/data/sample/1.in b/examples/echo/data/sample/1.in
@@ -0,0 +1,6 @@
+5
+hello
+i
+am
+an
+echo
diff --git a/examples/echo/data/sample/2.ans b/examples/echo/data/sample/2.ans
@@ -0,0 +1,5 @@
+only
+these
+words
+are
+correct
diff --git a/examples/echo/data/sample/2.in b/examples/echo/data/sample/2.in
@@ -0,0 +1,11 @@
+10
+only
+if
+these
+oddindexed
+words
+appear
+are
+you
+correct
+output
diff --git a/examples/echo/data/sample/testdata.yaml b/examples/echo/data/sample/testdata.yaml
@@ -0,0 +1,5 @@
+on_reject: continue
+range: 0 0
+accept_score: 0
+grader_flags: first_error
+input_validator_flags: nFive=0
diff --git a/examples/echo/data/secret/subtask1/1.ans b/examples/echo/data/secret/subtask1/1.ans
@@ -0,0 +1,3 @@
+a
+c
+e
diff --git a/examples/echo/data/secret/subtask1/1.in b/examples/echo/data/secret/subtask1/1.in
@@ -0,0 +1,6 @@
+5
+a
+b
+c
+d
+e
diff --git a/examples/echo/data/secret/subtask1/2.ans b/examples/echo/data/secret/subtask1/2.ans
@@ -0,0 +1,3 @@
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/examples/echo/data/secret/subtask1/2.in b/examples/echo/data/secret/subtask1/2.in
@@ -0,0 +1,6 @@
+5
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/examples/echo/data/secret/subtask1/3.ans b/examples/echo/data/secret/subtask1/3.ans
@@ -0,0 +1,3 @@
+testdata
+fun
+write
diff --git a/examples/echo/data/secret/subtask1/3.in b/examples/echo/data/secret/subtask1/3.in
@@ -0,0 +1,6 @@
+5
+testdata
+is
+fun
+to
+write
diff --git a/examples/echo/data/secret/subtask1/testdata.yaml b/examples/echo/data/secret/subtask1/testdata.yaml
@@ -0,0 +1,5 @@
+on_reject: break
+accept_score: 1
+range: 0 1
+grader_flags: min
+input_validator_flags: nFive=1
diff --git a/examples/echo/data/secret/subtask2/01.ans b/examples/echo/data/secret/subtask2/01.ans
@@ -0,0 +1 @@
+lfqxnsarqnsonfnrspgcdnvhcdacwtxqxpfqjbdhworqtcscpzxyaevsktuzjdbkhxlaqmc
diff --git a/examples/echo/data/secret/subtask2/01.in b/examples/echo/data/secret/subtask2/01.in
@@ -0,0 +1,2 @@
+1
+lfqxnsarqnsonfnrspgcdnvhcdacwtxqxpfqjbdhworqtcscpzxyaevsktuzjdbkhxlaqmc
diff --git a/examples/echo/data/secret/subtask2/02.ans b/examples/echo/data/secret/subtask2/02.ans
@@ -0,0 +1 @@
+sadswmlfyrzyuzurmawdpqjeorkjxrbigpdgurpbrpwvnwhpwzgsgwgrenbytkhyydepspqkmwekbcuyltbscfynzhjm
diff --git a/examples/echo/data/secret/subtask2/02.in b/examples/echo/data/secret/subtask2/02.in
@@ -0,0 +1,3 @@
+2
+sadswmlfyrzyuzurmawdpqjeorkjxrbigpdgurpbrpwvnwhpwzgsgwgrenbytkhyydepspqkmwekbcuyltbscfynzhjm
+haieueifbuuuxpkcxojnepciypyttbnijwufdjopamhxv
diff --git a/examples/echo/data/secret/subtask2/03.ans b/examples/echo/data/secret/subtask2/03.ans
@@ -0,0 +1,2 @@
+ukne
+hzilgamqhyahjclmuyjvejunnanjuxflviaeiyzpczfojvcodlujutzwbsyavodbuosqoatpagssnogkynjsm
diff --git a/examples/echo/data/secret/subtask2/03.in b/examples/echo/data/secret/subtask2/03.in
@@ -0,0 +1,4 @@
+3
+ukne
+zliqslrpwrnlnlnogfcnswqbnjbqxrlmtjebyllyolrrhzfspgumodkfnyomn
+hzilgamqhyahjclmuyjvejunnanjuxflviaeiyzpczfojvcodlujutzwbsyavodbuosqoatpagssnogkynjsm
diff --git a/examples/echo/data/secret/subtask2/04.ans b/examples/echo/data/secret/subtask2/04.ans
@@ -0,0 +1,2 @@
+vbrhnsjugbscwghs
+wrqujghiseuvcrzomktwkljyrvsngudxtjzjankgphmcwewcklgfqrzvscpjjmigjpuid
diff --git a/examples/echo/data/secret/subtask2/04.in b/examples/echo/data/secret/subtask2/04.in
@@ -0,0 +1,5 @@
+4
+vbrhnsjugbscwghs
+dezpmjwllgbfirkbrgyznqdhfzyxggwkraopba
+wrqujghiseuvcrzomktwkljyrvsngudxtjzjankgphmcwewcklgfqrzvscpjjmigjpuid
+bglrjlbelhezdfciayabmsusdcrsnrzar
diff --git a/examples/echo/data/secret/subtask2/05.ans b/examples/echo/data/secret/subtask2/05.ans
@@ -0,0 +1,3 @@
+irklktbawab
+fclqvhrogqr
+qqmzocleumdgvlakmuchrdyefveruoffmmqgqhlabsmvqgpkdmhqwzeh
diff --git a/examples/echo/data/secret/subtask2/05.in b/examples/echo/data/secret/subtask2/05.in
@@ -0,0 +1,6 @@
+5
+irklktbawab
+jvzuldycrv
+fclqvhrogqr
+perenlqdlrjadjjshtcjjgtxisykhnvfzerpopetifrulhuxb
+qqmzocleumdgvlakmuchrdyefveruoffmmqgqhlabsmvqgpkdmhqwzeh
diff --git a/examples/echo/data/secret/subtask2/06.ans b/examples/echo/data/secret/subtask2/06.ans
@@ -0,0 +1,3 @@
+cpeylvrgilhhknuiqacizawqnhlwohatcfxcxrsrwwboplxzwffnmc
+npsyxizmkmbhctrjvevjffwpivhfzjwbajeebbdwqparvsrmnypohqkyignenyfnolzaxrpcupof
+shcsjdzoewvdaaubtpogvlfbvyzoxyqwonqvnfberoapbivdomlxngfpfcpwuknmzjmwthqacax
diff --git a/examples/echo/data/secret/subtask2/06.in b/examples/echo/data/secret/subtask2/06.in
@@ -0,0 +1,7 @@
+6
+cpeylvrgilhhknuiqacizawqnhlwohatcfxcxrsrwwboplxzwffnmc
+mvvfbckehiddcdgzahaqvcsygytwtkoticelntkfpeqihaxczolvk
+npsyxizmkmbhctrjvevjffwpivhfzjwbajeebbdwqparvsrmnypohqkyignenyfnolzaxrpcupof
+ttj
+shcsjdzoewvdaaubtpogvlfbvyzoxyqwonqvnfberoapbivdomlxngfpfcpwuknmzjmwthqacax
+auhkxxmljnnkzfcuxtqwdlosbrbplklwbidpnsvdaimaxxdnpuurfqylqybaxlybqbbknrcvfuvkwuvnqdak
diff --git a/examples/echo/data/secret/subtask2/07.ans b/examples/echo/data/secret/subtask2/07.ans
@@ -0,0 +1,4 @@
+vqbkewxjyflzwuzcprdvdmoquiqz
+klseqgeziclrbkuflydmyxttlipwutnychfyuhcdbolikfmdqrxjbtlyfqazwaogqvbmgxnjcowzspliupjnk
+oyibwjayadunwawrpjjtewsksrsvfpbqmfwkchisqh
+vticcfq
diff --git a/examples/echo/data/secret/subtask2/07.in b/examples/echo/data/secret/subtask2/07.in
@@ -0,0 +1,8 @@
+7
+vqbkewxjyflzwuzcprdvdmoquiqz
+nxiipmvrhjmmdpivdgchvtokirceudfoejawvdzrgiiizwuqotvhvttahmmbqvzkfwqvzklxuk
+klseqgeziclrbkuflydmyxttlipwutnychfyuhcdbolikfmdqrxjbtlyfqazwaogqvbmgxnjcowzspliupjnk
+gnmxpokvkotwddyqgnyihfwuvrfkhmlfaphmmyhjcgvuoocxxwmpgfozbhfwdnixlntspxxpujdbpwfl
+oyibwjayadunwawrpjjtewsksrsvfpbqmfwkchisqh
+tjhybleiurwulxvuxiaepnbfxthhguwkmjnhhjvsvuuqugqqlvhghzspigwhcwpj
+vticcfq
diff --git a/examples/echo/data/secret/subtask2/08.ans b/examples/echo/data/secret/subtask2/08.ans
@@ -0,0 +1,4 @@
+deqnzpbnsglenccnxbfftyozqkxkuxdsswoyxrpqzfrjw
+ivlz
+ufdykwdhtcuycogobloygqpdqvustnkhxlfqbxrwtencnamvplvjsoxefkkfysnjqtlsgvdmftmgxkzcvjonxftclnoeyi
+hqgidntdapjijdbyffddxuxbgkbskljwtdbodbnaxfhvyqrqmhplu
diff --git a/examples/echo/data/secret/subtask2/08.in b/examples/echo/data/secret/subtask2/08.in
@@ -0,0 +1,9 @@
+8
+deqnzpbnsglenccnxbfftyozqkxkuxdsswoyxrpqzfrjw
+lfekwxymhixfiywnkajsxhzhnsamfkpbnapdn
+ivlz
+vultxfpcljsnzhiuluotznaaxlnrqgowizkjpfknrpqjimvt
+ufdykwdhtcuycogobloygqpdqvustnkhxlfqbxrwtencnamvplvjsoxefkkfysnjqtlsgvdmftmgxkzcvjonxftclnoeyi
+gpbbrzgrxaffhkhszwqsnbhnfawfqsrrqnacdjspvdfbhguutebf
+hqgidntdapjijdbyffddxuxbgkbskljwtdbodbnaxfhvyqrqmhplu
+zzatbijlsrycjytezjqvnkycchtuugygrbouvonefwdiuyfd
diff --git a/examples/echo/data/secret/subtask2/09.ans b/examples/echo/data/secret/subtask2/09.ans
@@ -0,0 +1,5 @@
+ywkmbqkkclwyvtwxdpcsehboqhoppqjvclxxvtcpsuodxczq
+qcjncscqtrtlabzjcuksjtyhxzzkwhkiohusxuso
+jqcbcdwsqoikrzvcitbzuqsluilgvdjjnjxjqfbjlnzslzukfcxgwgsgpuvvcvvaewkdcglrkx
+pcgamvgaclmsgflrvvtubflyezombfkuowzixlqlpieljyxulvbmxdkaazudiltxaktbkfsjlbhpbkghdw
+jabtuprvwrtxhoyqqjpoxwyeecsdfsdmf
diff --git a/examples/echo/data/secret/subtask2/09.in b/examples/echo/data/secret/subtask2/09.in
@@ -0,0 +1,10 @@
+9
+ywkmbqkkclwyvtwxdpcsehboqhoppqjvclxxvtcpsuodxczq
+wiswindhsujxyfospysxdhxcscwpcwsqwcmqfetxlyhtqwdbljggwexeogngnj
+qcjncscqtrtlabzjcuksjtyhxzzkwhkiohusxuso
+wdtcnphtacocstxq
+jqcbcdwsqoikrzvcitbzuqsluilgvdjjnjxjqfbjlnzslzukfcxgwgsgpuvvcvvaewkdcglrkx
+rvhxjnjbgneobaiokpgdcozeifokfzocj
+pcgamvgaclmsgflrvvtubflyezombfkuowzixlqlpieljyxulvbmxdkaazudiltxaktbkfsjlbhpbkghdw
+cghkfphphurvlfkggecrejynkimepdrfztbbuurhab
+jabtuprvwrtxhoyqqjpoxwyeecsdfsdmf
diff --git a/examples/echo/data/secret/subtask2/10.ans b/examples/echo/data/secret/subtask2/10.ans
@@ -0,0 +1,5 @@
+xtrsypuaepzhccpetemqdhmcqxfodgdvratymblu
+ahpeewdydhwnzroofgqosqpuogtksnxvgmcttqifkaesfynuqoyybgdlcdavgxpqzqpolmbfvbrsephlyetqzzssxr
+shgumshytseusbxaltfupadvgsofzzynvyizkv
+epzdnrhplcidomwd
+duqrzupszqiepbdknabjyqiqwnzwnurnkzvyuekigteqmbviccczhzbyjtvdaoqxfwtqrypdfqjqhurpzpkgxwlvouprkhjcn
diff --git a/examples/echo/data/secret/subtask2/10.in b/examples/echo/data/secret/subtask2/10.in
@@ -0,0 +1,11 @@
+10
+xtrsypuaepzhccpetemqdhmcqxfodgdvratymblu
+ypthphgovonyeyvlhplxhoqokfsydnuthhalvigycjsvftsluubakxmsoiymxnuacfypkihbhbxrfqscaegd
+ahpeewdydhwnzroofgqosqpuogtksnxvgmcttqifkaesfynuqoyybgdlcdavgxpqzqpolmbfvbrsephlyetqzzssxr
+jwticnnpvgvundxanfypelksswwoteddqjgdkjmjalynmjkuimskqlzsbpxndhkcgrrywddahqcyxmpazmdscifxwcmkqbu
+shgumshytseusbxaltfupadvgsofzzynvyizkv
+rgidvfmdosdvmukttgrseffhmhwjjgrtmleoebfvulqbodxszbkhbrytandntcrspuv
+epzdnrhplcidomwd
+xpngzvutfhsdzxnbtyqxobg
+duqrzupszqiepbdknabjyqiqwnzwnurnkzvyuekigteqmbviccczhzbyjtvdaoqxfwtqrypdfqjqhurpzpkgxwlvouprkhjcn
+foxtfbqiywcbypfzrzaxbothhhevfghapr
diff --git a/examples/echo/data/secret/subtask2/testdata.yaml b/examples/echo/data/secret/subtask2/testdata.yaml
@@ -0,0 +1,5 @@
+on_reject: break
+accept_score: 1
+range: 0 1
+grader_flags: min
+input_validator_flags: nFive=0
diff --git a/examples/echo/data/secret/testdata.yaml b/examples/echo/data/secret/testdata.yaml
@@ -0,0 +1,3 @@
+on_reject: continue
+range: 0 2
+grader_flags: first_error accept_if_any_accepted
diff --git a/examples/echo/data/testdata.yaml b/examples/echo/data/testdata.yaml
@@ -0,0 +1,3 @@
+on_reject: continue
+range: 0 2
+grader_flags: ignore_sample
diff --git a/examples/echo/input_format_validators/validator/validator.cpp b/examples/echo/input_format_validators/validator/validator.cpp
@@ -0,0 +1,15 @@
+#include "validator.h"
+
+
+void run() {
+  const bool nFive = Arg("nFive", 0);
+  int N = Int(1, 10); Endl();
+  assert(!nFive || N == 5);
+  for (int i = 0; i < N; i++) {
+    string s = Line();
+    for (auto it : s) {
+      assert('a' <= it && it <= 'z');
+    }
+  }
+  Eof();
+}