diff --git a/caderno.pdf b/caderno.pdf index 970826445bf0225f4bacd14f6373a284c0903289..887d01009ac3ee9c9c93306db15ecca5c183791b 100644 Binary files a/caderno.pdf and b/caderno.pdf differ diff --git a/notebook/gen_latex.py b/notebook/gen_latex.py index 264a5f00d721be46901e02a399563de884cd2f42..385e53086c40874c8d4cc6185021db709ece7600 100644 --- a/notebook/gen_latex.py +++ b/notebook/gen_latex.py @@ -111,7 +111,8 @@ class LatexGenerator: # Writes own header to LaTeX output. def output_header(self, write): - write('\\begin{adjustwidth}{5pt}{5pt}\n') + if len(self.header) > 0: + write('\\begin{adjustwidth}{5pt}{5pt}\n') if 'Description' in self.header: write('\\textbf{\\footnotesize Description: }\n') @@ -119,35 +120,29 @@ class LatexGenerator: write('\\\\\n') write('~\\\\\n') - if 'Time' in self.header: - write('\\textbf{\\footnotesize Time: }') - if len(self.header['Time']) > 1: - write('\n') - write('\\begin{compactitem}\n') - for i in self.header['Time']: - line = i[1:].split(':') - write('\\item{\\footnotesize{%s: $%s$}}\n' % - (line[0].strip().replace('_', '\\_'), - line[1].strip())) - write('\\end{compactitem}\n') - else: - write('\\footnotesize{$%s$}\\\\\n' % self.header['Time'][0]) - - if 'Space' in self.header: - write('\\textbf{\\footnotesize Space: }') - if len(self.header['Space']) > 1: - write('\n') - write('\\begin{compactitem}\n') - for i in self.header['Space']: - line = i[1:].split(':') - write('\\item{\\footnotesize{%s: $%s$}}\n' % - (line[0].strip().replace('_', '\\_'), - line[1].strip())) - write('\\end{compactitem}\n') - else: - write('\\footnotesize{$%s$}\n' % self.header['Space'][0]) + def output_complexity(comp): + if comp in self.header: + write('\\textbf{\\footnotesize %s: }' % comp) + if len(self.header[comp]) > 1: + write('\n') + write('\\begin{compactitem}\n') + for i in self.header[comp]: + line = i[1:].split(':') + write('\\item{\\footnotesize{%s: $%s$}}\n' % + (line[0].strip().replace('_', '\\_'), + line[1].strip())) + write('\\end{compactitem}\n') + else: + write('\\footnotesize{$%s$}\n' % self.header[comp][0]) + return True + return False + + if output_complexity('Time'): + write('~\\\\\n') + output_complexity('Space') - write('\\end{adjustwidth}\n') + if len(self.header) > 0: + write('\\end{adjustwidth}\n') def __init__(self, tree, output, header): self.output = open(output, 'w') diff --git a/notebook/header.tex b/notebook/header.tex index 871d53e4afcd5d2db54528eb2bf9f4710ffa2ee2..52335f0c892649b408556c04747b546d38ebae11 100644 --- a/notebook/header.tex +++ b/notebook/header.tex @@ -52,7 +52,6 @@ basicstyle=\scriptsize\ttfamily, tabsize=2, backgroundcolor=\color{light-gray}, -% frame=t, breaklines=true, morekeywords={int32\_t, ll} } @@ -61,7 +60,7 @@ \lstdefinestyle{customvim}{ basicstyle=\scriptsize\ttfamily, tabsize=2, -% frame=t, + backgroundcolor=\color{light-gray}, breaklines=true, morekeywords={set} }