summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-25 23:12:16 +0000
committerKarl Berry <karl@freefriends.org>2015-09-25 23:12:16 +0000
commit97e34175d0f5e100422fbd133cadfcf6f5e944e6 (patch)
tree11f29e6d9beb227b762da99c70f81b369733d71a /Master/texmf-dist/tex/latex/rubik/rubikcube.sty
parentead3792e2d57305d0777008c5073968c36ec7ba3 (diff)
rubik (25sep15)
git-svn-id: svn://tug.org/texlive/trunk@38457 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/rubik/rubikcube.sty')
-rw-r--r--Master/texmf-dist/tex/latex/rubik/rubikcube.sty504
1 files changed, 295 insertions, 209 deletions
diff --git a/Master/texmf-dist/tex/latex/rubik/rubikcube.sty b/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
index 0737dc74aca..f86987c7092 100644
--- a/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
+++ b/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
@@ -10,12 +10,12 @@
%% Authors: RWD Nickalls (dick@nickalls.org)
%% and Apostolos Syropoulos (asyropoulos@yahoo.com)
%%
-%% Copyright 2014 RWD Nickalls and A Syropoulos
+%% Copyright 2015 RWD Nickalls and A Syropoulos
%%
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any
+%% version 1.3c of this license or (at your option) any
%% later version: <http://www.latex-project.org/lppl.txt>
%%
%% This work consists of the files listed in the README file.
@@ -29,8 +29,6 @@
%%
%% This package requires the basic TikZ package to be loaded already
%% ------------------------------------------------------------------
-%% rubikcube.dtx
-%% Copyright 2014 RWD Nickalls (dick@nickalls.org) and A Syropoulos (asyropoulos@yahoo.com)
%%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -48,14 +46,15 @@
%% Right brace \} Tilde \~}
-\def\RCfileversion{2.0}%
-\def\RCfiledate{2014/01/20}%
+\def\RCfileversion{3.0}%
+\def\RCfiledate{2015/09/25}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rubikcube}[\RCfiledate\space (v\RCfileversion)]
\@ifpackageloaded{tikz}{}{%
\typeout{---rubikcube requires the TikZ package.}%
\RequirePackage{tikz}}%
-\newcommand{\rubikcube}{\textsf{rubikcube}}%
+\newcommand{\rubikcube}{\textsc{rubikcube}}%
+\newcommand{\Rubikcube}{\textsc{Rubikcube}}%
\newcommand{\@rr}[1]{\textbf{\textsf{#1}}}
\newcommand{\@rrp}[1]{\textbf{\textsf{#1}$^\prime$}}
\newcommand{\@rrw}[1]{\textbf{\textsf{#1\footnotesize{w}}}}
@@ -72,6 +71,8 @@
\fbox{\rule[-1pt]{0pt}{8.5pt}\raisebox{-0.5pt}{#1}}}
\newlength\@hRubik%
\setlength{\@hRubik}{0.185cm}%
+\newcommand*\@join[2]{%
+ \csname\expandafter\@gobble\string#1#2\endcsname}
\definecolor{R}{HTML}{C41E33}%
\definecolor{G}{HTML}{00BE38}%
\definecolor{B}{HTML}{0051BA}%
@@ -79,6 +80,23 @@
\colorlet{X}{black!30}% grey
\colorlet{O}{orange}%
\colorlet{W}{white}%
+\newcommand{\ShowCube}[3]{%
+ \begin{minipage}{#1}%
+ \centering%
+ \begin{tikzpicture}[scale=#2]%
+ #3%
+ \end{tikzpicture}%
+ \end{minipage}%
+}
+\newcommand{\ShowCubeF}[3]{%
+ \fbox{%
+ \begin{minipage}{#1}%
+ \centering%
+ \begin{tikzpicture}[scale=#2]%
+ #3%
+ \end{tikzpicture}%
+ \end{minipage}%
+}}
\newcommand{\RubikFaceUp}[9]{%
\def\Ult{#1}\def\Umt{#2}\def\Urt{#3}%
\def\Ulm{#4}\def\Umm{#5}\def\Urm{#6}%
@@ -145,6 +163,15 @@
\RubikFaceRightAll{X}%
\RubikFaceFrontAll{X}%
\RubikFaceBackAll{X}%
+
+\newcommand{\RubikCubeGrey}{%
+\RubikFaceUp {X}{X}{X}{X}{W}{X}{X}{X}{X}%
+\RubikFaceDown {X}{X}{X}{X}{Y}{X}{X}{X}{X}%
+\RubikFaceLeft {X}{X}{X}{X}{B}{X}{X}{X}{X}%
+\RubikFaceRight{X}{X}{X}{X}{G}{X}{X}{X}{X}%
+\RubikFaceFront{X}{X}{X}{X}{O}{X}{X}{X}{X}%
+\RubikFaceBack {X}{X}{X}{X}{R}{X}{X}{X}{X}%
+}
\newcommand{\RubikCubeSolved}{%
\RubikFaceUpAll{W}%
\RubikFaceDownAll{Y}%
@@ -161,6 +188,14 @@
\def\Llt{#1}\def\Lmt{#2}\def\Lrt{#3}%
\def\Flt{#4}\def\Fmt{#5}\def\Frt{#6}%
}
+\newcommand{\RubikSliceMiddleR}[6]{%
+\def\Flm{#1}\def\Fmm{#2}\def\Frm{#3}%
+\def\Rlm{#4}\def\Rmm{#5}\def\Rrm{#6}%
+}
+\newcommand{\RubikSliceMiddleL}[6]{%
+\def\Llm{#1}\def\Lmm{#2}\def\Lrm{#3}%
+\def\Flm{#4}\def\Fmm{#5}\def\Frm{#6}%
+}
\newcommand{\RubikSliceEquatorR}[6]{%
\def\Flm{#1}\def\Fmm{#2}\def\Frm{#3}%
\def\Rlm{#4}\def\Rmm{#5}\def\Rrm{#6}%
@@ -197,6 +232,7 @@
\draw[line join=round,line cap=round,ultra thick,fill=\Frb]%
(2,0) -- (2, 1) -- (3,1) -- (3,0) -- cycle;
}
+
\newcommand{\DrawRubikCubeRU}{%
\DrawRubikCubeFrontFace %% frontface
%%-----------Up face----------
@@ -435,7 +471,7 @@
\draw[line join=round,line cap=round,ultra thick,fill=#1]%
(2,0) -- (2, 1) -- (3,1) -- (3,0) -- cycle;
}
-\newcommand{\FlatUp}[2]{%
+\newcommand{\DrawFlatUp}[2]{%
\pgfmathsetmacro{\ux}{#1}%
\pgfmathsetmacro{\uy}{#2}%
%%---top row
@@ -470,7 +506,7 @@
-- (\ux + 3,\uy + 0) -- cycle;
}
%%-------------------------
-\newcommand{\FlatDown}[2]{%
+\newcommand{\DrawFlatDown}[2]{%
\pgfmathsetmacro{\ddx}{#1}%
\pgfmathsetmacro{\ddy}{#2}%
%%---top row
@@ -504,8 +540,64 @@
(\ddx + 2,\ddy + 0) -- (\ddx + 2,\ddy + 1) -- (\ddx + 3,\ddy + 1)%
-- (\ddx + 3,\ddy + 0) -- cycle;
}
+%%-------------------------
+\newcommand{\DrawFlatLeft}[2]{%
+\pgfmathsetmacro{\lx}{#1}%
+\pgfmathsetmacro{\ly}{#2}%
+%% NOTE: y variable coord not yet implemented
+%%---top row
+\draw[line join=round,line cap=round,ultra thick,fill=\Llt]%
+(\lx + 0,2) -- (\lx + 0, 3) -- (\lx + 1,3) -- (\lx + 1,2) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lmt]%
+(\lx + 1,2) -- (\lx + 1, 3) -- (\lx + 2,3) -- (\lx + 2,2) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lrt]%
+(\lx + 2,2) -- (\lx + 2, 3) -- (\lx + 3,3) -- (\lx + 3,2) -- cycle;
+%%-----middle row
+\draw[line join=round,line cap=round,ultra thick,fill=\Llm]%
+(\lx + 0,1) -- (\lx + 0, 2) -- (\lx + 1,2) -- (\lx + 1,1) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lmm]%
+(\lx + 1,1) -- (\lx + 1, 2) -- (\lx + 2,2) -- (\lx + 2,1) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lrm]%
+(\lx + 2,1) -- (\lx + 2, 2) -- (\lx + 3,2) -- (\lx + 3,1) -- cycle;
+%%----bottom row
+\draw[line join=round,line cap=round,ultra thick,fill=\Llb]%
+(\lx + 0,0) -- (\lx + 0, 1) -- (\lx + 1,1) -- (\lx + 1,0) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lmb]%
+(\lx + 1,0) -- (\lx + 1, 1) -- (\lx + 2,1) -- (\lx + 2,0) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Lrb]%
+(\lx + 2,0) -- (\lx + 2, 1) -- (\lx + 3,1) -- (\lx + 3,0) -- cycle;
+}
+%%--------------------------
+\newcommand{\DrawFlatRight}[2]{%
+\pgfmathsetmacro{\rx}{#1}% %3
+\pgfmathsetmacro{\ry}{#2}% %0
+%% NOTE: y variable coord not yet implemented
+%%---top row
+\draw[line join=round,line cap=round,ultra thick,fill=\Rlt]%
+(\rx + 0,2) -- (\rx + 0, 3) -- (\rx + 1,3) -- (\rx + 1,2) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rmt]%
+(\rx + 1,2) -- (\rx + 1, 3) -- (\rx + 2,3) -- (\rx + 2,2) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rrt]%
+(\rx + 2,2) -- (\rx + 2, 3) -- (\rx + 3,3) -- (\rx + 3,2) -- cycle;
+%%-----middle row
+\draw[line join=round,line cap=round,ultra thick,fill=\Rlm]%
+(\rx + 0,1) -- (\rx + 0, 2) -- (\rx + 1,2) -- (\rx + 1,1) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rmm]%
+(\rx + 1,1) -- (\rx + 1, 2) -- (\rx + 2,2) -- (\rx + 2,1) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rrm]%
+(\rx + 2,1) -- (\rx + 2, 2) -- (\rx + 3,2) -- (\rx + 3,1) -- cycle;
+%%----bottom row
+\draw[line join=round,line cap=round,ultra thick,fill=\Rlb]%
+(\rx + 0,0) -- (\rx + 0, 1) -- (\rx + 1,1) -- (\rx + 1,0) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rmb]%
+(\rx + 1,0) -- (\rx + 1, 1) -- (\rx + 2,1) -- (\rx + 2,0) -- cycle;
+\draw[line join=round,line cap=round,ultra thick,fill=\Rrb]%
+(\rx + 2,0) -- (\rx + 2, 1) -- (\rx + 3,1) -- (\rx + 3,0) -- cycle;
+}
%%-----------------------
-\newcommand{\FlatFront}{%
+\newcommand{\DrawFlatFront}{%
+%% This command is used /only/ by the \cmd{\DrawRubikFlat} command.
+%% NOTE: x, y variables not implemented as not required here
%%---top row
\draw[line join=round,line cap=round,ultra thick,fill=\Flt]%
(0,2) -- (0, 3) -- (1,3) -- (1,2) -- cycle;
@@ -535,7 +627,7 @@
(2,0) -- (2, 1) -- (3,1) -- (3,0) -- cycle;
}
%%-------------------------
-\newcommand{\FlatBack}[2]{%
+\newcommand{\DrawFlatBack}[2]{%
\pgfmathsetmacro{\bx}{#1}%
\pgfmathsetmacro{\by}{#2}%
%%---top row
@@ -569,71 +661,61 @@
(\bx + 2,\by + 0) -- (\bx + 2,\by + 1) -- (\bx + 3,\by + 1)%
-- (\bx + 3,\by + 0) -- cycle;
}
-%%-------------------------
-\newcommand{\FlatLeft}[2]{%
-\pgfmathsetmacro{\lx}{#1}%
-\pgfmathsetmacro{\ly}{#2}%
-%%---top row
-\draw[line join=round,line cap=round,ultra thick,fill=\Llt]%
-(\lx + 0,2) -- (\lx + 0, 3) -- (\lx + 1,3) -- (\lx + 1,2) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lmt]%
-(\lx + 1,2) -- (\lx + 1, 3) -- (\lx + 2,3) -- (\lx + 2,2) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lrt]%
-(\lx + 2,2) -- (\lx + 2, 3) -- (\lx + 3,3) -- (\lx + 3,2) -- cycle;
-%%-----middle row
-\draw[line join=round,line cap=round,ultra thick,fill=\Llm]%
-(\lx + 0,1) -- (\lx + 0, 2) -- (\lx + 1,2) -- (\lx + 1,1) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lmm]%
-(\lx + 1,1) -- (\lx + 1, 2) -- (\lx + 2,2) -- (\lx + 2,1) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lrm]%
-(\lx + 2,1) -- (\lx + 2, 2) -- (\lx + 3,2) -- (\lx + 3,1) -- cycle;
-%%----bottom row
-\draw[line join=round,line cap=round,ultra thick,fill=\Llb]%
-(\lx + 0,0) -- (\lx + 0, 1) -- (\lx + 1,1) -- (\lx + 1,0) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lmb]%
-(\lx + 1,0) -- (\lx + 1, 1) -- (\lx + 2,1) -- (\lx + 2,0) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Lrb]%
-(\lx + 2,0) -- (\lx + 2, 1) -- (\lx + 3,1) -- (\lx + 3,0) -- cycle;
-}
-%%--------------------------
-\newcommand{\FlatRight}[2]{%
-\pgfmathsetmacro{\rx}{#1}% %3
-\pgfmathsetmacro{\ry}{#2}% %0
-%%---top row
-\draw[line join=round,line cap=round,ultra thick,fill=\Rlt]%
-(\rx + 0,2) -- (\rx + 0, 3) -- (\rx + 1,3) -- (\rx + 1,2) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rmt]%
-(\rx + 1,2) -- (\rx + 1, 3) -- (\rx + 2,3) -- (\rx + 2,2) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rrt]%
-(\rx + 2,2) -- (\rx + 2, 3) -- (\rx + 3,3) -- (\rx + 3,2) -- cycle;
-%%-----middle row
-\draw[line join=round,line cap=round,ultra thick,fill=\Rlm]%
-(\rx + 0,1) -- (\rx + 0, 2) -- (\rx + 1,2) -- (\rx + 1,1) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rmm]%
-(\rx + 1,1) -- (\rx + 1, 2) -- (\rx + 2,2) -- (\rx + 2,1) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rrm]%
-(\rx + 2,1) -- (\rx + 2, 2) -- (\rx + 3,2) -- (\rx + 3,1) -- cycle;
-%%----bottom row
-\draw[line join=round,line cap=round,ultra thick,fill=\Rlb]%
-(\rx + 0,0) -- (\rx + 0, 1) -- (\rx + 1,1) -- (\rx + 1,0) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rmb]%
-(\rx + 1,0) -- (\rx + 1, 1) -- (\rx + 2,1) -- (\rx + 2,0) -- cycle;
-\draw[line join=round,line cap=round,ultra thick,fill=\Rrb]%
-(\rx + 2,0) -- (\rx + 2, 1) -- (\rx + 3,1) -- (\rx + 3,0) -- cycle;
-}
\newcommand{\DrawRubikFlat}{%
- \FlatUp{0}{3}%
- \FlatDown{0}{-3}%
- \FlatLeft{-3}{0}%
- \FlatFront%
- \FlatRight{3}{0}%
- \FlatBack{6}{0}%
+ \DrawFlatUp{0}{3}%
+ \DrawFlatDown{0}{-3}%
+ \DrawFlatLeft{-3}{0}%
+ \DrawFlatFront%
+ \DrawFlatRight{3}{0}%
+ \DrawFlatBack{6}{0}%
}
\newcommand{\DrawRubikCubeFlat}{%
\DrawRubikCube%
- \FlatDown{0}{-3}%
- \FlatLeft{-3}{0}%
- \FlatBack{4}{1}%
+ \DrawFlatDown{0}{-3}%
+ \DrawFlatLeft{-3}{0}%
+ \DrawFlatBack{4}{1}%
+}
+\newcommand{\DrawFlatUpSide}{%
+\DrawFlatUp{0}{0}%
+\DrawRubikLayerSideT{\Brt}{\Bmt}{\Blt}%
+\DrawRubikLayerSideL{\Llt}{\Lmt}{\Lrt}%
+\DrawRubikLayerSideR{\Rrt}{\Rmt}{\Rlt}%
+\DrawRubikLayerSideB{\Flt}{\Fmt}{\Frt}%
+}
+\newcommand{\DrawFlatFrontSide}{%
+\DrawFlatFront{0}{0}%
+\DrawRubikLayerSideT{\Ulb}{\Umb}{\Urb}%
+\DrawRubikLayerSideL{\Lrt}{\Lrm}{\Lrb}%
+\DrawRubikLayerSideR{\Rlt}{\Rlm}{\Rlb}%
+\DrawRubikLayerSideB{\Dlt}{\Dmt}{\Drt}%
+}
+\newcommand{\DrawFlatRightSide}{%
+\DrawFlatRight{0}{0}%
+\DrawRubikLayerSideT{\Urb}{\Urm}{\Urt}%
+\DrawRubikLayerSideL{\Frt}{\Frm}{\Frb}%
+\DrawRubikLayerSideR{\Blt}{\Blm}{\Blb}%
+\DrawRubikLayerSideB{\Drt}{\Drm}{\Drb}%
+}
+\newcommand{\DrawFlatLeftSide}{%
+\DrawFlatLeft{0}{0}%
+\DrawRubikLayerSideT{\Ult}{\Ulm}{\Ulb}%
+\DrawRubikLayerSideL{\Brt}{\Brm}{\Brb}%
+\DrawRubikLayerSideR{\Flt}{\Flm}{\Flb}%
+\DrawRubikLayerSideB{\Dlb}{\Dlm}{\Dlt}%
+}
+\newcommand{\DrawFlatBackSide}{%
+\DrawFlatBack{0}{0}%
+\DrawRubikLayerSideT{\Urt}{\Umt}{\Ult}%
+\DrawRubikLayerSideL{\Rrt}{\Rrm}{\Rrb}%
+\DrawRubikLayerSideR{\Llt}{\Llm}{\Llb}%
+\DrawRubikLayerSideB{\Drb}{\Dmb}{\Dlb}%
+}
+\newcommand{\DrawFlatDownSide}{%
+\DrawFlatDown{0}{0}%
+\DrawRubikLayerSideT{\Flb}{\Fmb}{\Frb}%
+\DrawRubikLayerSideL{\Lrb}{\Lmb}{\Llb}%
+\DrawRubikLayerSideR{\Rlb}{\Rmb}{\Rrb}%
+\DrawRubikLayerSideB{\Brb}{\Bmb}{\Blb}%
}
\newcommand{\RubikSideBarWidth}[1]{\pgfmathsetmacro{\bw}{#1}}
\newcommand{\RubikSideBarLength}[1]{\pgfmathsetmacro{\bl}{#1}}
@@ -675,12 +757,12 @@
}
%%---Left side
\newcommand{\DrawRubikLayerSideLTx}[1]{\side@barL{3}{#1}}
-\newcommand{\DrawRubikLayerSideLEx}[1]{\side@barL{2}{#1}}
-\newcommand{\DrawRubikLayerSideLE}[1]{\side@barL{2}{#1}}
+\newcommand{\DrawRubikLayerSideLMx}[1]{\side@barL{2}{#1}}
+\newcommand{\DrawRubikLayerSideLM}[1]{\side@barL{2}{#1}}
\newcommand{\DrawRubikLayerSideLBx}[1]{\side@barL{1}{#1}}
\newcommand{\DrawRubikLayerSideRTx}[1]{\side@barR{3}{#1}}
-\newcommand{\DrawRubikLayerSideREx}[1]{\side@barR{2}{#1}}
-\newcommand{\DrawRubikLayerSideRE}[1]{\side@barR{2}{#1}}
+\newcommand{\DrawRubikLayerSideRMx}[1]{\side@barR{2}{#1}}
+\newcommand{\DrawRubikLayerSideRM}[1]{\side@barR{2}{#1}}
\newcommand{\DrawRubikLayerSideRBx}[1]{\side@barR{1}{#1}}
\newcommand{\DrawRubikLayerSideLTy}[1]{\side@barT{1}{#1}}
\newcommand{\DrawRubikLayerSideMTy}[1]{\side@barT{2}{#1}}
@@ -706,21 +788,21 @@
%% colours run vertically DOWN
\newcommand{\DrawRubikLayerSideL}[3]{%
\DrawRubikLayerSideLTx{#1}%
- \DrawRubikLayerSideLEx{#2}%
+ \DrawRubikLayerSideLMx{#2}%
\DrawRubikLayerSideLBx{#3}%
}
%%--Right side--------
%% colours run vertically DOWN
\newcommand{\DrawRubikLayerSideR}[3]{%
\DrawRubikLayerSideRTx{#1}%
- \DrawRubikLayerSideREx{#2}%
+ \DrawRubikLayerSideRMx{#2}%
\DrawRubikLayerSideRBx{#3}%
}
\newcommand{\DrawRubikLayerSideLR}[6]{%
\DrawRubikLayerSideLTx{#1}%
\DrawRubikLayerSideRTx{#2}%
- \DrawRubikLayerSideLEx{#3}%
- \DrawRubikLayerSideREx{#4}%
+ \DrawRubikLayerSideLMx{#3}%
+ \DrawRubikLayerSideRMx{#4}%
\DrawRubikLayerSideLBx{#5}%
\DrawRubikLayerSideRBx{#6}%
}
@@ -809,7 +891,7 @@
\begin{tikzpicture}[scale=0.5]
\Cubiedx{0.4}\Cubiedy{0.4}
\DrawCubieRU{#1}{#2}{#3}
-\end{tikzpicture}
+\end{tikzpicture}%
\end{minipage}
}
\newcommand{\textCubieRD}[3]{%
@@ -818,7 +900,7 @@
\begin{tikzpicture}[scale=0.5]
\Cubiedx{0.4}\Cubiedy{0.4}
\DrawCubieRD{#1}{#2}{#3}
-\end{tikzpicture}
+\end{tikzpicture}%
\end{minipage}
}
\newcommand{\textCubieLD}[3]{%
@@ -827,7 +909,7 @@
\begin{tikzpicture}[scale=0.5]
\Cubiedx{0.4}\Cubiedy{0.4}
\DrawCubieLD{#1}{#2}{#3}
-\end{tikzpicture}
+\end{tikzpicture}%
\end{minipage}
}
\newcommand{\textCubieLU}[3]{%
@@ -836,22 +918,26 @@
\begin{tikzpicture}[scale=0.5]
\Cubiedx{0.4}\Cubiedy{0.4}
\DrawCubieLU{#1}{#2}{#3}
-\end{tikzpicture}
+\end{tikzpicture}%
\end{minipage}
}
\newcommand{\DrawNotationBox}{%
\draw [thick] (0,0) -- (0,1) -- (1,1) -- (1,0) -- (0,0) -- (0,1)%
}
-\pgfmathsetmacro{\sd}{0.25} % horiz space
-\pgfmathsetmacro{\sdd}{2*\sd}
-\pgfmathsetmacro{\sddd}{3*\sd}
-\pgfmathsetmacro{\sh}{0.6} % height
-\pgfmathsetmacro{\sb}{0.2} % base
-\pgfmathsetmacro{\sbh}{\sb + \sh} % UP
-\pgfmathsetmacro{\scx}{\sdd+0.2} % Start of CircleX
-\pgfmathsetmacro{\scy}{\sd*2/3} % Start of CircleY
-\pgfmathsetmacro{\sqcx}{\scx-0.13} %% SQuare CenterX
-\pgfmathsetmacro{\sqcy}{\scy+0.25} %% SQuare CenterY
+\pgfmathsetmacro{\@sd}{0.25} % a small horiz space
+\pgfmathsetmacro{\@sdd}{2*\@sd} % 2x horiz space
+\pgfmathsetmacro{\@sddd}{3*\@sd} % 3x horiz space
+\pgfmathsetmacro{\@sh}{0.6} % height
+\pgfmathsetmacro{\@sb}{0.2} % base
+\pgfmathsetmacro{\@sbh}{\@sb + \@sh} % UP
+\pgfmathsetmacro{\@scx}{\@sdd+0.2} % Start of CircleX arc
+\pgfmathsetmacro{\@scy}{\@sd*2/3} % Start of CircleY arc
+\pgfmathsetmacro{\@sqcx}{\@scx-0.13} %% SQuare CenterX coord
+\pgfmathsetmacro{\@sqcy}{\@scy+0.25} %% SQuare CenterY cpprd
+\newcommand*{\Rubik}[1]{\@join{\Rubik}{#1}}
+\newcommand*{\textRubik}[1]{\@join{\textRubik}{#1}}
+\newcommand*{\rr}[1]{\@join{\rr}{#1}}
+\newcommand*{\rrh}[1]{\@join{\rrh}{#1}}
\newcommand{\rrB}{\@rr{B}}
\newcommand{\SquareB}{\@SquareLetter{\rrB}}
\newcommand{\rrhB}{\raisebox{-0.25mm}{\SquareB}\,}
@@ -897,10 +983,10 @@
\newcommand{\SquareD}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
-\end{tikzpicture}%%
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
+\end{tikzpicture}%
}
\newcommand{\rrhD}{\raisebox{-0.333\height}{\SquareD}\,}
%%
@@ -917,9 +1003,9 @@
\newcommand{\SquareDp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDp}{\raisebox{-0.333\height}{\SquareDp}\,}
@@ -937,9 +1023,9 @@
\newcommand{\SquareDw}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, ->] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, ->] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDw}{\raisebox{-0.333\height}{\SquareDw}\,}
@@ -957,9 +1043,9 @@
\newcommand{\SquareDwp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, <-] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, <-] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDwp}{\raisebox{-0.333\height}{\SquareDwp}\,}
@@ -977,9 +1063,9 @@
\newcommand{\SquareDs}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDs}{\raisebox{-0.333\height}{\SquareDs}\,}
@@ -997,9 +1083,9 @@
\newcommand{\SquareDsp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDsp}{\raisebox{-0.333\height}{\SquareDsp}\,}
@@ -1017,9 +1103,9 @@
\newcommand{\SquareDa}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDa}{\raisebox{-0.333\height}{\SquareDa}\,}
@@ -1037,9 +1123,9 @@
\newcommand{\SquareDap}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhDap}{\raisebox{-0.333\height}{\SquareDap}\,}
@@ -1057,9 +1143,9 @@
\newcommand{\SquareE}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, ->] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, ->] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhE}{\raisebox{-0.333\height}{\SquareE}\,}
@@ -1077,9 +1163,9 @@
\newcommand{\SquareEp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, <-] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, <-] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhEp}{\raisebox{-0.333\height}{\SquareEp}\,}
@@ -1097,7 +1183,7 @@
\newcommand{\SquareF}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\scx, \scy) arc[radius=0.35, start angle=-60, delta angle=290];
+\draw [thick, <-] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
\end{tikzpicture}%
}
\newcommand{\rrhF}{\raisebox{-0.333\height}{\SquareF}\,}
@@ -1115,7 +1201,7 @@
\newcommand{\SquareFp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\scx, \scy) arc[radius=0.35, start angle=-60, delta angle=290];
+\draw [thick, ->] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
\end{tikzpicture}%
}
\newcommand{\rrhFp}{\raisebox{-0.333\height}{\SquareFp}\,}
@@ -1133,8 +1219,8 @@
\newcommand{\SquareFw}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\scx, \scy) arc[radius=0.35, start angle=-60, delta angle=290];
-\draw [thick] (\sqcx,\sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
+\draw [thick, <-] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
+\draw [thick] (\@sqcx,\@sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
\end{tikzpicture}%
}
\newcommand{\rrhFw}{\raisebox{-0.333\height}{\SquareFw}\,}
@@ -1152,8 +1238,8 @@
\newcommand{\SquareFwp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\scx, \scy) arc[radius=0.35, start angle=-60, delta angle=290];
-\draw [thick] (\sqcx,\sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
+\draw [thick, ->] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
+\draw [thick] (\@sqcx,\@sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
\end{tikzpicture}%
}
\newcommand{\rrhFwp}{\raisebox{-0.333\height}{\SquareFwp}\,}
@@ -1192,9 +1278,9 @@
\newcommand{\SquareL}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, <-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhL}{\raisebox{-0.333\height}{\SquareL}\,}
@@ -1212,9 +1298,9 @@
\newcommand{\SquareLp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLp}{\raisebox{-0.333\height}{\SquareLp}\,}
@@ -1232,9 +1318,9 @@
\newcommand{\SquareLw}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick, <-] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, <-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick, <-] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLw}{\raisebox{-0.333\height}{\SquareLw}\,}
@@ -1252,9 +1338,9 @@
\newcommand{\SquareLwp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick,->] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick,->] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLwp}{\raisebox{-0.333\height}{\SquareLwp}\,}
@@ -1272,9 +1358,9 @@
\newcommand{\SquareLs}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, <-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, <-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLs}{\raisebox{-0.333\height}{\SquareLs}\,}
@@ -1292,9 +1378,9 @@
\newcommand{\SquareLsp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, ->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, ->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLsp}{\raisebox{-0.333\height}{\SquareLsp}\,}
@@ -1312,9 +1398,9 @@
\newcommand{\SquareLa}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, ->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, <-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLa}{\raisebox{-0.333\height}{\SquareLa}\,}
@@ -1332,9 +1418,9 @@
\newcommand{\SquareLap}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, <-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick, ->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhLap}{\raisebox{-0.333\height}{\SquareLap}\,}
@@ -1352,9 +1438,9 @@
\newcommand{\SquareM}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick, <-] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick, <-] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhM}{\raisebox{-0.333\height}{\SquareM}\,}
@@ -1372,9 +1458,9 @@
\newcommand{\SquareMp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick,->] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick,->] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhMp}{\raisebox{-0.333\height}{\SquareMp}\,}
@@ -1393,9 +1479,9 @@
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
%% draw three lines in the square, one with an arrow
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, ->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhR}{\raisebox{-0.333\height}{\SquareR}\,}
@@ -1413,9 +1499,9 @@
\newcommand{\SquareRp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, <-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRp}{\raisebox{-0.333\height}{\SquareRp}\,}
@@ -1433,9 +1519,9 @@
\newcommand{\SquareRw}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick, ->] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, ->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick, ->] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRw}{\raisebox{-0.333\height}{\SquareRw}\,}
@@ -1453,9 +1539,9 @@
\newcommand{\SquareRwp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick, <-] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick, <-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick, <-] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRwp}{\raisebox{-0.333\height}{\SquareRwp}\,}
@@ -1473,9 +1559,9 @@
\newcommand{\SquareRs}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick,->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick,->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRs}{\raisebox{-0.333\height}{\SquareRs}\,}
@@ -1493,9 +1579,9 @@
\newcommand{\SquareRsp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,<-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick,<-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,<-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick,<-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRsp}{\raisebox{-0.333\height}{\SquareRsp}\,}
@@ -1513,9 +1599,9 @@
\newcommand{\SquareRa}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,<-] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick,->] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,<-] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick,->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRa}{\raisebox{-0.333\height}{\SquareRa}\,}
@@ -1533,9 +1619,9 @@
\newcommand{\SquareRap}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick,->] (\sd, \sb) -- (\sd, \sbh);
-\draw [thick] (\sdd,\sb) -- (\sdd, \sbh);
-\draw [thick,<-] (\sddd, \sb) -- (\sddd, \sbh);
+\draw [thick,->] (\@sd, \@sb) -- (\@sd, \@sbh);
+\draw [thick] (\@sdd,\@sb) -- (\@sdd, \@sbh);
+\draw [thick,<-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
\end{tikzpicture}%
}
\newcommand{\rrhRap}{\raisebox{-0.333\height}{\SquareRap}\,}
@@ -1663,9 +1749,9 @@
\newcommand{\SquareU}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhU}{\raisebox{-0.333\height}{\SquareU}\,}
@@ -1683,9 +1769,9 @@
\newcommand{\SquareUw}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, <-] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, <-] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUw}{\raisebox{-0.333\height}{\SquareUw}\,}
@@ -1704,9 +1790,9 @@
\newcommand{\SquareUp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUp}{\raisebox{-0.333\height}{\SquareUp}\,}
@@ -1724,9 +1810,9 @@
\newcommand{\SquareUwp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick, ->] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick, ->] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUwp}{\raisebox{-0.333\height}{\SquareUwp}\,}
@@ -1744,9 +1830,9 @@
\newcommand{\SquareUs}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUs}{\raisebox{-0.333\height}{\SquareUs}\,}
@@ -1764,9 +1850,9 @@
\newcommand{\SquareUsp}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUsp}{\raisebox{-0.333\height}{\SquareUsp}\,}
@@ -1784,9 +1870,9 @@
\newcommand{\SquareUa}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, <-] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, ->] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, <-] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, ->] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUa}{\raisebox{-0.333\height}{\SquareUa}\,}
@@ -1804,9 +1890,9 @@
\newcommand{\SquareUap}{%
\begin{tikzpicture}[scale=0.5]
\DrawNotationBox;
-\draw [thick, ->] (\sb,\sddd) -- (\sbh, \sddd);
-\draw [thick] (\sb,\sdd) -- (\sbh, \sdd);
-\draw [thick, <-] (\sb,\sd) -- (\sbh, \sd);
+\draw [thick, ->] (\@sb,\@sddd) -- (\@sbh, \@sddd);
+\draw [thick] (\@sb,\@sdd) -- (\@sbh, \@sdd);
+\draw [thick, <-] (\@sb,\@sd) -- (\@sbh, \@sd);
\end{tikzpicture}%
}
\newcommand{\rrhUap}{\raisebox{-0.333\height}{\SquareUap}\,}