Fixing merge problems

trojsten · Jan 4, 2024 · 54f3d9f · 54f3d9f
1 parent 366ba2d
commit 54f3d9f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/core/latex/dgs.cls b/core/latex/dgs.cls
@@ -91,7 +91,6 @@
     polish,
     spanish,
     english,
-    shorthands=off,
 ]{babel}                                      % multi-language support
 \RequirePackage{xunicode}
 \RequirePackage{cleveref}                                   % clever references

diff --git a/core/latex/math.tex b/core/latex/math.tex
@@ -29,8 +29,6 @@
 
 \ExplSyntaxOff
 
-\DeclareMathOperator{\arccot}{\mathrm{arccot}}
-
 % Section: differentials
 
 % Regular upright differential
@@ -251,6 +249,7 @@
 \def\omicron{o}
 \DeclareMathOperator{\atantwo}{atan2}
 \DeclareMathOperator{\arccot}{arccot}
+\DeclareMathOperator{\arccsc}{arccsc}
 
 % Logical operators
 \DeclareMathOperator{\LXor}{\quad\lxor\quad}

diff --git a/core/markdown-check.py b/core/markdown-check.py
@@ -89,7 +89,7 @@ def check_markdown_file(self, path):
         try:
             check.encoding(path)
         except exceptions.EncodingError as e:
-            print(f"File {c.name(file.name)} is not valid: {c.err(e.message)}")
+            print(f"File {c.name(path.name)} is not valid: {c.err(e.message)}")
             return False
 
         line_errors = copy.copy(self.line_errors)