rbx.cp 0.13.7__tar.gz → 0.13.8__tar.gz

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.13.7
+Version: 0.13.8
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.13.7"
+version = "0.13.8"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/box/packaging/polygon/upload.py

@@ -247,9 +247,15 @@ def _get_statement_for_language(language: str) -> Optional[Statement]:
 def _get_statement_blocks(statement: Statement) -> StatementBlocks:
     # TODO: actually try to convert to rbxTeX
     assert statement.type == StatementType.rbxTeX
+    pkg = package.find_problem_package_or_die()
+    # TODO: pull this from a library, too hacky at the moment
     builder_problem = StatementBuilderProblem(
-        package=package.find_problem_package_or_die(),
+        package=pkg,
         statement=statement,
+        vars={
+            **pkg.expanded_vars,
+            **statement.expanded_vars,
+        },
     )
     with tempfile.TemporaryDirectory() as temp_dir:
         return render_jinja_blocks(

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/box/testcase_utils.py

@@ -181,10 +181,10 @@ def parse_interaction(file: pathlib.Path) -> TestcaseInteraction:
 
         while line := f.readline().strip():
             if line.startswith(interactor_prefix):
-                stripped = line[len(interactor_prefix) :].strip()
+                stripped = line[len(interactor_prefix) :].rstrip()
                 entries.append(TestcaseInteractionEntry(data=stripped, pipe=0))
             elif line.startswith(solution_prefix):
-                stripped = line[len(solution_prefix) :].strip()
+                stripped = line[len(solution_prefix) :].rstrip()
                 entries.append(TestcaseInteractionEntry(data=stripped, pipe=1))
             else:
                 raise TestcaseInteractionParsingError(
@@ -204,11 +204,11 @@ def get_alternate_interaction_texts(
     solution_entries = []
     for entry in interaction.entries:
         if entry.pipe == 1:
-            solution_entries.append(entry.data)
-            interactor_entries.extend(['\n'] * entry.data.count('\n'))
+            solution_entries.append(entry.data + '\n')
+            interactor_entries.extend(['\n'] * (entry.data.count('\n') + 1))
         else:
-            interactor_entries.append(entry.data)
-            solution_entries.extend(['\n'] * entry.data.count('\n'))
+            interactor_entries.append(entry.data + '\n')
+            solution_entries.extend(['\n'] * (entry.data.count('\n') + 1))
     return ''.join(interactor_entries), ''.join(solution_entries)
 
 
@@ -219,4 +219,4 @@ def print_interaction(interaction: TestcaseInteraction):
             text.stylize('status')
         else:
             text.stylize('info')
-        console.console.print(text, end='')
+        console.console.print(text)

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/resources/presets/default/contest/contest.rbx.yml

@@ -17,6 +17,10 @@ statements:
       configure:
         - type: "rbx-tex" # Convert rbxTeX to TeX
           template: "statement/template.rbx.tex"
+      vars:
+        # Turn into false to hide time limits and memory limits in the problem statement.
+        # Useful for ICPC-style contests where you distribute a separate info sheet.
+        show_limits: true
   - name: "editorial-en"
     extends: "statement-en"
     override:

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/resources/presets/default/problem/problem.rbx.yml

@@ -31,6 +31,8 @@ statements:
     configure:
       - type: "rbx-tex" # Convert rbxTeX to TeX
         template: "statement/template.rbx.tex"
+    vars:
+      show_limits: true
 stresses:
   - name: "stress"
     generator:

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/contest_template.rbx.tex

@@ -1,10 +1,16 @@
-%- if vars.show_problem is truthy or vars.editorial is falsy
+%- if problem.vars.show_problem is truthy or problem.vars.editorial is falsy
 \includeProblem
 %- if problem.short_name is defined
 	[\VAR{problem.short_name}]
 %- endif
 {\VAR{problem.title | escape}}{
 
+%- if problem.vars.show_limits is truthy
+	\includeLimits{\VAR{problem.package.timeLimit} ms}{\VAR{problem.package.memoryLimit} MiB}
+%- else
+	\vspace{0.55cm}
+%- endif
+
 	\VAR{problem.blocks.legend}
 
 	%- if problem.blocks.input is defined
@@ -20,7 +26,7 @@
 	%- endif
 
 	%- if problem.samples
-		\vspace{0.3cm}
+		\vspace{0.1cm}
 		\subsection*{\strExamples}
 		%- for sample in problem.samples
 			%- if sample.interaction is not none

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/icpc.sty

@@ -16,6 +16,7 @@
 \let\mytitleformat\titleformat
 \let\titleformat\relax
 \usepackage{logicpuzzle}
+\let\titleformat\mytitleformat
 \usepackage{enumitem}
 \usepackage{amsfonts}
 \usepackage[brazil]{babel}
@@ -76,6 +77,11 @@
 
 \setlength{\voffset}{-1in}
 
+% Increase section text sizes
+\titleformat{\section}{\LARGE\bfseries}{\thesection}{1em}{}
+\titleformat{\subsection}{\Large\bfseries}{\thesubsection}{1em}{}
+\titleformat{\subsubsection}{\normalsize\bfseries}{\thesubsubsection}{1em}{}
+
 \newcommand{\insereArquivo}[1]{
 	\ifnum0\pdffilesize{#1}>0
 		\VerbatimInput[xleftmargin=0mm,numbers=none,obeytabs=true]{#1}\vspace{.5em}
@@ -139,6 +145,15 @@
 	#3
 }
 
+\newcommand{\includeLimits}[2]{
+	\vspace{0.2cm}
+	\begin{center}
+		\textit{\strTimeLimit: #1}\\
+		\textit{\strMemoryLimit: #2}
+	\end{center}
+	\vspace{0.25cm}
+}
+
 \newcommand{\inputdesc}[1]{
 	\subsection*{\strInput}
 	{#1} }
@@ -271,11 +286,9 @@
 \newcounter{pcounter}\setcounter{pcounter}{0}
 \newcounter{qcounter}\setcounter{qcounter}{0}
 
-\usepackage{titlesec}
-
-\titlespacing\section{0pt}{6pt plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
-\titlespacing\subsection{0pt}{6pt plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
-\titlespacing\subsubsection{0pt}{6t plus 4pt minus 2pt}{0pt plus 2pt minus 2pt}
+\titlespacing\section{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
+\titlespacing\subsection{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
+\titlespacing\subsubsection{0pt}{12pt plus 0pt minus 2pt}{10pt plus 0pt minus 2pt}
 
 \newcommand{\InsertTitlePage}
 {

{rbx_cp-0.13.7 → rbx_cp-0.13.8}/rbx/resources/presets/default/shared/problem_template.rbx.tex

@@ -15,6 +15,12 @@
 %- endif
 {\VAR{problem.title | escape}}{
 
+%- if problem.vars.show_limits is truthy
+	\includeLimits{\VAR{problem.package.timeLimit} ms}{\VAR{problem.package.memoryLimit} MiB}
+%- else
+	\vspace{0.55cm}
+%- endif
+
 	\VAR{problem.blocks.legend}
 
 	%- if problem.blocks.input is defined
@@ -30,7 +36,7 @@
 	%- endif
 
 	%- if problem.samples
-		\vspace{0.3cm}
+		\vspace{0.1cm}
 		\subsection*{\strExamples}
 		%- for sample in problem.samples
 			%- if sample.interaction is not none