From 1e07143e37aa2f7abce60ce62ce00c3762dbb7c4 Mon Sep 17 00:00:00 2001 From: Dooren Date: Sat, 21 Oct 2023 16:43:40 +0200 Subject: [PATCH 1/3] Split Rulebook document --- Organization.tex | 58 ++++++++++++++++++++++++++++++++++++++++++++++ Roadmap.tex | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ rulebook.tex | 4 ++-- 3 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 Organization.tex create mode 100644 Roadmap.tex diff --git a/Organization.tex b/Organization.tex new file mode 100644 index 00000000..602820ef --- /dev/null +++ b/Organization.tex @@ -0,0 +1,58 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: Rulebook.tex 2014-12-12 balkce $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: introduction to RoboCupAtHome +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\documentclass[11pt, twoside, openright, a4paper, chapterprefix]{scrbook} +\usepackage[inner=2.5cm, outer=2.5cm, top=4cm, bottom=4cm]{geometry} + +%%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{./setup/packages.tex} +\input{./setup/config.tex} +\input{./setup/styling.tex} + + +%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{./setup/active_version.tex} +\graphicspath{{\YEAR/}{./images/}} +\input{./setup/macros.tex} +\input{./setup/abbrevix.tex} + + + +\makeindex % generate index +\makeabbex % generate abbreviations + + + + + +%\newcommand{\sectionbreak}{\clearpage} +%\newcommand{\subsectionbreak}{\clearpage} + + +\begin{document} + + \input{./pages/titlepage} + + \setcounter{page}{0} + \pagenumbering{roman} + \pagestyle{empty} + \input{./pages/acknowledgments} + \clearpage + + \pagestyle{plain} + \tableofcontents + \clearpage + + \setcounter{page}{1} + \pagenumbering{arabic} + + \input{Setup} + + \printabx + \printidx + +\end{document} diff --git a/Roadmap.tex b/Roadmap.tex new file mode 100644 index 00000000..42a83d79 --- /dev/null +++ b/Roadmap.tex @@ -0,0 +1,60 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: Rulebook.tex 2014-12-12 balkce $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: introduction to RoboCupAtHome +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\documentclass[11pt, twoside, openright, a4paper, chapterprefix]{scrbook} +\usepackage[inner=2.5cm, outer=2.5cm, top=4cm, bottom=4cm]{geometry} + +%%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{./setup/packages.tex} +\input{./setup/config.tex} +\input{./setup/styling.tex} + + +%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{./setup/active_version.tex} +\graphicspath{{\YEAR/}{./images/}} +\input{./setup/macros.tex} +\input{./setup/abbrevix.tex} + + + +\makeindex % generate index +\makeabbex % generate abbreviations + + + + + +%\newcommand{\sectionbreak}{\clearpage} +%\newcommand{\subsectionbreak}{\clearpage} + + +\begin{document} + + \input{./pages/titlepage} + + \setcounter{page}{0} + \pagenumbering{roman} + \pagestyle{empty} + \input{./pages/acknowledgments} + \clearpage + + \pagestyle{plain} + \tableofcontents + \clearpage + + \setcounter{page}{1} + \pagenumbering{arabic} + + \input{CompetitionConcepts} + + + + \printabx + \printidx + +\end{document} diff --git a/rulebook.tex b/rulebook.tex index 57faeb6c..32154323 100644 --- a/rulebook.tex +++ b/rulebook.tex @@ -52,11 +52,11 @@ \input{Introduction} -\input{CompetitionConcepts} +%\input{CompetitionConcepts} \input{GeneralRules} -\input{Setup} +%\input{Setup} From 92aee3532156a548fcf6b29e9f5d7115dc7fa471 Mon Sep 17 00:00:00 2001 From: Dooren Date: Sat, 21 Oct 2023 17:00:06 +0200 Subject: [PATCH 2/3] Move subchapters between rulebook and organization --- GeneralRules.tex | 10 +++++----- Introduction.tex | 6 +++--- Organization.tex | 2 ++ organization/GeneralRules.tex | 37 +++++++++++++++++++++++++++++++++++ organization/Introduction.tex | 22 +++++++++++++++++++++ 5 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 organization/GeneralRules.tex create mode 100644 organization/Introduction.tex diff --git a/GeneralRules.tex b/GeneralRules.tex index c057e985..71a14d31 100644 --- a/GeneralRules.tex +++ b/GeneralRules.tex @@ -12,17 +12,17 @@ \chapter{General Rules and Regulations} Every rule in this section can be considered to implicitly include the term \emph{\enquote{unless stated otherwise}}. This means that additional or contrary rules, in particular with respect to the specification of tests, have a higher priority than those mentioned in the general rules and regulations. -\input{general_rules/TeamRegistration} +%\input{general_rules/TeamRegistration} -\input{general_rules/vizbox} +%\input{general_rules/vizbox} \input{general_rules/Scenario} -\input{general_rules/Robots} +%\input{general_rules/Robots} \input{general_rules/ExternalDevices} -\input{general_rules/Organization} +%\input{general_rules/Organization} \input{general_rules/Procedure} @@ -32,7 +32,7 @@ \chapter{General Rules and Regulations} \input{general_rules/OpenChallenge} -\input{general_rules/ManipulationChallenge} +%\input{general_rules/ManipulationChallenge} % Local Variables: % TeX-master: "Rulebook" % End: diff --git a/Introduction.tex b/Introduction.tex index 008a54a8..1107a6c2 100644 --- a/Introduction.tex +++ b/Introduction.tex @@ -21,15 +21,15 @@ \section{RoboCup@Home} The focus is on, but is not limited to, the following domains: human-robot interaction and cooperation, navigation and mapping in dynamic environments, computer vision and object recognition under natural light conditions, object manipulation, adaptive behaviors, behavior integration, ambient intelligence, standardization and system integration. The competition is co-located with the RoboCup symposium. -\input{introduction/Organization} +%\input{introduction/Organization} -\input{introduction/Infrastructure} +%\input{introduction/Infrastructure} \input{introduction/Leagues} \input{introduction/Competition} -\input{introduction/Awards} +%\input{introduction/Awards} % Local Variables: % TeX-master: "Rulebook" diff --git a/Organization.tex b/Organization.tex index 602820ef..79aa2cca 100644 --- a/Organization.tex +++ b/Organization.tex @@ -50,6 +50,8 @@ \setcounter{page}{1} \pagenumbering{arabic} + \input{organization/Introduction} + \input{organization/GeneralRules} \input{Setup} \printabx diff --git a/organization/GeneralRules.tex b/organization/GeneralRules.tex new file mode 100644 index 00000000..e1d8cc5a --- /dev/null +++ b/organization/GeneralRules.tex @@ -0,0 +1,37 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: general_rules.tex 420 2013-04-08 15:30:35Z holz $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: description of the GENERAL RULES +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\chapter{General Rules and Regulations} +\label{chap:rules} + +These are the general rules and regulations for the competition in the \RoboCup\AtHome{} league. +Every rule in this section can be considered to implicitly include the term \emph{\enquote{unless stated otherwise}}. +This means that additional or contrary rules, in particular with respect to the specification of tests, have a higher priority than those mentioned in the general rules and regulations. + +\input{general_rules/TeamRegistration} + +\input{general_rules/vizbox} + +%\input{general_rules/Scenario} + +\input{general_rules/Robots} + +%\input{general_rules/ExternalDevices} + +\input{general_rules/Organization} + +%\input{general_rules/Procedure} + +%\input{general_rules/ContinueRules.tex} + +%\input{general_rules/PenaltiesBonuses} + +%\input{general_rules/OpenChallenge} + +% Local Variables: +% TeX-master: "Rulebook" +% End: diff --git a/organization/Introduction.tex b/organization/Introduction.tex new file mode 100644 index 00000000..7574bc2f --- /dev/null +++ b/organization/Introduction.tex @@ -0,0 +1,22 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: Introduction +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\chapter{Introduction} +\label{chap:introduction} + +\input{introduction/Organization} + +\input{introduction/Infrastructure} + +%\input{introduction/Leagues} + +%\input{introduction/Competition} + +\input{introduction/Awards} + +% Local Variables: +% TeX-master: "Rulebook" +% End: From ac4f38118692bee7ced10f10daa5bf2a8453d633 Mon Sep 17 00:00:00 2001 From: PetervDooren Date: Tue, 31 Oct 2023 18:36:43 +0100 Subject: [PATCH 3/3] move further things to organisation --- GeneralRules.tex | 6 +++--- Introduction.tex | 2 +- organization/GeneralRules.tex | 6 +++--- organization/Introduction.tex | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GeneralRules.tex b/GeneralRules.tex index 71a14d31..cba4fd39 100644 --- a/GeneralRules.tex +++ b/GeneralRules.tex @@ -20,17 +20,17 @@ \chapter{General Rules and Regulations} %\input{general_rules/Robots} -\input{general_rules/ExternalDevices} +%\input{general_rules/ExternalDevices} %\input{general_rules/Organization} -\input{general_rules/Procedure} +%\input{general_rules/Procedure} \input{general_rules/ContinueRules.tex} \input{general_rules/PenaltiesBonuses} -\input{general_rules/OpenChallenge} +%\input{general_rules/OpenChallenge} %\input{general_rules/ManipulationChallenge} % Local Variables: diff --git a/Introduction.tex b/Introduction.tex index 1107a6c2..7d150914 100644 --- a/Introduction.tex +++ b/Introduction.tex @@ -25,7 +25,7 @@ \section{RoboCup@Home} %\input{introduction/Infrastructure} -\input{introduction/Leagues} +%\input{introduction/Leagues} \input{introduction/Competition} diff --git a/organization/GeneralRules.tex b/organization/GeneralRules.tex index e1d8cc5a..51b11a84 100644 --- a/organization/GeneralRules.tex +++ b/organization/GeneralRules.tex @@ -20,17 +20,17 @@ \chapter{General Rules and Regulations} \input{general_rules/Robots} -%\input{general_rules/ExternalDevices} +\input{general_rules/ExternalDevices} \input{general_rules/Organization} -%\input{general_rules/Procedure} +\input{general_rules/Procedure} %\input{general_rules/ContinueRules.tex} %\input{general_rules/PenaltiesBonuses} -%\input{general_rules/OpenChallenge} +\input{general_rules/OpenChallenge} % Local Variables: % TeX-master: "Rulebook" diff --git a/organization/Introduction.tex b/organization/Introduction.tex index 7574bc2f..d2f1db3b 100644 --- a/organization/Introduction.tex +++ b/organization/Introduction.tex @@ -11,7 +11,7 @@ \chapter{Introduction} \input{introduction/Infrastructure} -%\input{introduction/Leagues} +\input{introduction/Leagues} %\input{introduction/Competition}