Browse Source

template and Makefile improvements

master
Dirk Alders 3 years ago
parent
commit
af2221019b
2 changed files with 16 additions and 12 deletions
  1. 12
    8
      scripts/Makefile
  2. 4
    4
      templates/tex/requirement_specification.tex

+ 12
- 8
scripts/Makefile View File

1
-.PHONY: all
2
-.PRECIOUS: %.tex
1
+TARGET=specification
3
 
2
 
4
-all: specification.pdf clean
3
+.PHONY: all tex pdf clean cleanall
5
 
4
 
6
-%.tex: %.reqif
7
-	python3 reqif/scripts/parse.py $<
5
+all: pdf clean
8
 
6
 
9
-%.pdf: %.tex
10
-	latexmk -pdf -pdflatex="pdflatex -interaction=nonstopmode" -use-make $<
7
+tex:
8
+	python3 reqif/scripts/parse.py $(TARGET).reqif
9
+	
10
+pdf: tex
11
+	latexmk -pdf -pdflatex="pdflatex -interaction=nonstopmode" -use-make $(TARGET).tex
11
 
12
 
12
 clean:
13
 clean:
13
-	latexmk -c
14
+	latexmk -c -f $(TARGET).tex
14
 	rm -f *~ *.tex
15
 	rm -f *~ *.tex
16
+
17
+cleanall: clean
18
+	rm $(TARGET).pdf

+ 4
- 4
templates/tex/requirement_specification.tex View File

9
 		{%- if item.system_type_uid == '_4-K5EHYYEem_kd-7nxt1sg' %}
9
 		{%- if item.system_type_uid == '_4-K5EHYYEem_kd-7nxt1sg' %}
10
 			\section{ {{macros.latex_filter(item.Heading)}} }
10
 			\section{ {{macros.latex_filter(item.Heading)}} }
11
 		{%- elif item.system_type_uid == '_MR7eNHYYEem_kd-7nxt1sg' %}
11
 		{%- elif item.system_type_uid == '_MR7eNHYYEem_kd-7nxt1sg' %}
12
-			\subsection{\xspace{}{{ macros.latex_filter(item.ID) }}: {{macros.latex_filter(item.Heading)}} }
12
+			\subsection{\xspace{}{{ item.ID }}: {{ item.Heading }} }
13
 			{%- if 'Description' in item and item.Description != '' %}
13
 			{%- if 'Description' in item and item.Description != '' %}
14
-				{{ macros.requirement_filter(item.Description) }}
14
+				{{ item.Description }}
15
 			 	{%- if 'ReasonForImplementation' in item and item.ReasonForImplementation != '' or 'Fitcriterion' in item and item.Fitcriterion != ''%}
15
 			 	{%- if 'ReasonForImplementation' in item and item.ReasonForImplementation != '' or 'Fitcriterion' in item and item.Fitcriterion != ''%}
16
 
16
 
17
 					\begin{tabu}{lX}
17
 					\begin{tabu}{lX}
18
 					\toprule
18
 					\toprule
19
 					{%- if 'ReasonForImplementation' in item and item.ReasonForImplementation != '' %}
19
 					{%- if 'ReasonForImplementation' in item and item.ReasonForImplementation != '' %}
20
-						\emph{Reason} & {{ macros.requirement_filter(item.ReasonForImplementation) }}\\
20
+						\emph{Reason} & {{ item.ReasonForImplementation }}\\
21
 					{%- endif %}
21
 					{%- endif %}
22
 					{%- if 'Fitcriterion' in item and item.Fitcriterion != '' %}
22
 					{%- if 'Fitcriterion' in item and item.Fitcriterion != '' %}
23
-						\emph{Fitcriterion} & {{ macros.requirement_filter(item.Fitcriterion) }}\\
23
+						\emph{Fitcriterion} & {{ item.Fitcriterion }}\\
24
 					{%- endif %}
24
 					{%- endif %}
25
 					\bottomrule
25
 					\bottomrule
26
 					\end{tabu}
26
 					\end{tabu}

Loading…
Cancel
Save