326 warn if problemtitle differs from problemsettingsnamelanguage

bin/latex.py

@@ -356,3 +356,21 @@ def build_contest_pdfs(contest, problems, tmpdir, lang=None, solutions=False, we
     return all(
         build_contest_pdf(contest, problems, tmpdir, lang, solutions, web) for lang in languages
     )
+
+def get_argument_for_command(texfile, command):
+    """ Return the (whitespace-normalised) argument for the given command in the given texfile.
+    If texfile contains `\foo{bar  baz }`, returns the string 'bar baz'.
+    The command is given without backslash.
+
+
+    Assumptions:
+    the command and its argument are on the same line,
+    and that the argument contains no closing curly brackets.
+    """
+
+    for line in texfile:
+        regex = r"\\" + command + r"\{(.*)\}"
+        match = re.search(regex, line)
+        if match:
+            return ' '.join(match.group(1).split())
+    return None

bin/problem.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 
 import config
+import latex
 import parallel
 import program
 import run
@@ -58,19 +59,39 @@ def _determine_statement_languages(self):
         """
         if isinstance(self.settings.name, str):
             self.settings.name = {'en': self.settings.name}
-        yamlnames = set(self.settings.name)
-        texfiles = set(
+        yamllangs = set(self.settings.name)
+        texlangs = set(
             path.suffixes[0][1:] for path in glob(self.path, 'problem_statement/problem.*.tex')
         )
-        for lang in texfiles - yamlnames:
+        for lang in texlangs - yamllangs:
             error(
                 f"{self.name}: Found problem.{lang}.tex, but no corresponding name in problem.yaml."
             )
-        for lang in yamlnames - texfiles:
+        for lang in yamllangs - texlangs:
             error(
                 f"{self.name}: Found name for language {lang} in problem.yaml, but not problem.{lang}.tex."
             )
-        return sorted(texfiles & yamlnames)
+        # Check that names in problem.yaml and \problemname{} in problem.*.tex agree:
+        for lang in texlangs & yamllangs:
+            unnormalised_yamlname = self.settings.name[lang]
+            yamlname = ' '.join(unnormalised_yamlname.split())
+            with open(self.path / 'problem_statement' / f'problem.{lang}.tex') as texfile:
+                match texname := latex.get_argument_for_command(texfile, 'problemname'):
+                    case None:
+                        error(rf"No \problemname found in problem.{lang}.tex")
+                        continue
+                    case '\problemname':
+                        continue
+                    case s if '\\' in s or '_' in s or '^' in s:
+                        # texname contains markup, like "CO_2" or "\emph{Hello}":
+                        # Assume authors know what they're doing
+                        continue
+                    case s if s != yamlname:
+                        warn(f'Problem titles in problem.{lang}.tex ({texname})' +
+                             f' and problem.yaml ({yamlname}) differ;' +
+                             r' consider using \problemname{\problemyamlname}.'
+                             )
+        return sorted(texlangs & yamllangs)
 
     def _read_settings(self):
         # some defaults

test/problems/boolfind/problem_statement/problem.en.tex

@@ -0,0 +1 @@
+\problemname{\problemyamlname}

test/problems/different/problem.yaml

@@ -1,5 +1,8 @@
 # problem.yaml
 
+
+name:
+  en: A Different Problem
 ## At least one of author, source, or rights_owner must be provided.
 ##
 ## Author of the problem (default: null)

test/problems/fltcmp/problem_statement/problem.en.tex

@@ -0,0 +1 @@
+\problemname{\problemyamlname}

test/problems/guess/problem.yaml

@@ -1,3 +1,5 @@
+name: 
+  en: Guess the Number
 source: Kattis
 license: cc by-sa
 

test/problems/hello/problem_statement/problem.en.tex

@@ -0,0 +1 @@
+\problemname{\problemyamlname}

test/problems/hellounix/problem_statement/problem.en.tex

@@ -0,0 +1 @@
+\problemname{\problemyamlname}

test/problems/test_problem_config/problem_statement/problem.en.tex

@@ -0,0 +1 @@
+\problemname{\problemyamlname}