From 4a5206390cf615d4c96d4d91b2cd08cc874aac6a Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sat, 13 Aug 2022 23:40:46 -0700 Subject: [PATCH 01/11] try out some tweaks to the tables --- template/eisvogel.latex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 08ff7f8..4e5e3b6 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -685,7 +685,8 @@ $endif$ $if(tables)$ \definecolor{table-row-color}{HTML}{F5F5F5} -\definecolor{table-rule-color}{HTML}{999999} +\definecolor{table-alt-color}{HTML}{D1E3A0} +\definecolor{table-rule-color}{HTML}{FFFFFF} %\arrayrulecolor{black!40} \arrayrulecolor{table-rule-color} % color of \toprule, \midrule, \bottomrule @@ -708,7 +709,7 @@ $if(table-use-row-colors)$ \let\oldlongtable\longtable \let\endoldlongtable\endlongtable \renewenvironment{longtable}{ -\rowcolors{3}{}{table-row-color!100} % row color +\rowcolors{3}{table-alt-color!100}{table-row-color!100} % row color \oldlongtable} { \endoldlongtable \global\rownum=0\relax} From 7ae97d23fe14472880bcc1136f911780130d1835 Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sat, 13 Aug 2022 23:48:35 -0700 Subject: [PATCH 02/11] try it with bold/italic headers --- sample1.md | 4 ++-- sample2.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sample1.md b/sample1.md index 6c6327f..b706e86 100644 --- a/sample1.md +++ b/sample1.md @@ -41,7 +41,7 @@ and brands contained herein are the property of their respective owners. # CHANGE HISTORY -| Revision | Date | Description | +| **Revision** | **Date** | **Description** | | -------- | ---------- | --------------- | | 0.2/17 | 2022/08/10 | Initial draft | | 0.2/18 | 2022/08/10 | Add page breaks | @@ -73,7 +73,7 @@ culpa qui officia deserunt mollit anim id est laborum. Table: List of Mandatory Algorithms -| Algorithm ID | M/R/O/D | Comments | +| *Algorithm ID* | *M/R/O/D* | *Comments* | | ---------------- | ------- | --------------------------------------------- | | TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | | TPM_ALG_ECDSA | M | diff --git a/sample2.md b/sample2.md index d857a14..1142054 100644 --- a/sample2.md +++ b/sample2.md @@ -41,7 +41,7 @@ and brands contained herein are the property of their respective owners. # CHANGE HISTORY -| Revision | Date | Description | +| ***Revision*** | ***Date*** | ***Description*** | | -------- | ---------- | --------------- | | 0.2/17 | 2022/08/10 | Initial draft | | 0.2/18 | 2022/08/10 | Add page breaks | @@ -100,7 +100,7 @@ graph TD; Table: List of Mandatory Algorithms -| Algorithm ID | M/R/O/D | Comments | +| ***Algorithm ID*** | ***M/R/O/D*** | ***Comments*** | | ---------------- | ------- | --------------------------------------------- | | TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | | TPM_ALG_ECDSA | M | @@ -124,7 +124,7 @@ Table: List of Mandatory Algorithms Table: List of Mandatory Curves -| Curve Identifier | M/R/O/D | Comments | +| ***Curve Identifier*** | ***M/R/O/D*** | ***Comments*** | | ----------------- | ------- | -------- | | TPM_ECC_NIST_P256 | M | | TPM_ECC_NIST_P384 | M | From d287ff185d45b4c187b2f05c2fc40d9547b7ecdd Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sat, 13 Aug 2022 23:59:00 -0700 Subject: [PATCH 03/11] try some crazy stuff from the internet --- template/eisvogel.latex | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 4e5e3b6..604b6e2 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -694,25 +694,11 @@ $if(tables)$ \renewcommand{\arraystretch}{1.3} % spacing (padding) $if(table-use-row-colors)$ -% TODO: This doesn't work anymore. I don't know why. -% Reset rownum counter so that each table -% starts with the same row colors. -% https://tex.stackexchange.com/questions/170637/restarting-rowcolors -% -% Unfortunately the colored cells extend beyond the edge of the -% table because pandoc uses @-expressions (@{}) like so: -% -% \begin{longtable}[]{@{}ll@{}} -% \end{longtable} -% -% https://en.wikibooks.org/wiki/LaTeX/Tables#.40-expressions -\let\oldlongtable\longtable -\let\endoldlongtable\endlongtable -\renewenvironment{longtable}{ -\rowcolors{3}{table-alt-color!100}{table-row-color!100} % row color -\oldlongtable} { -\endoldlongtable -\global\rownum=0\relax} +\usepackage{etoolbox} +\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!100}{table-alt-color!100}} +\apptocmd{\toprule}{\hiderowcolors}{}{} +\apptocmd{\endhead}{\showrowcolors}{}{} +\apptocmd{\endfirsthead}{\showrowcolors}{}{} $endif$ $endif$ From 3479bbffe7f9bf83f9c0f7f76ef6da11064a16fe Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:08:35 -0700 Subject: [PATCH 04/11] try to fix the stray parens --- template/eisvogel.latex | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 604b6e2..57640d9 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -688,17 +688,16 @@ $if(tables)$ \definecolor{table-alt-color}{HTML}{D1E3A0} \definecolor{table-rule-color}{HTML}{FFFFFF} -%\arrayrulecolor{black!40} \arrayrulecolor{table-rule-color} % color of \toprule, \midrule, \bottomrule \setlength\heavyrulewidth{0.3ex} % thickness of \toprule, \bottomrule \renewcommand{\arraystretch}{1.3} % spacing (padding) $if(table-use-row-colors)$ \usepackage{etoolbox} -\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!100}{table-alt-color!100}} -\apptocmd{\toprule}{\hiderowcolors}{}{} -\apptocmd{\endhead}{\showrowcolors}{}{} -\apptocmd{\endfirsthead}{\showrowcolors}{}{} +\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} +\apptocmd{\toprule}{\hiderowcolors()}{}{} +\apptocmd{\endhead}{\showrowcolors()}{}{} +\apptocmd{\endfirsthead}{\showrowcolors()}{}{} $endif$ $endif$ From 8dfaac0e62f1eeab420b01e8103975846dbac36b Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:17:36 -0700 Subject: [PATCH 05/11] try some more things --- template/eisvogel.latex | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 57640d9..93d8bfb 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -694,10 +694,9 @@ $if(tables)$ $if(table-use-row-colors)$ \usepackage{etoolbox} -\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} -\apptocmd{\toprule}{\hiderowcolors()}{}{} -\apptocmd{\endhead}{\showrowcolors()}{}{} -\apptocmd{\endfirsthead}{\showrowcolors()}{}{} +\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color}{table-alt-color}} +\apptocmd{\toprule}{\hiderowcolors}{}{} +\apptocmd{\midrule}{\showrowcolors}{}{} $endif$ $endif$ From c9f5381805f0a48fc4ae72b53927eb22f7f3a85c Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:23:54 -0700 Subject: [PATCH 06/11] try using appto --- template/eisvogel.latex | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 93d8bfb..599781a 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -694,9 +694,10 @@ $if(tables)$ $if(table-use-row-colors)$ \usepackage{etoolbox} -\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color}{table-alt-color}} -\apptocmd{\toprule}{\hiderowcolors}{}{} -\apptocmd{\midrule}{\showrowcolors}{}{} +\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} +\appto{\toprule}{\hiderowcolors}{}{} +\appto{\endhead}{\showrowcolors}{}{} +\appto{\endfirsthead}{\showrowcolors}{}{} $endif$ $endif$ From 1ffec512f4b7719d1c34da7f90021596e311e2f7 Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:27:24 -0700 Subject: [PATCH 07/11] try not appending to toprule --- template/eisvogel.latex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 599781a..c27713f 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -695,7 +695,7 @@ $if(tables)$ $if(table-use-row-colors)$ \usepackage{etoolbox} \AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} -\appto{\toprule}{\hiderowcolors}{}{} +%\appto{\toprule}{\hiderowcolors}{}{} \appto{\endhead}{\showrowcolors}{}{} \appto{\endfirsthead}{\showrowcolors}{}{} $endif$ From 1258763a91373de533fec6ab2b921f955e4287c0 Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:35:16 -0700 Subject: [PATCH 08/11] try some spare empty braces --- template/eisvogel.latex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index c27713f..6e505a3 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -695,9 +695,9 @@ $if(tables)$ $if(table-use-row-colors)$ \usepackage{etoolbox} \AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} -%\appto{\toprule}{\hiderowcolors}{}{} -\appto{\endhead}{\showrowcolors}{}{} -\appto{\endfirsthead}{\showrowcolors}{}{} +\appto{\toprule}{\hiderowcolors{}}{}{} +\appto{\endhead}{\showrowcolors{}}{}{} +\appto{\endfirsthead}{\showrowcolors{}}{}{} $endif$ $endif$ From d08c4af6cf22b1810d6b564d1de18b3a4610d131 Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:40:04 -0700 Subject: [PATCH 09/11] try preto --- template/eisvogel.latex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/eisvogel.latex b/template/eisvogel.latex index 6e505a3..1f1c5f3 100644 --- a/template/eisvogel.latex +++ b/template/eisvogel.latex @@ -695,9 +695,9 @@ $if(tables)$ $if(table-use-row-colors)$ \usepackage{etoolbox} \AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}} -\appto{\toprule}{\hiderowcolors{}}{}{} -\appto{\endhead}{\showrowcolors{}}{}{} -\appto{\endfirsthead}{\showrowcolors{}}{}{} +\preto{\toprule}{\hiderowcolors}{}{} +\appto{\endhead}{\showrowcolors}{}{} +\appto{\endfirsthead}{\showrowcolors}{}{} $endif$ $endif$ From 10e4b29be081d250423cc6c190102d4706e6a4e9 Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:51:33 -0700 Subject: [PATCH 10/11] clean up the tables --- sample1.md | 60 +++++++++++++++++++++++++++--------------------------- sample2.md | 60 +++++++++++++++++++++++++++--------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/sample1.md b/sample1.md index b706e86..1e38f3c 100644 --- a/sample1.md +++ b/sample1.md @@ -41,10 +41,10 @@ and brands contained herein are the property of their respective owners. # CHANGE HISTORY -| **Revision** | **Date** | **Description** | -| -------- | ---------- | --------------- | -| 0.2/17 | 2022/08/10 | Initial draft | -| 0.2/18 | 2022/08/10 | Add page breaks | +| **Revision** | **Date** | **Description** | +| ------------ | ---------- | --------------- | +| 0.2/17 | 2022/08/10 | Initial draft | +| 0.2/18 | 2022/08/10 | Add page breaks | \newpage @@ -73,34 +73,34 @@ culpa qui officia deserunt mollit anim id est laborum. Table: List of Mandatory Algorithms -| *Algorithm ID* | *M/R/O/D* | *Comments* | -| ---------------- | ------- | --------------------------------------------- | -| TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | -| TPM_ALG_ECDSA | M | -| TPM_ALG_ECDH | M | -| TPM_ALG_ECDAA | O | -| TPM_ALG_RSA | O | -| TPM_ALG_RSAES | O | -| TPM_ALG_RSAPSS | O | -| TPM_ALG_RSAOAEP | O | -| TPM_ALG_AES | M | -| TPM_ALG_SHA256 | M | -| TPM_ALG_SHA384 | M | -| TPM_ALG_SHA512 | O | -| TPM_ALG_HMAC | M | -| TPM_ALG_SHA3_256 | O | -| TPM_ALG_SHA3_384 | O | -| TPM_ALG_SHA3_512 | O | -| TPM_ALG_NULL | M | +| **Algorithm ID** | **M/R/O/D** | **Comments** | +| ---------------- | ----------- | --------------------------------------------- | +| TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | +| TPM_ALG_ECDSA | M | +| TPM_ALG_ECDH | M | +| TPM_ALG_ECDAA | O | +| TPM_ALG_RSA | O | +| TPM_ALG_RSAES | O | +| TPM_ALG_RSAPSS | O | +| TPM_ALG_RSAOAEP | O | +| TPM_ALG_AES | M | +| TPM_ALG_SHA256 | M | +| TPM_ALG_SHA384 | M | +| TPM_ALG_SHA512 | O | +| TPM_ALG_HMAC | M | +| TPM_ALG_SHA3_256 | O | +| TPM_ALG_SHA3_384 | O | +| TPM_ALG_SHA3_512 | O | +| TPM_ALG_NULL | M | ### Mandatory Curves Table: List of Mandatory Curves -| Curve Identifier | M/R/O/D | Comments | -| ----------------- | ------- | -------- | -| TPM_ECC_NIST_P256 | M | -| TPM_ECC_NIST_P384 | M | +| **Curve Identifier** | **M/R/O/D** | **Comments** | +| -------------------- | ----------- | ------------ | +| TPM_ECC_NIST_P256 | M | +| TPM_ECC_NIST_P384 | M | ## Code @@ -117,6 +117,6 @@ int main() { Table: Fantastic Table -| Column 1 | Column 2 | Column 3 | -| -------- | -------- | -------- | -| AAAAAAAA | BBBBBBBB | CCCCCCCC | +| **Column 1** | **Column 2** | **Column 3** | +| ------------ | ------------ | ------------ | +| AAAAAAAA | BBBBBBBB | CCCCCCCC | diff --git a/sample2.md b/sample2.md index 1142054..ccaf72e 100644 --- a/sample2.md +++ b/sample2.md @@ -41,10 +41,10 @@ and brands contained herein are the property of their respective owners. # CHANGE HISTORY -| ***Revision*** | ***Date*** | ***Description*** | -| -------- | ---------- | --------------- | -| 0.2/17 | 2022/08/10 | Initial draft | -| 0.2/18 | 2022/08/10 | Add page breaks | +| **Revision** | **Date** | **Description** | +| ------------ | ---------- | --------------- | +| 0.2/17 | 2022/08/10 | Initial draft | +| 0.2/18 | 2022/08/10 | Add page breaks | \newpage @@ -100,34 +100,34 @@ graph TD; Table: List of Mandatory Algorithms -| ***Algorithm ID*** | ***M/R/O/D*** | ***Comments*** | -| ---------------- | ------- | --------------------------------------------- | -| TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | -| TPM_ALG_ECDSA | M | -| TPM_ALG_ECDH | M | -| TPM_ALG_ECDAA | O | -| TPM_ALG_RSA | O | -| TPM_ALG_RSAES | O | -| TPM_ALG_RSAPSS | O | -| TPM_ALG_RSAOAEP | O | -| TPM_ALG_AES | M | -| TPM_ALG_SHA256 | M | -| TPM_ALG_SHA384 | M | -| TPM_ALG_SHA512 | O | -| TPM_ALG_HMAC | M | -| TPM_ALG_SHA3_256 | O | -| TPM_ALG_SHA3_384 | O | -| TPM_ALG_SHA3_512 | O | -| TPM_ALG_NULL | M | +| **Algorithm ID** | **M/R/O/D** | **Comments** | +| ---------------- | ----------- | --------------------------------------------- | +| TPM_ALG_ECC | M | Support for 256 and 384-bit keys is required. | +| TPM_ALG_ECDSA | M | +| TPM_ALG_ECDH | M | +| TPM_ALG_ECDAA | O | +| TPM_ALG_RSA | O | +| TPM_ALG_RSAES | O | +| TPM_ALG_RSAPSS | O | +| TPM_ALG_RSAOAEP | O | +| TPM_ALG_AES | M | +| TPM_ALG_SHA256 | M | +| TPM_ALG_SHA384 | M | +| TPM_ALG_SHA512 | O | +| TPM_ALG_HMAC | M | +| TPM_ALG_SHA3_256 | O | +| TPM_ALG_SHA3_384 | O | +| TPM_ALG_SHA3_512 | O | +| TPM_ALG_NULL | M | ### Mandatory Curves Table: List of Mandatory Curves -| ***Curve Identifier*** | ***M/R/O/D*** | ***Comments*** | -| ----------------- | ------- | -------- | -| TPM_ECC_NIST_P256 | M | -| TPM_ECC_NIST_P384 | M | +| **Curve Identifier** | **M/R/O/D** | **Comments** | +| -------------------- | ----------- | ------------ | +| TPM_ECC_NIST_P256 | M | +| TPM_ECC_NIST_P384 | M | ## Code @@ -144,6 +144,6 @@ int main() { Table: Fantastic Table -| Column 1 | Column 2 | Column 3 | -| -------- | -------- | -------- | -| AAAAAAAA | BBBBBBBB | CCCCCCCC | +| **Column 1** | **Column 2** | **Column 3** | +| ------------ | ------------ | ------------ | +| AAAAAAAA | BBBBBBBB | CCCCCCCC | From 2ded86dd4863ffd5cdb3024c54395787718a94ac Mon Sep 17 00:00:00 2001 From: Chris Fenner Date: Sun, 14 Aug 2022 00:59:14 -0700 Subject: [PATCH 11/11] don't use all caps for sections --- sample1.md | 2 +- sample2.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample1.md b/sample1.md index 1e38f3c..fa726b4 100644 --- a/sample1.md +++ b/sample1.md @@ -39,7 +39,7 @@ and brands contained herein are the property of their respective owners. \newpage -# CHANGE HISTORY +# Change History | **Revision** | **Date** | **Description** | | ------------ | ---------- | --------------- | diff --git a/sample2.md b/sample2.md index ccaf72e..6eea0a2 100644 --- a/sample2.md +++ b/sample2.md @@ -39,7 +39,7 @@ and brands contained herein are the property of their respective owners. \newpage -# CHANGE HISTORY +# Change History | **Revision** | **Date** | **Description** | | ------------ | ---------- | --------------- |