diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51a906b6..763db815 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,7 @@ on: [push, pull_request] jobs: lint: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: LaTeX linter (chktex) @@ -16,75 +14,70 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-rulebook: - - runs-on: ubuntu-latest - container: leplusorg/latex:latest - - steps: - - uses: actions/checkout@v4 - - name: LaTeX compilation - run: - TERM=xterm make dorulebookonly - - name: Upload build result - uses: actions/upload-artifact@v4 - with: - name: rulebook - path: rulebook.pdf - - - build-scoresheets: - + build: + name: build-${{ matrix.document }} runs-on: ubuntu-latest container: leplusorg/latex:latest + needs: [lint] + strategy: + fail-fast: false + matrix: + document: [organization, rulebook, scoresheets] steps: - uses: actions/checkout@v4 - name: LaTeX compilation run: - TERM=xterm make doscoresheetsonly + TERM=xterm make do${{ matrix.document }}only - name: Upload build result uses: actions/upload-artifact@v4 with: - name: score_sheets - path: score_sheets.pdf + name: ${{ matrix.document }} + path: ${{ matrix.document }}.pdf deploy-pdfs: - + name: deploy-pdfs runs-on: ubuntu-latest permissions: contents: write - needs: [build-rulebook, build-scoresheets] + needs: [build] steps: - uses: actions/checkout@v4 with: ref: gh-pages + - name: Download organization + uses: actions/download-artifact@v4 + with: + name: organization + path: ${{ runner.temp }}/organization - name: Download rulebook uses: actions/download-artifact@v4 with: name: rulebook path: ${{ runner.temp }}/rulebook - - name: Download score sheets + - name: Download scoresheets uses: actions/download-artifact@v4 with: - name: score_sheets - path: ${{ runner.temp }}/score_sheets + name: scoresheets + path: ${{ runner.temp }}/scoresheets - name: Preparations for GitHub Pages - if: github.ref == 'refs/heads/master' + if: github.ref_name == github.event.repository.default_branch env: ARTIFACTS_PATH: ${{ runner.temp }} run: | # Make sure directories exist - cd "$GITHUB_WORKSPACE" + cd "${GITHUB_WORKSPACE}" + mkdir -p organization mkdir -p rulebook - mkdir -p score_sheets - FILENAME=${GITHUB_REF/refs\/heads\//} + mkdir -p scoresheets + FILENAME=${GITHUB_REF_NAME} # Strip out any extra slashes in the rest FILENAME=${FILENAME//\//\_}.pdf - mv $ARTIFACTS_PATH/rulebook/rulebook.pdf rulebook/$FILENAME - mv $ARTIFACTS_PATH/score_sheets/score_sheets.pdf score_sheets/$FILENAME + mv ${ARTIFACTS_PATH}/organization/organization.pdf organization/${FILENAME} + mv ${ARTIFACTS_PATH}/rulebook/rulebook.pdf rulebook/${FILENAME} + mv ${ARTIFACTS_PATH}/scoresheets/scoresheets.pdf scoresheets/${FILENAME} - name: Commit and push to GitHub Pages - if: github.ref == 'refs/heads/master' + if: github.ref_name == github.event.repository.default_branch uses: stefanzweifel/git-auto-commit-action@v5 with: branch: gh-pages @@ -92,7 +85,7 @@ jobs: commit_message: "[github actions] deploy" commit_user_name: "Continuous Deployment" commit_user_email: "git@robocupathome.org" - file_pattern: "rulebook/* score_sheets/*" + file_pattern: "./*.pdf" repository: ${{ github.workspace }} skip_checkout: true skip_fetch: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80ff0375..c980c884 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,12 @@ jobs: build: needs: [lint] runs-on: ubuntu-latest - container: blang/latex:ubuntu + container: leplusorg/latex:latest steps: - uses: actions/checkout@v4 + - name: LaTeX compilation Organization + run: + TERM=xterm make doorganizationonly - name: LaTeX compilation Rulebook run: TERM=xterm make dorulebookonly @@ -38,5 +41,6 @@ jobs: generate_release_notes: false token: ${{ secrets.GITHUB_TOKEN }} files: | + organization.pdf rulebook.pdf - score_sheets.pdf + scoresheets.pdf diff --git a/Makefile b/Makefile index 956df669..cca0f22e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,9 @@ ## MAIN ################### +OPREFIX = organization RPREFIX = rulebook -SSREFIX = score_sheets +SSREFIX = scoresheets ## #################################### ## ## VARIABLES ## @@ -23,6 +24,27 @@ SSREFIX = score_sheets ## FILES ################## +# organization +OTEXFILE = $(OPREFIX).tex +# +ODVIFILE = $(OPREFIX).dvi +OPSFILE = $(OPREFIX).ps +OPDFFILE = $(OPREFIX).pdf +# +OAUXFILE = $(OPREFIX).aux +OIDXFILE = $(OPREFIX).idx +OADXFILE = $(OPREFIX).adx +OANDFILE = $(OPREFIX).and +OLOGFILE = $(OPREFIX).log +OBBLFILE = $(OPREFIX).bbl +OBLGFILE = $(OPREFIX).blg +# +OTARFILE = $(OPREFIX).tar +OTGZFILE = $(OPREFIX).tgz +OTBZFILE = $(OPREFIX).tbz + + +# rulebook RTEXFILE = $(RPREFIX).tex # RDVIFILE = $(RPREFIX).dvi @@ -41,6 +63,7 @@ RTARFILE = $(RPREFIX).tar RTGZFILE = $(RPREFIX).tgz RTBZFILE = $(RPREFIX).tbz +# scoresheets SSTEXFILE = $(SSREFIX).tex # SSDVIFILE = $(SSREFIX).dvi @@ -174,6 +197,14 @@ endif $(SILENT) $(MAKE) mauClean # all: mauCleanAll mauBuild mauClean +organizationonly: organization +organization: +ifndef HASRUBBER + $(SILENT) $(MAKE) doorganizationonly +else + $(SILENT) $(MAKE) ruborganizationonly +endif + rulebookonly: rulebook rulebook: ifndef HASRUBBER @@ -196,18 +227,30 @@ endif dofullpdf: $(SILENT) $(MAKE) dopdflatex - $(SILENT) $(MAKE) domakeidx + $(SILENT) $(MAKE) doorganizationmakeidx + $(SILENT) $(MAKE) dorulebookmakeidx $(SILENT) $(MAKE) domakeadx - $(SILENT) # $(MAKE) dobibtex + $(SILENT) # $(MAKE) doorganizationbibtex + $(SILENT) # $(MAKE) dorulebookbibtex $(SILENT) $(MAKE) dopdflatex $(SILENT) $(MAKE) dopdflatex +doorganizationonly: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- Creating '$(OPDFFILE)' via $(PDFLATEX)"; $(RESET) + $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(OTEXFILE) + $(SILENT) $(MAKE) doorganizationmakeidx + $(SILENT) $(MAKE) doorganizationmakeidx + $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(OTEXFILE) + $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(OTEXFILE) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + dorulebookonly: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Creating '$(RPDFFILE)' via $(PDFLATEX)"; $(RESET) $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(RTEXFILE) - $(SILENT) $(MAKE) domakeidx - $(SILENT) $(MAKE) domakeidx + $(SILENT) $(MAKE) dorulebookmakeidx + $(SILENT) $(MAKE) dorulebookmakeidx $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(RTEXFILE) $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(RTEXFILE) $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) @@ -225,11 +268,20 @@ dopdflatex: $(PDFLATEX) $(PDFLATEXFLAGS) -jobname='$(SSPREFIX)_DSPL' '\def\league{DSPL}\input' $(SSPREFIX) $(PDFLATEX) $(PDFLATEXFLAGS) -jobname='$(SSPREFIX)_SSPL' '\def\league{SSPL}\input' $(SSPREFIX) $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- Creating '$(OPDFFILE)' via $(PDFLATEX)"; $(RESET) + $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(OTEXFILE) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Creating '$(RPDFFILE)' via $(PDFLATEX)"; $(RESET) $(SILENT) $(PDFLATEX) $(PDFLATEXFLAGS) $(RTEXFILE) $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) -dopdf2ps: +doorganizationpdf2ps: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- Running '$(PDF2PS)' on '$(OPDFFILE)'"; $(RESET) + $(SILENT) $(PDF2PS) $(PDF2PSFLAGS) $(OPDFFILE) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + +dorulebookpdf2ps: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Running '$(PDF2PS)' on '$(RPDFFILE)'"; $(RESET) $(SILENT) $(PDF2PS) $(PDF2PSFLAGS) $(RPDFFILE) @@ -239,18 +291,31 @@ dopdf2ps: ## GENERAL ## ## ##################### ## -dobibtex: +doorganizationbibtex: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- Running bibtex on '$(OPREFIX)'"; $(RESET) + $(SILENT) $(BIBTEX) $(OPREFIX) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + +dorulebookbibtex: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Running bibtex on '$(RPREFIX)'"; $(RESET) $(SILENT) $(BIBTEX) $(RPREFIX) $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) -domakeidx: +doorganizationmakeidx: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- Running makeindex on '$(OIDXFILE)'"; $(RESET) + $(SILENT) $(MAKEIDX) $(OIDXFILE) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + +dorulebookmakeidx: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Running makeindex on '$(RIDXFILE)'"; $(RESET) $(SILENT) $(MAKEIDX) $(RIDXFILE) $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) +# Indepent of organization/rulebook domakeadx: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- Running makeindex on '$(ADXFILE)' (abbreviations)"; $(RESET) @@ -261,10 +326,18 @@ domakeadx: ## WARNINGS ## ## ##################### ## -#wall: warntex warn2do -wall: warn2do warnspell summary +#wall: organizationwarntex rulebookwarntex warn2do +wall: warn2do warnspell organizationsummary rulebooksummary -warntex: +organizationwarntex: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- grep LaTeX/pdfTeX Warnings in '$(OTEXFILE)' ..."; $(RESET) + $(SILENT) $(LATEX) $(OTEXFILE) | grep -i -A 1 "tex warning" \ + && ($(ERROR); $(MSG) " -> please take care of the above TeX-warnings\n"; $(RESET)) \ + || ($(CHECK); $(MSG) " =) TeX generated NO warnings"; $(RESET)) + $(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) + +rulebookwarntex: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) $(ITEM); $(MSG) " -- grep LaTeX/pdfTeX Warnings in '$(RTEXFILE)' ..."; $(RESET) $(SILENT) $(LATEX) $(RTEXFILE) | grep -i -A 1 "tex warning" \ @@ -306,25 +379,23 @@ warnspell: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) $(SILENT) for TEXFILE in *.tex ; \ do \ - if [ $$TEXFILE != "$(RTEXFILE)" ] && [ $$TEXFILE != "macros.tex" ] && [ $$TEXFILE != "abbrevix.tex" ] && [ $$TEXFILE != "dummybox.tex" ]; then \ + #if [ $$TEXFILE != "$(RTEXFILE)" ] && [ $$TEXFILE != "macros.tex" ] && [ $$TEXFILE != "abbrevix.tex" ] && [ $$TEXFILE != "dummybox.tex" ]; then \ + if [ $$TEXFILE != "macros.tex" ] && [ $$TEXFILE != "abbrevix.tex" ] && [ $$TEXFILE != "dummybox.tex" ]; then \ $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ $(SPELL) $(SPELL_OPT) $(SPELL_ADDITIONAL_OPT) $(SPELL_WARN) $$TEXFILE ; \ fi ; \ done $(SILENT) for TEXFILE in scoresheets/*.tex ; \ do \ - if [ $$TEXFILE != "$(RTEXFILE)" ] && [ $$TEXFILE != "macros.tex" ] && [ $$TEXFILE != "abbrevix.tex" ] && [ $$TEXFILE != "dummybox.tex" ]; then \ - $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ - $(SPELL) $(SPELL_OPT) $(SPELL_ADDITIONAL_OPT) $(SPELL_WARN) $$TEXFILE ; \ - fi ; \ + $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ + $(SPELL) $(SPELL_OPT) $(SPELL_ADDITIONAL_OPT) $(SPELL_WARN) $$TEXFILE ; \ done $(SILENT) for TEXFILE in tasks/*.tex ; \ do \ - if [ $$TEXFILE != "$(RTEXFILE)" ] && [ $$TEXFILE != "macros.tex" ] && [ $$TEXFILE != "abbrevix.tex" ] && [ $$TEXFILE != "dummybox.tex" ]; then \ - $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ - $(SPELL) $(SPELL_OPT) $(SPELL_ADDITIONAL_OPT) $(SPELL_WARN) $$TEXFILE ; \ - fi ; \ + $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ + $(SPELL) $(SPELL_OPT) $(SPELL_ADDITIONAL_OPT) $(SPELL_WARN) $$TEXFILE ; \ done + # ToDo: remove this and the tests folder #$(SILENT) for TEXFILE in tests/*.tex ; \ #do \ # $(ITEM); $(MSG) " -- spell check result on '$$TEXFILE'"; $(RESET) ; \ @@ -332,9 +403,15 @@ warnspell: #done #$(SILENT) $(DONE); $(MSG) " ------------------------------------------------------------- done. ---"; $(RESET) -summary: +organizationsummary: $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) - $(SILENT) $(ITEM); $(MSG) " -- SUMMARY"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- ORGANIZATION SUMMARY"; $(RESET) + $(SILENT) tail -n1 $(OPREFIX).log + $(SILENT) $(DONE); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + +rulebooksummary: + $(SILENT) $(MENU); $(MSG) " -----------------------------------------------------------------------"; $(RESET) + $(SILENT) $(ITEM); $(MSG) " -- RULEBOOK SUMMARY"; $(RESET) $(SILENT) tail -n1 $(RPREFIX).log $(SILENT) $(DONE); $(MSG) " -----------------------------------------------------------------------"; $(RESET) @@ -360,6 +437,7 @@ clean: dirk: mauBuild mauBuild: + $(SILENT) $(RUBBER) $(RUBBERFLAGS) $(OTEXFILE) $(SILENT) $(RUBBER) $(RUBBERFLAGS) $(RTEXFILE) $(SILENT) for league in OPL DSPL SSPL ; do \ (echo "\def\league{$$league}" ; cat $(SSTEXFILE) ) > "$(SSPREFIX)_$$league.tex" ; \ @@ -367,6 +445,9 @@ mauBuild: rm -f "$(SSPREFIX)_$$league.tex" "$(SSPREFIX)_$$league.out" "$(SSPREFIX)_$$league.log" "$(SSPREFIX)_$$league.aux"; \ done +ruboganizationonly: + $(SILENT) $(RUBBER) $(RUBBERFLAGS) $(OTEXFILE) + rubrulebookonly: $(SILENT) $(RUBBER) $(RUBBERFLAGS) $(RTEXFILE) diff --git a/README.md b/README.md index 9c666a1f..32642408 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RoboCup@Home teams and team members are welcome to post GitHub issues for clarif Improvements are also welcome in the form of pull requests (see [guidelines](https://github.com/RoboCupAtHome/RuleBook/wiki/Guidelines)). -[Score sheets](http://latex.aslushnikov.com/compile?git=git://github.com/RoboCupAtHome/RuleBook.git&target=score_sheets.tex) +[Score sheets](https://robocupathome.github.io/RuleBook/scoresheets/master.pdf)) ### FAQ See the Frequently Asked Questions [here](https://github.com/RoboCupAtHome/RuleBook/wiki/FAQ:-Frequently-Asked-Questions). diff --git a/Roadmap.tex b/Roadmap.tex new file mode 100644 index 00000000..9e13b092 --- /dev/null +++ b/Roadmap.tex @@ -0,0 +1,63 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $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{./roadmap/documentinfo.tex} +% footertext +\newcommand{\footline}{RoboCup@Home Roadmap / \rulebookVersion} +\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{./roadmap/titlepage} + +\setcounter{page}{0} +\pagenumbering{roman} +\pagestyle{empty} +\input{./roadmap/acknowledgments} +\clearpage + +\pagestyle{plain} +\tableofcontents +\clearpage + +\setcounter{page}{1} +\pagenumbering{arabic} + +\input{CompetitionConcepts} + + + +\printabx +\printidx + +\end{document} diff --git a/general_rules/ContinueRules.tex b/general_rules/ContinueRules.tex index ec5b9fbb..80bbc8a0 100644 --- a/general_rules/ContinueRules.tex +++ b/general_rules/ContinueRules.tex @@ -89,7 +89,7 @@ \subsection{Bypassing Automatic Speech Recognition} \item \textbf{QR Codes:} A reduction of 30\% of the maximum attainable score is applied when a QR code is used to instruct the robot. \item \textbf{Alternative Input Method:} A reduction of up to 30\% of the maximum attainable score is applied when a \iterm{alternative HRI interface}, is used to instruct the robot. - Alternative HRI interfaces (see~\refsec{rule:asralternative}) must be previously approved by the TC during the Robot Inspection (see~\refsec{sec:robot_inspection}). + Alternative HRI interfaces (see~\refsec{rule:asralternative}) must be previously approved by the TC during the Robot Inspection (see \Organisation). \end{enumerate} diff --git a/general_rules/ExternalDevices.tex b/general_rules/ExternalDevices.tex index e1e73b87..31ea5353 100644 --- a/general_rules/ExternalDevices.tex +++ b/general_rules/ExternalDevices.tex @@ -17,7 +17,7 @@ \section{External devices} \subsection{On-site External Computing} Computing resources that are not physically attached to the robot are considered \ExternalComputing{} resources. -The use of up to five \ExternalComputing{} resources is allowed, but only in the \ArenaNetwork{} (see \refsec{rule:scenario_wifi}) and with a prior approval of the TC. +The use of up to five \ExternalComputing{} resources is allowed, but only in the \ArenaNetwork{} (see \Rulebook) and with a prior approval of the TC. Teams must inform the TC about the use of any \ExternalComputing{} at least one month before the competition. Note, however, that robots must be able to operate safely even if \ExternalComputing{} is unavailable. diff --git a/general_rules/Scenario.tex b/general_rules/Scenario.tex index a9aae3c4..2ef167f1 100644 --- a/general_rules/Scenario.tex +++ b/general_rules/Scenario.tex @@ -108,7 +108,7 @@ \subsection{Objects} Some tests in the RoboCup@Home league involve recognizing and manipulating objects (see Figure~\reffig{fig:scenario_objects}). The TC will compile a list of at least \NumObjects objects for this purpose; the list will contain a picture of the each object, as well as its official name and \ObjectCategory{} (for instance, an \textit{Apple} belongs to the \textit{Fruits} category). Most objects are likely to be lightweight and easy to grasp with one hand. -Every \ObjectCategory{} has an assigned \PredefinedLocation, where objects of that category can usually be found during tests (for example, an \textit{Fruits} can be found on the \textit{Kitchen Table}); assignments are announced during the \SetupDays{} (see~\ref{chap:setup_and_preparation}). +Every \ObjectCategory{} has an assigned \PredefinedLocation, where objects of that category can usually be found during tests (for example, an \textit{Fruits} can be found on the \textit{Kitchen Table}); assignments are announced during the \SetupDays{} (see \Organisation). Objects are provided at the competition for training. Teams may keep at most five training objects at a time and for at most one hour. @@ -177,7 +177,7 @@ \subsection{Predefined Rooms and Locations} Some tests in the RoboCup@Home league involve a \PredefinedLocation{} where people or objects can be found. There will also be at least two \Term{doors}{Arena doors}, named an \Entrance{} and an \Exit, which lead in and out of the \Arena{}, respectively. -Room names, predefined locations, and location classes are announced during the \SetupDays{} (see~\ref{chap:setup_and_preparation}). +Room names, predefined locations, and location classes are announced during the \SetupDays{} (see \Organisation). \subsection{Predefined Person Names} \label{rule:scenario_names} @@ -185,7 +185,7 @@ \subsection{Predefined Person Names} Some tests in the RoboCup@Home league involve memorizing a person's name. All people in the \Arena{} have an assigned \PredefinedName{} chosen by the TC. The list of names contains \SI{25}{\percent} male, \SI{25}{\percent} female, and \SI{50}{\percent} gender-neutral names taken from the list of most commonly used names in the United States. -Predefined names are announced during the \SetupDays{} (see~\ref{chap:setup_and_preparation}). +Predefined names are announced during the \SetupDays{} (see \Organisation). \subsection{Wireless network} \label{rule:scenario_wifi} diff --git a/organization.tex b/organization.tex new file mode 100644 index 00000000..acde4303 --- /dev/null +++ b/organization.tex @@ -0,0 +1,59 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: organization.tex 2023-10-21 PetervDooren $ +%% 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{./organization/documentinfo.tex} +% footertext +\newcommand{\footline}{RoboCup@Home Organization document / \rulebookVersion} +\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{organization/titlepage} + + \setcounter{page}{0} + \pagenumbering{roman} + \pagestyle{empty} + \input{organization/acknowledgments} + \clearpage + + \pagestyle{plain} + \tableofcontents + \clearpage + + \setcounter{page}{1} + \pagenumbering{arabic} + + \input{organization/Introduction} + \input{organization/GeneralRules} + \input{organization/Setup} + + \printabx + \printidx + +\end{document} diff --git a/GeneralRules.tex b/organization/GeneralRules.tex similarity index 90% rename from GeneralRules.tex rename to organization/GeneralRules.tex index c057e985..6607ee8f 100644 --- a/GeneralRules.tex +++ b/organization/GeneralRules.tex @@ -16,7 +16,7 @@ \chapter{General Rules and Regulations} \input{general_rules/vizbox} -\input{general_rules/Scenario} +%\input{general_rules/Scenario} \input{general_rules/Robots} @@ -26,13 +26,12 @@ \chapter{General Rules and Regulations} \input{general_rules/Procedure} -\input{general_rules/ContinueRules.tex} +%\input{general_rules/ContinueRules.tex} \input{general_rules/PenaltiesBonuses} \input{general_rules/OpenChallenge} -\input{general_rules/ManipulationChallenge} % Local Variables: % TeX-master: "Rulebook" % End: diff --git a/organization/Introduction.tex b/organization/Introduction.tex new file mode 100644 index 00000000..d2f1db3b --- /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: diff --git a/Setup.tex b/organization/Setup.tex similarity index 96% rename from Setup.tex rename to organization/Setup.tex index fe85f96c..b578b7e3 100644 --- a/Setup.tex +++ b/organization/Setup.tex @@ -2,7 +2,7 @@ \chapter{Setup and Preparation} \label{chap:setup_and_preparation} Prior to the RoboCup@Home competition, all arriving teams will have an opportunity to set up their robots and prepare for the competition in a \iterm{Setup \& Preparation} phase. This phase is scheduled to start on the first day of the competition, namely when the venue opens and the teams arrive. During the \SetupDays, teams can assemble and test their robots. On the last setup day, a \WelcomeReception{} will be held. To foster the knowledge exchange between teams a conference-like \PS{} takes place during the reception. Additionally, all teams have to get their robots inspected by members of the TC to be allowed to participate in the competition. -\paragraph{Regular tests are not conducted during the setup \& preparation phase.} The competition starts with \SONE{} (see~\refsec{chap:stage_I}). +\paragraph{Regular tests are not conducted during the setup \& preparation phase.} The competition starts with \SONE{} (see \Rulebook). \begin{table}[h] \newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} @@ -39,7 +39,7 @@ \section{General Setup} \item \textbf{Tables:} The local organization will set up and randomly assign team tables. \item \textbf{Groups:} Depending on the number of teams, the \OC{} may form multiple groups of teams (usually two) for the first (and second stage). The OC will assign teams to groups and announce the assignment to the teams. \item \textbf{\Arena{}:} The \Arena{} is available to all teams during the \iterm{Setup \& Preparation}. The OC may schedule special test or mapping slots in which \Arena{} access is limited to one or more teams exclusively (all teams get slots). Note, however, that the \Arena{} may not yet be complete and that the last work is conducted in the \Arena{} during the \SetupDays. - \item \textbf{Objects:} The delegation of EC, TC, OC and local organizers will buy the objects (see~\refsec{rule:scenario_objects}). Note, however, that the objects may not be available at all times and not from the beginning of the \iterm{Setup \& Preparation}. + \item \textbf{Objects:} The delegation of EC, TC, OC and local organizers will buy the objects (see \Rulebook). Note, however, that the objects may not be available at all times and not from the beginning of the \iterm{Setup \& Preparation}. \end{enumerate} \section{Welcome Reception} @@ -113,7 +113,7 @@ \section{Robot Inspection} \item voice of the robot (it must be loud and clear) \item custom containers (bowl, tray, etc.) \item external devices (including wireless network), if any - \item Alternative human-robot interfaces (see~\refsec{rule:asrcontinue}). + \item Alternative human-robot interfaces (see \Rulebook). \item \textbi{Standard Platform robots} \begin{itemize} \item no modifications have been made diff --git a/organization/acknowledgments.tex b/organization/acknowledgments.tex new file mode 100644 index 00000000..4a982b24 --- /dev/null +++ b/organization/acknowledgments.tex @@ -0,0 +1,87 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: acknowledgments.tex 404 2013-02-15 08:51:20Z sugiura $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: Acknowledgments for the RoboCupAtHome RuleBook +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + +\section*{About this document} +These are the organization guidelines of the RoboCup@Home competition \YEAR. It contains the procedures surrounding the Robocup@Home competition. Both those leading up to the event and those in place during the competition. This document excludes the tests the robot are expected to perform and the scores associated with them. Those can be found in the \Rulebook. +This document has been written by the \YEAR ~RoboCup@Home Technical Committee. + +\section*{How to cite this document} +If you refer to RoboCup@Home and this document in particular, please cite:\\ + +\noindent Justin Hart, Mauricio Matamoros, Alexander Moriarty, Hiroyuki Okada, +Matteo Leonetti, Alex Mitrevski, Katarzyna Pasternak, and Fagner Pimentel +\enquote{Robocup@Home \YEAR: Competition organization document,} +\url{https://athome.robocup.org/rules/\YEAR_organization.pdf}, \YEAR. + +\begin{center} + \begin{minipage}{0.8\textwidth} + \footnotesize% + \verbatiminput{citation.bib} + \end{minipage} +\end{center} + +\section*{Acknowledgments} +\label{sec:acknowledgments} +We would like to thank the members of the Technical Committee who put up the rules and the Organizing Committee who organizes the competition. +People that have been working on this document as members of one of the league's committees (in alphabetical order): +\begin{center} + \begin{minipage}{0.8\textwidth} + \begin{multicols}{3}% + \footnotesize + \noindent% + Adam Golding\\ + Akinobu Mizutani\\ + Alex Mitrevski\\ + Alexander Moriarty\\ + Caleb Rascon\\ + Fagner Pimentel\\ + Florian Lier\\ + Hiroyuki Okada\\ + Johannes Kummert\\ + Justin Hart\\ + Katarzyna Pasternak\\ + Komei Sugiura\\ + Loy van Beek\\ + Luca Iocchi\\ + Luca Lach\\ + Luis Contreras\\ + Matteo Leonetti\\ + Mauricio Matamoros\\ + Maxime St-Pierre\\ + Peter van Dooren\\ + Raphael Memmesheimer\\ + Sammy Pfeiffer\\ + Sebastian Meyer zu Borgsen\\ + Sven Wachsmuth\\ + Tijn van der Zant\\ + Yuma Yoshimoto + \end{multicols} + \end{minipage} +\end{center} + +\noindent We would also like to thank all the people who contributed to the RoboCup@Home league with their feedback and comments. +People that have been working on this rulebook as members of the league (in alphabetical order): +\begin{center} + \begin{minipage}{0.8\textwidth} + \begin{multicols}{2}% + \footnotesize + \noindent% + Lars Janssen\\ + Mark Finean\\ + Matthijs van der Burgh\\ + Syed Ali Raza\\ + \end{multicols} + \end{minipage} +\end{center} + + +% Local Variables: +% TeX-master: "../Rulebook" +% End: diff --git a/organization/documentinfo.tex b/organization/documentinfo.tex new file mode 100644 index 00000000..34ddccc2 --- /dev/null +++ b/organization/documentinfo.tex @@ -0,0 +1,11 @@ +%%% DOCUMENTINFO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\hypersetup{ + pdftitle = {RoboCup@Home Rules and Regulations on the organization of the competition}, + pdfsubject = {RoboCup@Home Organization}, + pdfauthor = {RoboCup@Home Technical Committee}, + pdfkeywords = {RoboCup, @Home, Rules, Competition}, + colorlinks = true, + anchorcolor = blue, + linkcolor = blue, + urlcolor = blue, +} diff --git a/organization/titlepage.tex b/organization/titlepage.tex new file mode 100644 index 00000000..8e2f3ff6 --- /dev/null +++ b/organization/titlepage.tex @@ -0,0 +1,32 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: titlepage.tex 428 2013-04-30 10:01:14Z holz $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: Title page for the RoboCupAtHome RuleBook +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{titlepage} + \begin{center} + { + \includegraphics[width=.25\textwidth]{images/logo_RoboCupFed.jpg} + \hfill + \includegraphics[width=.25\textwidth]{images/logo_RoboCupAtHome.jpg}\\[1.23ex] + } + \vspace{2.7 cm} + \hrulefill\par + {% + \vspace*{.27cm} + \Huge{RoboCup@Home}\\[1.23ex] + \Large Rules \& Regulations on the organization of the competition \\[2ex] + } + \hrulefill\par + \vfill + ~~ Version: \YEAR ~~Rev-\svnRevision ~~ \\ + ~~ Last Build Date: \today \quad Time: \the\time ~~ \\ + ~~ Last Revision Date: \svnChangeData ~~ %\\ + %\vfill + \end{center} +\end{titlepage} +% Local Variables: +% TeX-master: "../Rulebook" +% End: diff --git a/pages/acknowledgments.tex b/pages/acknowledgments.tex index a7bed565..b0dda776 100644 --- a/pages/acknowledgments.tex +++ b/pages/acknowledgments.tex @@ -9,7 +9,7 @@ \section*{About this rulebook} -This is the official rulebook of the RoboCup@Home competition \YEAR. +This is the official rulebook of the RoboCup@Home competition \YEAR. It contains the tests performed by the robots and the scoring associated with it. But excludes the organisational details, which can be found in the \Organisation. The rulebook has been written by the \YEAR ~RoboCup@Home Technical Committee. % Mauricio Matamoros, % and diff --git a/roadmap/acknowledgments.tex b/roadmap/acknowledgments.tex new file mode 100644 index 00000000..8f508ad6 --- /dev/null +++ b/roadmap/acknowledgments.tex @@ -0,0 +1,87 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: acknowledgments.tex 404 2013-02-15 08:51:20Z sugiura $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: Acknowledgments for the RoboCupAtHome RuleBook +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + +\section*{About this document} +This document presents the vision behind the RoboCup@Home competition. It also plots out the way the competition will evolve in the future. +This document has been written by the \YEAR ~RoboCup@Home Technical Committee. + +\section*{How to cite this document} +If you refer to RoboCup@Home and this document in particular, please cite:\\ + +\noindent Justin Hart, Mauricio Matamoros, Alexander Moriarty, Hiroyuki Okada, +Matteo Leonetti, Alex Mitrevski, Katarzyna Pasternak, and Fagner Pimentel +\enquote{Robocup@Home \YEAR: Roadmap,} +\url{https://athome.robocup.org/rules/\YEAR_roadmap.pdf}, \YEAR. + +\begin{center} + \begin{minipage}{0.8\textwidth} + \footnotesize% + \verbatiminput{citation.bib} + \end{minipage} +\end{center} + +\section*{Acknowledgments} +\label{sec:acknowledgments} +We would like to thank the members of the Technical Committee who put up the rules and the Organizing Committee who organizes the competition. +People that have been working on this document as members of one of the league's committees (in alphabetical order): +\begin{center} + \begin{minipage}{0.8\textwidth} + \begin{multicols}{3}% + \footnotesize + \noindent% + Adam Golding\\ + Akinobu Mizutani\\ + Alex Mitrevski\\ + Alexander Moriarty\\ + Caleb Rascon\\ + Fagner Pimentel\\ + Florian Lier\\ + Hiroyuki Okada\\ + Johannes Kummert\\ + Justin Hart\\ + Katarzyna Pasternak\\ + Komei Sugiura\\ + Loy van Beek\\ + Luca Iocchi\\ + Luca Lach\\ + Luis Contreras\\ + Matteo Leonetti\\ + Mauricio Matamoros\\ + Maxime St-Pierre\\ + Peter van Dooren\\ + Raphael Memmesheimer\\ + Sammy Pfeiffer\\ + Sebastian Meyer zu Borgsen\\ + Sven Wachsmuth\\ + Tijn van der Zant\\ + Yuma Yoshimoto + \end{multicols} + \end{minipage} +\end{center} + +\noindent We would also like to thank all the people who contributed to the RoboCup@Home league with their feedback and comments. +People that have been working on this document as members of the league (in alphabetical order): +\begin{center} + \begin{minipage}{0.8\textwidth} + \begin{multicols}{2}% + \footnotesize + \noindent% + Lars Janssen\\ + Mark Finean\\ + Matthijs van der Burgh\\ + Syed Ali Raza\\ + \end{multicols} + \end{minipage} +\end{center} + + +% Local Variables: +% TeX-master: "../Rulebook" +% End: diff --git a/roadmap/documentinfo.tex b/roadmap/documentinfo.tex new file mode 100644 index 00000000..ece76a18 --- /dev/null +++ b/roadmap/documentinfo.tex @@ -0,0 +1,11 @@ +%%% DOCUMENTINFO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\hypersetup{ + pdftitle = {RoboCup@Home Roadmap}, + pdfsubject = {RoboCup@Home Roadmap}, + pdfauthor = {RoboCup@Home Executive Committee}, + pdfkeywords = {RoboCup, @Home, Competition}, + colorlinks = true, + anchorcolor = blue, + linkcolor = blue, + urlcolor = blue, +} diff --git a/roadmap/titlepage.tex b/roadmap/titlepage.tex new file mode 100644 index 00000000..772268a7 --- /dev/null +++ b/roadmap/titlepage.tex @@ -0,0 +1,32 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $Id: titlepage.tex 428 2013-04-30 10:01:14Z holz $ +%% author(s): RoboCupAtHome Technical Committee(s) +%% description: Title page for the RoboCupAtHome RuleBook +%% +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{titlepage} + \begin{center} + { + \includegraphics[width=.25\textwidth]{images/logo_RoboCupFed.jpg} + \hfill + \includegraphics[width=.25\textwidth]{images/logo_RoboCupAtHome.jpg}\\[1.23ex] + } + \vspace{2.7 cm} + \hrulefill\par + {% + \vspace*{.27cm} + \Huge{RoboCup@Home}\\[1.23ex] + \Large Roadmap \\[2ex] + } + \hrulefill\par + \vfill + ~~ Version: \YEAR ~~Rev-\svnRevision ~~ \\ + ~~ Last Build Date: \today \quad Time: \the\time ~~ \\ + ~~ Last Revision Date: \svnChangeData ~~ %\\ + %\vfill + \end{center} +\end{titlepage} +% Local Variables: +% TeX-master: "../Rulebook" +% End: diff --git a/rulebook.tex b/rulebook.tex index 57faeb6c..17b45f37 100644 --- a/rulebook.tex +++ b/rulebook.tex @@ -11,6 +11,9 @@ %%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \input{./setup/packages.tex} \input{./setup/config.tex} +\input{./rulebook_pages/documentinfo.tex} +% footertext +\newcommand{\footline}{RoboCup@Home Rulebook / \rulebookVersion} \input{./setup/styling.tex} @@ -50,13 +53,13 @@ \setcounter{page}{1} \pagenumbering{arabic} -\input{Introduction} +\input{rulebook_pages/Introduction} -\input{CompetitionConcepts} +%\input{CompetitionConcepts} -\input{GeneralRules} +\input{rulebook_pages/GeneralRules} -\input{Setup} +%\input{Setup} diff --git a/rulebook_pages/GeneralRules.tex b/rulebook_pages/GeneralRules.tex new file mode 100644 index 00000000..91af8d4c --- /dev/null +++ b/rulebook_pages/GeneralRules.tex @@ -0,0 +1,38 @@ +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% $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} + +%\input{general_rules/ManipulationChallenge} +% Local Variables: +% TeX-master: "Rulebook" +% End: diff --git a/Introduction.tex b/rulebook_pages/Introduction.tex similarity index 92% rename from Introduction.tex rename to rulebook_pages/Introduction.tex index 008a54a8..7d150914 100644 --- a/Introduction.tex +++ b/rulebook_pages/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/Leagues} \input{introduction/Competition} -\input{introduction/Awards} +%\input{introduction/Awards} % Local Variables: % TeX-master: "Rulebook" diff --git a/rulebook_pages/documentinfo.tex b/rulebook_pages/documentinfo.tex new file mode 100644 index 00000000..4497ed98 --- /dev/null +++ b/rulebook_pages/documentinfo.tex @@ -0,0 +1,11 @@ +%%% DOCUMENTINFO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\hypersetup{ + pdftitle = {RoboCup@Home Rules and Regulations}, + pdfsubject = {RoboCup@Home Rulebook}, + pdfauthor = {RoboCup@Home Technical Committee}, + pdfkeywords = {RoboCup, @Home, Rules, Competition}, + colorlinks = true, + anchorcolor = blue, + linkcolor = blue, + urlcolor = blue, +} diff --git a/score_sheets.tex b/scoresheets.tex similarity index 98% rename from score_sheets.tex rename to scoresheets.tex index afbc0156..0b4379ee 100644 --- a/score_sheets.tex +++ b/scoresheets.tex @@ -1,6 +1,6 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% $Id: score_sheets.tex 432 2013-05-21 15:33:27Z stueckler $ +%% $Id: scoresheets.tex 432 2013-05-21 15:33:27Z stueckler $ %% author(s): RoboCup@Home Technical Committee %% description: RoboCup@Home Rulebook: Score Sheets %% diff --git a/setup/config.tex b/setup/config.tex index 1b6b9ac0..594d6d0e 100644 --- a/setup/config.tex +++ b/setup/config.tex @@ -35,16 +35,4 @@ \addtokomafont{caption}{\small} \setkomafont{captionlabel}{\small\bfseries} \setkomafont{descriptionlabel}{\normalfont\bfseries} -\renewcommand*{\chapterformat}{\LARGE{Chapter \thechapter}} - -%%% DOCUMENTINFO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\hypersetup{ - pdftitle = {RoboCup@Home Rules and Regulations}, - pdfsubject = {RoboCup@Home Rulebook}, - pdfauthor = {RoboCup@Home Technical Committee}, - pdfkeywords = {RoboCup, @Home, Rules, Competition}, - colorlinks = true, - anchorcolor = blue, - linkcolor = blue, - urlcolor = blue, -} \ No newline at end of file +\renewcommand*{\chapterformat}{\LARGE{Chapter \thechapter}} \ No newline at end of file diff --git a/setup/macros.tex b/setup/macros.tex index 65db2b2d..52ac3331 100644 --- a/setup/macros.tex +++ b/setup/macros.tex @@ -7,7 +7,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % rubber: setlist arguments --shell-escape -\input{./setup/macros_score_sheets.tex} +\input{./setup/macros_scoresheets.tex} \input{./setup/macros_open_demonstrations.tex} \input{./setup/macros_leagues.tex} @@ -18,6 +18,8 @@ \def\robocup{{\textsc{RoboCup}}} \def\AtHome{{\textsc{@Home}}} \def\Symp{{\textsc{RoboCup Symposium}}} +\def\Rulebook{{\textsc{Rulebook}}} +\def\Organisation{{\textsc{Competition Organisation Document}}} \def\OPL{\iaterm{Open Platform League}{OPL}} \def\SPL{\iaterm{Standard Platform League}{SPL}} diff --git a/setup/macros_score_sheets.tex b/setup/macros_scoresheets.tex similarity index 99% rename from setup/macros_score_sheets.tex rename to setup/macros_scoresheets.tex index 6704cdd8..0d8c57f5 100644 --- a/setup/macros_score_sheets.tex +++ b/setup/macros_scoresheets.tex @@ -4,7 +4,7 @@ % % % Author: Dirk Holz & David Gossow % % Modif : Mauricio Matamoros % -% $Id: macros_score_sheets.tex 429 2013-04-30 10:09:55Z holz $ % +% $Id: macros_scoresheets.tex 429 2013-04-30 10:09:55Z holz $ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % chktex-file 1 % chktex-file 15 @@ -80,7 +80,7 @@ % \input{my_score_sheet.tex} % -= End Snippet =- % -% -= Snippet (score_sheets.tex) =- +% -= Snippet (scoresheets.tex) =- % \begin[options]{scoresheet} % \input{my_score_sheet.tex} % \end{scoresheet} diff --git a/setup/styling.tex b/setup/styling.tex index b6a3a8c9..ecc6ba7f 100644 --- a/setup/styling.tex +++ b/setup/styling.tex @@ -8,7 +8,6 @@ %%% HEADINGS & PAGE STYLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\footline}{RoboCup@Home Rulebook / \rulebookVersion} \pagestyle{fancy} \renewcommand{\chaptermark}[1]{\markboth{\chaptername\ \thechapter. \ #1}{}} \renewcommand{\sectionmark}[1]{\markright{\thesection \ #1}{}\renewcommand{\currentTest}{#1}}