From 082266c83ef05315f6d10e19cdfb9e3c8a89dbd1 Mon Sep 17 00:00:00 2001
From: Dmytro Bogatov <dmytro@dbogatov.org>
Date: Mon, 27 Nov 2017 01:18:33 -0500
Subject: [PATCH] Fixes.
---
example/definitions.tex | 16 +++++-----
example/final-map.tex | 2 ++
example/final-tree.tex | 67 -----------------------------------------
example/initial-map.tex | 22 ++++++++------
example/tree.tex | 58 ++++++++++++++++++-----------------
sections/example.tex | 56 +++++++++++++++++-----------------
6 files changed, 82 insertions(+), 139 deletions(-)
delete mode 100644 example/final-tree.tex
diff --git a/example/definitions.tex b/example/definitions.tex
index 4862830..5ba1a86 100644
--- a/example/definitions.tex
+++ b/example/definitions.tex
@@ -1,12 +1,14 @@
-\DeclareDocumentCommand
+% cSpell:disable
+
+\DeclareDocumentCommand%
{\oramNode}
{ O{$\varnothing$} O{$\varnothing$} O{$\varnothing$} }
{#1, #2, #3}
-\newif\ifselected
-\newif\ifpathread
+\newif\ifselected%
+\newif\ifpathread%
-\newif\ifnodeonenew
-\newif\ifnodetwonew
-\newif\ifnodethreenew
-\newif\ifnodefournew
+\newif\ifnodeonenew%
+\newif\ifnodetwonew%
+\newif\ifnodethreenew%
+\newif\ifnodefournew%
diff --git a/example/final-map.tex b/example/final-map.tex
index adf8a69..9de7b0e 100644
--- a/example/final-map.tex
+++ b/example/final-map.tex
@@ -1,3 +1,5 @@
+% cSpell:ignore textcolor
+
\begin{tabular}{ l | *{9}{c} } % chktex 44
Block ID & 1 & 2 & 3 & 4 & \textcolor{red}{$5$} & 6 & $\ldots$ & 37 \\
diff --git a/example/final-tree.tex b/example/final-tree.tex
deleted file mode 100644
index bc3e9d8..0000000
--- a/example/final-tree.tex
+++ /dev/null
@@ -1,67 +0,0 @@
-\newcommand
-{\blockFive}
-{
- \ifselected
- \textcolor{red}{$5$}
- \else
- $5$
- \fi
-}
-
-\newcommand
- {\leafSix}
-{
- \ifselected
- \textcolor{red}{$6$}
- \else
- $6$
- \fi
-}
-
-\ifpathread
- \newcommand{\selectedNode}{blue}
-\else
- \newcommand{\selectedNode}{black}
-\fi
-
-\begin{tikzpicture}[scale=0.8]
-\Tree
- [.\node[rounded corners, draw/.expand once=\selectedNode]{\oramNode};
- [.\node[rounded corners, draw]{\oramNode[$4$]};
- [.\node[rounded corners, draw]{\oramNode[$12$][$17$]};
- [.\node[rounded corners, draw]{\oramNode[$22$][$23$]};
- 1
- ]
- [.\node[rounded corners, draw]{\oramNode[$26$][$28$][$30$]};
- 2
- ]
- ]
- [.\node[rounded corners, draw]{\oramNode[$24$][$29$][$33$]};
- [.\node[rounded corners, draw]{\oramNode[$27$][$31$][$35$]};
- 3
- ]
- [.\node[rounded corners, draw]{\oramNode[$34$][$32$][$21$]};
- 4
- ]
- ]
- ]
- [.\node[rounded corners, draw/.expand once=\selectedNode]{\oramNode[$10$][$1$]};
- [.\node[rounded corners, draw/.expand once=\selectedNode]{\oramNode[$2$][\blockFive][$8$]};
- [.\node[rounded corners, draw]{\oramNode[$3$][$6$][$11$]};
- 5
- ]
- [.\node[rounded corners, draw/.expand once=\selectedNode]{\oramNode[$7$][$13$][$15$]};
- \node[]{\leafSix};
- ]
- ]
- [.\node[rounded corners, draw]{\oramNode[$9$][$13$]};
- [.\node[rounded corners, draw]{\oramNode[$20$][$14$][$16$]};
- 7
- ]
- [.\node[rounded corners, draw]{\oramNode[$25$][$18$][$19$]};
- 8
- ]
- ]
- ]
- ]
-\end{tikzpicture}
diff --git a/example/initial-map.tex b/example/initial-map.tex
index a55021d..d29e883 100644
--- a/example/initial-map.tex
+++ b/example/initial-map.tex
@@ -1,29 +1,31 @@
-\newcommand
+% cSpell:ignore ifpathread ifselected textcolor
+
+\newcommand%
{\blockFive}
{
- \ifselected
+ \ifselected%
\textcolor{red}{$5$}
- \else
+ \else%
$5$
- \fi
+ \fi%
}
-\newcommand
+\newcommand%
{\leafSix}
{
- \ifselected
+ \ifselected%
\textcolor{red}{$6$}
- \else
+ \else%
$6$
- \fi
+ \fi%
}
\begin{tabular}{ l | *{9}{c} } % chktex 44
- Block ID & 1 & 2 & 3 & 4 & \blockFive & 6 & $\ldots$ & 37 \\
+ Block ID & 1 & 2 & 3 & 4 & \blockFive & 6 & $\ldots$ & 37 \\ % chktex 1
\midrule%
- Leaf ID & 6 & 5 & 5 & 1 & \leafSix & 5 & $\ldots$ & 7 \\
+ Leaf ID & 6 & 5 & 5 & 1 & \leafSix & 5 & $\ldots$ & 7 \\ % chktex 1
\end{tabular}
diff --git a/example/tree.tex b/example/tree.tex
index 4cd17e0..c73824c 100644
--- a/example/tree.tex
+++ b/example/tree.tex
@@ -1,67 +1,69 @@
-\newcommand
+% cSpell:ignore ifpathread ifselected textcolor ifnodeonenew ifnodetwonew ifnodethreenew ifnodefournew
+
+\newcommand%
{\blockFive}
{
- \ifselected
+ \ifselected%
\textcolor{red}{$5$}
- \else
+ \else%
$5$
- \fi
+ \fi%
}
-\newcommand
+\newcommand%
{\leafSix}
{
- \ifselected
+ \ifselected%
\textcolor{red}{$6$}
- \else
+ \else%
$6$
- \fi
+ \fi%
}
-\ifpathread
+\ifpathread%
\newcommand{\selectedNode}{blue}
-\else
+\else%
\newcommand{\selectedNode}{black}
-\fi
+\fi%
-\newcommand
+\newcommand%
{\nodeLevelOne}
{
- \ifnodeonenew
+ \ifnodeonenew%
\oramNode[\textcolor{blue}{$8$}][\textcolor{blue}{$7$}][\textcolor{blue}{$1$}]
- \else
+ \else%
\oramNode[$7$][$13$][$15$]
- \fi
+ \fi%
}
-\newcommand
+\newcommand%
{\nodeLevelTwo}
{
- \ifnodetwonew
+ \ifnodetwonew%
\oramNode[\textcolor{blue}{$2$}][\textcolor{blue}{$10$}][\textcolor{blue}{$15$}]
- \else
+ \else%
\oramNode[$2$][\blockFive][$8$]
- \fi
+ \fi%
}
-\newcommand
+\newcommand%
{\nodeLevelThree}
{
- \ifnodethreenew
+ \ifnodethreenew%
\oramNode[\textcolor{blue}{$13$}]
- \else
+ \else%
\oramNode[$10$][$1$]
- \fi
+ \fi%
}
-\newcommand
+\newcommand%
{\nodeLevelFour}
{
- \ifnodefournew
+ \ifnodefournew%
\oramNode[\textcolor{blue}{$5^\prime$}]
- \else
- \oramNode
- \fi
+ \else%
+ \oramNode%
+ \fi%
}
\begin{tikzpicture}[scale=0.8]
diff --git a/sections/example.tex b/sections/example.tex
index bda62a5..f0ebbac 100644
--- a/sections/example.tex
+++ b/sections/example.tex
@@ -1,3 +1,5 @@
+% cSpell:ignore selectedtrue pathreadtrue nodeonenewtrue nodetwonewtrue nodethreenewtrue nodefournewtrue textcolor
+
\input{example/definitions}
\section{Example}
@@ -24,7 +26,7 @@
\begin{frame}{\textsc{Access}$(5)$}
- \selectedtrue
+ \selectedtrue%
\begin{figure}
\centering
@@ -46,8 +48,8 @@
\begin{frame}{Read path}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
\begin{figure}
\centering
@@ -94,10 +96,10 @@
\begin{frame}{Write path back}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
- \nodeonenewtrue
+ \nodeonenewtrue%
\begin{figure}
\centering
@@ -121,11 +123,11 @@
\begin{frame}{Write path back}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
- \nodeonenewtrue
- \nodetwonewtrue
+ \nodeonenewtrue%
+ \nodetwonewtrue%
\begin{figure}
\centering
@@ -149,12 +151,12 @@
\begin{frame}{Write path back}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
- \nodeonenewtrue
- \nodetwonewtrue
- \nodethreenewtrue
+ \nodeonenewtrue%
+ \nodetwonewtrue%
+ \nodethreenewtrue%
\begin{figure}
\centering
@@ -178,13 +180,13 @@
\begin{frame}{Write path back}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
- \nodeonenewtrue
- \nodetwonewtrue
- \nodethreenewtrue
- \nodefournewtrue
+ \nodeonenewtrue%
+ \nodetwonewtrue%
+ \nodethreenewtrue%
+ \nodefournewtrue%
\begin{figure}
\centering
@@ -208,13 +210,13 @@
\begin{frame}{Final state}
- \selectedtrue
- \pathreadtrue
+ \selectedtrue%
+ \pathreadtrue%
- \nodeonenewtrue
- \nodetwonewtrue
- \nodethreenewtrue
- \nodefournewtrue
+ \nodeonenewtrue%
+ \nodetwonewtrue%
+ \nodethreenewtrue%
+ \nodefournewtrue%
\begin{figure}
\centering
--
GitLab