From 37c42e07950cbf0f6265281019e335a6ecf66c86 Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Wed, 13 Nov 2024 21:23:10 +0100
Subject: [PATCH 1/5] add: Include general-rules via submodule

* Include the general rules from the `general-rules` submodule

* Update the .github/workflows/build.yml to use a new version of the
  `checkout` action.

Signed-off-by: mr.Shu <mr@shu.io>
---
 .github/workflows/build.yml | 4 +++-
 .gitmodules                 | 3 +++
 general-rules               | 1 +
 rules.adoc                  | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .gitmodules
 create mode 160000 general-rules

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a743ad3..f523936 100644
--- a/.github/workflows/build.yml
+++ b/.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: |
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1762d30
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "general-rules"]
+	path = general-rules
+	url = git@github.com:robocup-junior/general-rules.git
diff --git a/general-rules b/general-rules
new file mode 160000
index 0000000..02204c2
--- /dev/null
+++ b/general-rules
@@ -0,0 +1 @@
+Subproject commit 02204c20f266f19f213edcabe9dc64bfe4021be4
diff --git a/rules.adoc b/rules.adoc
index 335e18c..442c9ae 100644
--- a/rules.adoc
+++ b/rules.adoc
@@ -78,6 +78,8 @@ 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.
 
+include::general-rules/general-rules.adoc[]
+
 [discrete]
 === Changes from the 2024 RoboCupJunior Soccer Rules
 

From 476d8498880884eef440cccad5f9ee938500ada6 Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Wed, 13 Nov 2024 21:37:19 +0100
Subject: [PATCH 2/5] update: Discrete the General Rules

* Make sure the General Rules are discrete.

Signed-off-by: mr.Shu <mr@shu.io>
---
 general-rules | 2 +-
 rules.adoc    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/general-rules b/general-rules
index 02204c2..b239685 160000
--- a/general-rules
+++ b/general-rules
@@ -1 +1 @@
-Subproject commit 02204c20f266f19f213edcabe9dc64bfe4021be4
+Subproject commit b2396858feb5d4cd9f4da6914832957453b58e8c
diff --git a/rules.adoc b/rules.adoc
index 442c9ae..bb95dce 100644
--- a/rules.adoc
+++ b/rules.adoc
@@ -78,6 +78,7 @@ 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.
 
+[discrete]
 include::general-rules/general-rules.adoc[]
 
 [discrete]

From 9903532b6b95e94b4b9b37d1d7397081d02f4d0a Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Wed, 13 Nov 2024 21:45:28 +0100
Subject: [PATCH 3/5] chore: bump the general-ruels

Signed-off-by: mr.Shu <mr@shu.io>
---
 general-rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/general-rules b/general-rules
index b239685..b188a04 160000
--- a/general-rules
+++ b/general-rules
@@ -1 +1 @@
-Subproject commit b2396858feb5d4cd9f4da6914832957453b58e8c
+Subproject commit b188a04ccf50baf4829a9f46af59395e37b385c8

From c92bf80a277919078a9f9a1490f8e2b514ab9ac3 Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Wed, 13 Nov 2024 21:56:53 +0100
Subject: [PATCH 4/5] fixes: Swap the stray 2025 and General Rules

Signed-off-by: mr.Shu <mr@shu.io>
---
 rules.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules.adoc b/rules.adoc
index bb95dce..d1996eb 100644
--- a/rules.adoc
+++ b/rules.adoc
@@ -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,7 +78,7 @@ 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.
 
-[discrete]
+[[general-rules]]
 include::general-rules/general-rules.adoc[]
 
 [discrete]

From 4b48d5036929fad6804aefee4884238ba087b6e0 Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Thu, 14 Nov 2024 23:50:30 +0100
Subject: [PATCH 5/5] preamble: Show the logos on the first page

* Make sure the logos are shown on the first page too

Signed-off-by: mr.Shu <mr@shu.io>
---
 preamble.tex | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/preamble.tex b/preamble.tex
index 3ee471b..6a05ddc 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -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}
\ No newline at end of file
+\vspace{20pt}