Merge pull request #6 from robocup-junior/2024-draft

Merge 2024 changes into main branch

.ci/criticmarkup_to_adoc.py

@@ -139,10 +139,10 @@ def convert(self, infile):
     cmp = CriticMarkupPreprocessor(
         change_listing_fmt='- <<{CHANGE}>>',
         addition_note_fmt='Added "{CURRENT}"',
-        addition_replacement_fmt='[red]#*{CURRENT}*#',
+        addition_replacement_fmt='*[red]#{CURRENT}#*',
         deletion_note_fmt='Deleted "{PREVIOUS}"',
         deletion_replacement_fmt='footnote:[In previous version this said "{PREVIOUS}"]', # noqa
         substitution_note_fmt='Changed "{PREVIOUS}" to "{CURRENT}"',
-        substitution_replacement_fmt='[red]#*{CURRENT}*#\nfootnote:[In previous version this said "{PREVIOUS}"]' # noqa
+        substitution_replacement_fmt='*[red]#{CURRENT}#*\nfootnote:[In previous version this said "{PREVIOUS}"]' # noqa
     )
     print(cmp.convert(sys.argv[1]))

build_rules_on_windows.bat

@@ -11,15 +11,21 @@ set REPO_PATH=%REPO_PATH:C:=/mnt/c%
 
 echo Running commands in WSL...
 
-REM Check if dos2unix is installed in WSL
-wsl dos2unix --version >nul 2>&1
-if %errorlevel% neq 0 (
-    echo Installing dos2unix...
-    REM Add installation command for dos2unix here
-    wsl sudo apt-get update
-    wsl sudo apt-get install dos2unix
+echo dos2unix is required to build the rules. Do you want to check if dos2unix is installed and install if necessary?
+set /p performCheck=Type 'y' for yes otherwise press ENTER: 
+
+if /i "%performCheck%"=="y" (
+    wsl dos2unix --version >nul 2>&1
+    if %errorlevel% neq 0 (
+        echo Installing dos2unix...
+        wsl sudo apt-get update
+        wsl sudo apt-get install dos2unix
+    )
+) else (
+    echo Skipped dos2unix check and installation.
 )
 
+
 REM Create temporary copies of .sh scripts with Linux-style line endings using wsl cp (because Github checkout might automatically change them to Windows style which will stop the scripts from working)
 wsl cp %REPO_PATH%/.ci/adoc-to-tex.sh %REPO_PATH%/.ci/adoc-to-tex-temp.sh
 wsl cp %REPO_PATH%/.ci/tex-to-pdf.sh %REPO_PATH%/.ci/tex-to-pdf-temp.sh

custom.xsl

@@ -51,7 +51,7 @@
   <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
     <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en">
      <l:context name="xref-number-and-title">
-        <l:template name="section" text="Rule %n, %t"/>
+        <l:template name="section" text="Section %n, %t"/>
       </l:context>
     </l:l10n>
   </l:i18n>