From d40c31c264370fd6af7b33b62efecf4fe804304e Mon Sep 17 00:00:00 2001
From: Markus Scheller <scheller_m@live.de>
Date: Sat, 17 Feb 2018 22:20:52 +0100
Subject: [PATCH 1/3] Umstellen auf die neue Funktion in der TeX-Klasse: \Todo

protokollsystem/proto3#165
---
 models/database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/database.py b/models/database.py
index a559fd0..49b0635 100644
--- a/models/database.py
+++ b/models/database.py
@@ -611,7 +611,7 @@ class Todo(DatabaseModel):
         return " ".join(parts)
 
     def render_latex(self, current_protocol=None):
-        return r"\textbf{{{}}}: {}: {} -- {}".format(
+        return r"\Todo{{{}}}{{{}}}{{{}}}{{{}}}".format(
             "Neuer Todo" if self.is_new(current_protocol) else "Todo",
             escape_tex(self.who),
             escape_tex(self.description),
-- 
GitLab


From 59d5ac1c51165e49ca1b896866f9c6771ccbf427 Mon Sep 17 00:00:00 2001
From: Markus Scheller <scheller_m@live.de>
Date: Sat, 17 Feb 2018 22:22:04 +0100
Subject: [PATCH 2/3] Umstellen auf die neue Funktion in der LaTeX-Klasse:
 \Beschluss

protokollsystem/proto3#165
---
 protoparser.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/protoparser.py b/protoparser.py
index cac3b43..3103312 100644
--- a/protoparser.py
+++ b/protoparser.py
@@ -221,12 +221,10 @@ class Tag:
                     return ""
                 return self.todo.render_latex(current_protocol=protocol)
             elif self.name == "beschluss":
-                parts = [r"\textbf{{Beschluss:}} {}".format(self.decision.content)]
                 if len(self.decision.categories):
-                    parts.append(
-                        r"\textit{{({})}}".format(self.decision.get_categories_str())
-                    )
-                return " ".join(parts)
+                    return r"\Beschluss[{}]{{{}}}".format(self.decision.get_categories_str(),self.decision.content)
+                else:
+                    return r"\Beschluss{{{}}}".format(self.decision.content)
             elif self.name == "footnote":
                 return r"\footnote{{{}}}".format(self.values[0])
             return r"\textbf{{{}:}} {}".format(escape_tex(self.name.capitalize()), escape_tex(";".join(self.values)))
-- 
GitLab


From 0238c9b2ffd6e7561ed14d21f69db7ab7d3e4d70 Mon Sep 17 00:00:00 2001
From: Markus Scheller <scheller_m@live.de>
Date: Sat, 17 Feb 2018 22:24:03 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Einf=C3=BChren=20der=20neuen=20Styling-Funk?=
 =?UTF-8?q?tionen=20Todo=20und=20Beschluss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close protokollsystem/proto3#165
---
 templates/protokoll2.cls | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/protokoll2.cls b/templates/protokoll2.cls
index 9acc5a8..75f0168 100644
--- a/templates/protokoll2.cls
+++ b/templates/protokoll2.cls
@@ -250,3 +250,6 @@
 
 \newcommand{\PE}[2]{\textbf{Persönliche Erklärung von #1:}\\\emph{\glqq{}#2\grqq{}}\\}
 
+% Styling der Todo und Beschlusstags im Protokoll
+\newcommand{\Todo}[4]{\textbf{{#1}}: #2: #3 -- #4}
+\newcommand{\Beschluss}[2][\empty]{\textbf{Beschluss:} #2 \def\temp{#1}\ifx\temp\empty\else\textit{(#1)}\fi}
-- 
GitLab