Tpm cleanups (#48)

* add breaking sample of & in tcgnote

* move draft text up, widen toc numbers as needed, and delete tcgnote/example

* move toc fixes

* squelch the draft text

* move toc hacks

* spell accsupp properly

* minor changes to draft watermark

* try using draftwatermark

* commit file that didn't get committed

* move draftwatermark

* tweak draft watermark options

* lighter

Author: chrisfenner

Dockerfile

@@ -42,7 +42,8 @@ RUN tlmgr update --self && \
     newunicodechar \
     tocloft \
     tools \
-    changepage
+    changepage \
+    draftwatermark
 
 RUN apk upgrade && apk add --no-cache \
     bash \

sample1.md

@@ -125,15 +125,6 @@ int main() {
 }
 ```
 
-\begin{tcgnote}
-some notes, bla bla bla bla bla bla, hello bla, hello bla. this is some words,
-watch out for this thing. you have to know about it. thanks for reading this note!
-\end{tcgnote}
-
-\begin{tcgexample}
-do it this way
-\end{tcgexample}
-
 ## Another Couple Tables
 
 Uncaptioned table:

template/eisvogel.latex

@@ -34,7 +34,7 @@
 %%
 
 %% Enable useful error output.
-\errorcontextlines=10000
+\errorcontextlines 10000
 
 %%
 % This template has been heavily customized for Trusted Computing Group.
@@ -124,6 +124,15 @@ $endif$
 
 \IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}}
 
+% Clean up the TOC a bit by ensuring that long section numbers don't overlap.
+% https://tex.stackexchange.com/questions/64115/table-of-contents-chapter-number-width
+\usepackage{tocloft}
+\makeatletter
+\renewcommand{\numberline}[1]{
+  \@cftbsnum #1\@cftasnum~\@cftasnumb
+}
+\makeatother
+
 % PDF metadata
 \hypersetup{
 $if(title-meta)$
@@ -192,17 +201,6 @@ $endif$
 \RaggedRight{}
 \sloppy
 
-% Define some special environments for TPM spec style NOTE and EXAMPLE
-\usepackage{changepage}
-\newenvironment{tcgnote}
-{\begin{adjustwidth}{6em}{}
-  \makebox[0pt][r]{\makebox[6em][l]{NOTE:}}\ignorespaces}
-{\end{adjustwidth}}
-\newenvironment{tcgexample}
-{\begin{adjustwidth}{6em}{}
-  \makebox[0pt][r]{\makebox[6em][l]{EXAMPLE:}}\ignorespaces}
-{\end{adjustwidth}}
-
 % Customizations to the behavior of tables
 $if(tables)$
 \usepackage{longtable,booktabs,array}
@@ -584,20 +582,8 @@ $else$
 
 \fancypagestyle{eisvogel-header-footer}{
   \fancyhead{}
-  \fancyhead[C]
-   {
-     \ifthenelse{\equal{\detokenize{$status$}}{\detokenize{DRAFT}}}
-     {
-       \begin{textblock*}{8.5in}(-0.3in,0.4in)
-       \fontsize{300}{360}{
-         \begin{turn}{50}
-         \textsf{\textcolor{gray}{\transparent{0.1}{DRAFT}}}
-         \end{turn}
-       }
-       \end{textblock*}
-     }
-     {}
-   }  \fancyfoot{}
+  \fancyhead[C]{}
+  \fancyfoot{}
   \fancyfoot[C]
   {
     \begin{textblock*}{8.5in}(0in,10.7in)
@@ -727,11 +713,12 @@ $if(template)$
   {}
 $endif$
 
-% Clean up the TOC a bit by ensuring that long section numbers don't overlap.
-% \usepackage[titles]{tocloft}
-% \renewcommand*{\cftsecnumwidth}{10em}
-% \renewcommand*{\cftsubsecnumwidth}{10em}
-% \renewcommand*{\cftsubsubsecnumwidth}{10em}
+\ifthenelse{\equal{\detokenize{$status$}}{\detokenize{DRAFT}}}
+{
+  \usepackage[scale=2, colorspec=0.95]{draftwatermark}
+}
+{}
+
 \begin{document}
 
 %%