merge PR #125 inclusion of global rules

Author: dbscoach

.github/workflows/build.yml

@@ -4,7 +4,9 @@ jobs:
     name: build
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: build the rules
         run: |

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "general-rules"]
+	path = general-rules
+	url = [email protected]:robocup-junior/general-rules.git

general-rules

@@ -86,6 +86,7 @@
   \fancyhf{}
   \fancyfoot[L]{\textit{Draft rules as of \today}}
   \fancyfoot[R]{Page \textbf{\thepage} of \textbf{\pageref{LastPage}}}
+  \fancyhead[R]{\includegraphics[width=8cm]{media/image15.png}}
 }
 
 \title{\vspace{-5ex}RoboCupJunior Soccer Rules 2025\vspace{-5ex}}
@@ -101,8 +102,8 @@
 
 
 \begin{document}
-\maketitle
 \thispagestyle{firststyle}
+\maketitle
 
 \begin{center}
 \begin{tabular}{cc}
@@ -134,4 +135,4 @@
 \end{tabular}
 \end{center}
 
-\vspace{20pt}
+\vspace{20pt}

preamble.tex

@@ -17,7 +17,7 @@ endif::basebackend-html[]
 :icons: font
 :numbered:
 
-These are the Soccer rules for RoboCupJunior 2024. They are released
+These are the Soccer rules for RoboCupJunior 2025. They are released
 by the RoboCupJunior Soccer League Committee. The English version of these
 rules has priority over any translations.
 
@@ -78,6 +78,9 @@ organizer of your regional RoboCupJunior competition and ask them about_ <<entry
 Unless specified otherwise, all parts of these rules are released under the
 terms of the Creative Commons Attribution-ShareAlike License.
 
+[[general-rules]]
+include::general-rules/general-rules.adoc[]
+
 [discrete]
 === Changes from the 2024 RoboCupJunior Soccer Rules