rubik (6mar17)

git-svn-id: svn://tug.org/texlive/trunk@43415 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 1202 insertions, 360 deletions

diff --git a/Master/texmf-dist/tex/latex/rubik/rubikcube.sty b/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
index f86987c7092..40e52aa7266 100644
--- a/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
+++ b/Master/texmf-dist/tex/latex/rubik/rubikcube.sty
@@ -10,8 +10,9 @@
 %%   Authors: RWD Nickalls (dick@nickalls.org)
 %%           and Apostolos Syropoulos (asyropoulos@yahoo.com)
 %% 
-%%   Copyright 2015  RWD Nickalls and A Syropoulos
+%%   Copyright  03 March 2017  RWD Nickalls and A Syropoulos
 %% 
+%%   VERSION 4.0
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -29,6 +30,7 @@
 %% 
 %%   This package requires the basic TikZ package to be loaded already
 %% ------------------------------------------------------------------
+%%% \CheckSum{5683}
 %%% \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
@@ -46,33 +48,28 @@
 %%   Right brace   \}     Tilde         \~}
 
 
-\def\RCfileversion{3.0}%
-\def\RCfiledate{2015/09/25}%
+%% \textsc{white space}: \
+
+
+%%  \DescribeMacro{\RubikCubeSolvedWB}
+%%set up the UP face
+%%draw the UP face and sides
+
+\def\RCfileversion{4.0}%
+\def\RCfiledate{2017/03/03}%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{rubikcube}[\RCfiledate\space (v\RCfileversion)]
 \@ifpackageloaded{tikz}{}{%
   \typeout{---rubikcube requires the TikZ package.}%
   \RequirePackage{tikz}}%
+\@ifpackageloaded{forarray}{}{%
+  \typeout{---rubikcube requires the Forarray package.}%
+  \RequirePackage{forarray}}%
+\@ifpackageloaded{ifthen}{}{%
+  \typeout{---rubikcube requires the IfThen package.}%
+  \RequirePackage{ifthen}}%
 \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}}}}
-\newcommand{\@rrwp}[1]{\textbf{\textsf{#1\footnotesize{w}}$^\prime$}}
-\newcommand{\@rrs}[1]{\textbf{\textsf{#1\footnotesize{s}}}}
-\newcommand{\@rrsp}[1]{\textbf{\textsf{#1\footnotesize{s}}$^\prime$}}
-\newcommand{\@rra}[1]{\textbf{\textsf{#1\footnotesize{a}}}}
-\newcommand{\@rrap}[1]{\textbf{\textsf{#1\footnotesize{a}}$^\prime$}}
-\newcommand{\@xyzh}[1]{\textbf{[\textsf{#1}]}\,}
-\newcommand{\@xyzhp}[1]{\textbf{[\textsf{#1}$^\prime$]}\,}
-\newcommand{\@xyzRubik}[1]{\raisebox{3.45pt}{\textbf{[\textsf{#1}]}}}
-\newcommand{\@xyzRubikp}[1]{\raisebox{3.45pt}{\textbf{[\textsf{#1}$^\prime$]}}}
-\newcommand{\@SquareLetter}[1]{\setlength\fboxsep{2.5pt}\fboxrule=0.8pt%
-   \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}%
@@ -80,23 +77,60 @@
 \colorlet{X}{black!30}% grey
 \colorlet{O}{orange}%
 \colorlet{W}{white}%
+\newcommand{\@rubikfont}{\fontsize{10}{12pt}\usefont{T1}{cmss}{bx}{n}}
+\newcommand{\@rubikfontFNS}{\fontsize{8}{12pt}\usefont{T1}{cmss}{bx}{n}}
+\newcommand{\@rubikprime}{'}
+\newlength{\@showcubewidth}%
 \newcommand{\ShowCube}[3]{%
-  \begin{minipage}{#1}%
+  \setlength{\fboxsep}{0cm}%
+  \setlength{\@showcubewidth}{#1}%
+  \advance\@showcubewidth by 1.6pt\relax%
+  \begin{minipage}{\the\@showcubewidth}%
   \centering%
   \begin{tikzpicture}[scale=#2]%
   #3%
   \end{tikzpicture}%
   \end{minipage}%
-}
+}%
 \newcommand{\ShowCubeF}[3]{%
-  \fbox{%
-  \begin{minipage}{#1}%
+  \setlength{\fboxsep}{0cm}%
+  \setlength{\fboxrule}{0.4pt}%
+  \setlength{\@showcubewidth}{#1}%
+  \advance\@showcubewidth by 1.6pt\relax%
+  \framebox{%
+  \begin{minipage}{\the\@showcubewidth}%
   \centering%
   \begin{tikzpicture}[scale=#2]%
   #3%
   \end{tikzpicture}%
   \end{minipage}%
-}}
+}}%
+\newcommand{\x}{\thislevelitem}
+\newcommand{\xcount}{\thislevelcount}
+\newcommand{\ShowSequence}[3]{%
+   \ForEachX{,}{%
+    \ifthenelse{\xcount=1}{#2{\x}}{#1#2{\x}}%
+    }{#3}%
+}%
+\newcommand{\ShowSequenceF}[3]{%
+\fbox{%
+   \ForEachX{,}{%
+    \ifthenelse{\xcount=1}{#2{\x}}{#1#2{\x}}%
+    }{#3}%
+}}%
+\newcommand{\ShowSequencef}[3]{%
+   \ForEachX{,}{%
+    \ifthenelse{\xcount=1}{\fbox{#2{\x}}}{#1{\fbox{#2{\x}}}}%
+    }{#3}%
+}%
+\newcommand{\SequenceInfo}{{}}%   %% INFO only
+\newcommand{\SequenceName}{{}}%   %% NAME only
+\newcommand{\SequenceShort}{{}}%  %% original SHORT seq but with NO NAME
+\newcommand{\SequenceLong}{{}}%   %% just the LONG string \& no name
+\newcommand{\SequenceBraceA}[2]{$\overbrace{\mbox{#2}}^{\mbox{#1}}$}%
+\newcommand{\SequenceBraceB}[2]{$\underbrace{\mbox{#2}}_{\mbox{#1}}$}%
+\newcommand{\SequenceBraceAF}[2]{\fbox{$\overbrace{\mbox{#2}}^{\mbox{#1}}$}}%
+\newcommand{\SequenceBraceBF}[2]{\fbox{$\underbrace{\mbox{#2}}_{\mbox{#1}}$}}%
 \newcommand{\RubikFaceUp}[9]{%
 \def\Ult{#1}\def\Umt{#2}\def\Urt{#3}%
 \def\Ulm{#4}\def\Umm{#5}\def\Urm{#6}%
@@ -172,14 +206,20 @@
 \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}%
-  \RubikFaceLeftAll{B}%
-  \RubikFaceRightAll{G}%
-  \RubikFaceFrontAll{O}%
-  \RubikFaceBackAll{R}%
-}
+\newcommand{\RubikCubeGray}{\RubikCubeGrey}
+\newcommand{\SolvedConfig}[6]{%
+  \RubikFaceRightAll{#1}%
+  \RubikFaceLeftAll{#2}%
+  \RubikFaceUpAll{#3}%
+  \RubikFaceDownAll{#4}%
+  \RubikFaceFrontAll{#5}%
+  \RubikFaceBackAll{#6}%
+}
+\newcommand{\RubikCubeGreyAll}{\SolvedConfig{X}{X}{X}{X}{X}{X}}%
+\newcommand{\RubikCubeGrayAll}{\RubikCubeGreyAll}
+\newcommand{\RubikCubeSolved}{\SolvedConfig{G}{B}{W}{Y}{O}{R}}%
+\newcommand{\RubikCubeSolvedWY}{\RubikCubeSolved}%
+\newcommand{\RubikCubeSolvedWB}{\SolvedConfig{R}{O}{W}{B}{G}{Y}}%
 \newcommand{\RubikSliceTopR}[6]{%
 \def\Flt{#1}\def\Fmt{#2}\def\Frt{#3}%
 \def\Rlt{#4}\def\Rmt{#5}\def\Rrt{#6}%
@@ -596,7 +636,7 @@
 }
 %%-----------------------
 \newcommand{\DrawFlatFront}{%
-%% This command is used /only/ by  the \cmd{\DrawRubikFlat} command.
+%% This command is used /only/ by  the \cmd{\DrawRubikCubeF} command.
 %% NOTE: x, y variables not implemented as not required here
 %%---top row
 \draw[line join=round,line cap=round,ultra thick,fill=\Flt]%
@@ -661,7 +701,7 @@
 (\bx + 2,\by + 0) -- (\bx + 2,\by + 1) -- (\bx + 3,\by + 1)%
  -- (\bx + 3,\by + 0) -- cycle;
 }
-\newcommand{\DrawRubikFlat}{%
+\newcommand{\DrawRubikCubeF}{%
   \DrawFlatUp{0}{3}%
   \DrawFlatDown{0}{-3}%
   \DrawFlatLeft{-3}{0}%
@@ -669,7 +709,7 @@
   \DrawFlatRight{3}{0}%
   \DrawFlatBack{6}{0}%
 }
-\newcommand{\DrawRubikCubeFlat}{%
+\newcommand{\DrawRubikCubeSF}{%
   \DrawRubikCube%
   \DrawFlatDown{0}{-3}%
   \DrawFlatLeft{-3}{0}%
@@ -717,6 +757,18 @@
 \DrawRubikLayerSideR{\Rlb}{\Rmb}{\Rrb}%
 \DrawRubikLayerSideB{\Brb}{\Bmb}{\Blb}%
 }
+\newcommand{\DrawFaceUp}{\DrawFlatUp{0}{0}}
+\newcommand{\DrawFaceDown}{\DrawFlatDown{0}{0}}
+\newcommand{\DrawFaceLeft}{\DrawFlatLeft{0}{0}}
+\newcommand{\DrawFaceRight}{\DrawFlatRight{0}{0}}
+\newcommand{\DrawFaceFront}{\DrawFlatFront{0}{0}}
+\newcommand{\DrawFaceBack}{\DrawFlatBack{0}{0}}
+\newcommand{\DrawFaceUpSide}{\DrawFlatUpSide}
+\newcommand{\DrawFaceDownSide}{\DrawFlatDownSide}
+\newcommand{\DrawFaceLeftSide}{\DrawFlatLeftSide}
+\newcommand{\DrawFaceRightSide}{\DrawFlatRightSide}
+\newcommand{\DrawFaceFrontSide}{\DrawFlatFrontSide}
+\newcommand{\DrawFaceBackSide}{\DrawFlatBackSide}
 \newcommand{\RubikSideBarWidth}[1]{\pgfmathsetmacro{\bw}{#1}}
 \newcommand{\RubikSideBarLength}[1]{\pgfmathsetmacro{\bl}{#1}}
 \newcommand{\RubikSideBarSep}[1]{\pgfmathsetmacro{\bs}{#1}}
@@ -806,6 +858,30 @@
   \DrawRubikLayerSideLBx{#5}%
   \DrawRubikLayerSideRBx{#6}%
 }
+\newcommand{\RubikSideFront}[3]{%
+\def\Flt{#1}\def\Fmt{#2}\def\Frt{#3}%
+}
+\newcommand{\RubikSideRight}[3]{%
+\def\Rlt{#1}\def\Rmt{#2}\def\Rrt{#3}%
+}
+\newcommand{\RubikSideLeft}[3]{%
+\def\Llt{#1}\def\Lmt{#2}\def\Lrt{#3}%
+}
+\newcommand{\RubikSideBack}[3]{%
+\def\Blt{#1}\def\Bmt{#2}\def\Brt{#3}%
+}
+\newcommand{\RubikSideFrontAll}[1]{%
+\def\Flt{#1}\def\Fmt{#1}\def\Frt{#1}%
+}
+\newcommand{\RubikSideRightAll}[1]{%
+\def\Rlt{#1}\def\Rmt{#1}\def\Rrt{#1}%
+}
+\newcommand{\RubikSideLeftAll}[1]{%
+\def\Llt{#1}\def\Lmt{#1}\def\Lrt{#1}%
+}
+\newcommand{\RubikSideBackAll}[1]{%
+\def\Blt{#1}\def\Bmt{#1}\def\Brt{#1}%
+}
 \newcommand{\DrawNCubeAll}[4]{%
    \pgfmathsetmacro{\ncubes}{#1-1}%
 %% need to subtract 1 from the given number of cubies per side
@@ -829,7 +905,7 @@
     \draw[line join=round,line cap=round,ultra thick,fill=#4]%
  (#5,#6,\dz) -- (\dx,#6,\dz) -- (\dx,\dy,\dz) -- (#5,\dy,\dz) -- cycle;
 %% The 'rectangle' command does not work with 3D coordinates,
-%% so this is the way to draw the squres with space coordinates
+%% so this is the way to draw the squares with space coordinates
 %% Draw UP face (using the Y colour = #3)
    \draw[line join=round,line cap=round,ultra thick,fill=#3]%
  (#5,\dy,\dz) -- (\dx,\dy,\dz) -- (\dx,\dy,#7) -- (#5,\dy,#7) -- cycle;
@@ -934,51 +1010,89 @@
 \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{\@rr}[1]{{\@rubikfont #1}}
+\newcommand{\@rrp}[1]{{\@rubikfont #1\@rubikprime}}
+\newcommand{\@rrw}[1]{{\@rubikfont #1{\@rubikfontFNS w}}}
+\newcommand{\@rrwp}[1]{{\@rubikfont #1{\@rubikfontFNS w}\@rubikprime}}
+\newcommand{\@rrs}[1]{{\@rubikfont #1{\@rubikfontFNS s}}}
+\newcommand{\@rrsp}[1]{{\@rubikfont #1{\@rubikfontFNS s}\@rubikprime}}
+\newcommand{\@rra}[1]{{\@rubikfont #1{\@rubikfontFNS a}}}
+\newcommand{\@rrap}[1]{{\@rubikfont #1{\@rubikfontFNS a}\@rubikprime}}
+\newcommand{\@rru}[1]{{\@rubikfont #1{\@rubikfontFNS u}}}
+\newcommand{\@rrup}[1]{{\@rubikfont #1{\@rubikfontFNS u}\@rubikprime}}
+\newcommand{\@rrd}[1]{{\@rubikfont #1{\@rubikfontFNS d}}}
+\newcommand{\@rrdp}[1]{{\@rubikfont #1{\@rubikfontFNS d}\@rubikprime}}
+\newcommand{\@rrl}[1]{{\@rubikfont #1{\@rubikfontFNS l}}}
+\newcommand{\@rrlp}[1]{{\@rubikfont #1{\@rubikfontFNS l}\@rubikprime}}
+\newcommand{\@rrr}[1]{{\@rubikfont #1{\@rubikfontFNS r}}}
+\newcommand{\@rrrp}[1]{{\@rubikfont #1{\@rubikfontFNS r}\@rubikprime}}
+\newcommand{\@rrf}[1]{{\@rubikfont #1{\@rubikfontFNS f}}}
+\newcommand{\@rrfp}[1]{{\@rubikfont #1{\@rubikfontFNS f}\@rubikprime}}
+\newcommand{\@rrb}[1]{{\@rubikfont #1{\@rubikfontFNS b}}}
+\newcommand{\@rrbp}[1]{{\@rubikfont #1{\@rubikfontFNS b}\@rubikprime}}
+\newcommand{\@rrc}[1]{{\@rubikfont #1{\@rubikfontFNS c}}}
+\newcommand{\@rrcp}[1]{{\@rubikfont #1{\@rubikfontFNS c}\@rubikprime}}
+\newcommand{\@rrm}[1]{{\@rubikfont #1{\@rubikfontFNS m}}}
+\newcommand{\@rrmp}[1]{{\@rubikfont #1{\@rubikfontFNS m}\@rubikprime}}
+\newcommand{\@xyzh}[1]{[{\@rubikfont #1}]}
+\newcommand{\@xyzhp}[1]{[{\@rubikfont #1\@rubikprime}]}
+\newcommand{\@xyzRubik}[1]{\raisebox{3.45pt}{[{\@rubikfont #1}]}}
+\newcommand{\@xyzRubikp}[1]{\raisebox{3.45pt}{[{\@rubikfont #1\@rubikprime}]}}
+\newcommand{\@xyzhbdfl}[1]{[\raisebox{-0.6pt}{{\@rubikfont #1}}]}
+\newcommand{\@xyzbdflRubik}[1]{\raisebox{3.45pt}{[\raisebox{-0.6pt}{{\@rubikfont #1}}]}}
+\newcommand{\@SquareLetter}[1]{\setlength{\fboxsep}{2.5pt}%
+  \setlength{\fboxrule}{0.8pt}%
+  \fbox{\rule[-1pt]{0pt}{8.5pt}\raisebox{-0.5pt}{#1}}}
+\newlength\@hRubik%
+\setlength{\@hRubik}{0.185cm}%
+\newcommand{\@tlen}{\hspace{1pt}}%
+\newcommand*\@join[2]{%
+    \csname\expandafter\@gobble\string#1#2\endcsname}
 \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}\,}
-\newcommand{\RubikB}{\raisebox{\@hRubik}{\SquareB}\,}
-\newcommand{\textRubikB}{\rrhB\,}
+\newcommand{\SquareB}{\@tlen\@SquareLetter{\rrB}\@tlen}
+\newcommand{\rrhB}{\raisebox{-0.25mm}{\SquareB}}
+\newcommand{\RubikB}{\raisebox{\@hRubik}{\SquareB}}
+\newcommand{\textRubikB}{\rrhB}
 \newcommand{\rrBp}{\@rrp{B}}
-\newcommand{\SquareBp}{\@SquareLetter{\rrBp}}
-\newcommand{\rrhBp}{\raisebox{-0.25mm}{\SquareBp}\,}
-\newcommand{\RubikBp}{\raisebox{\@hRubik}{\SquareBp}\,}
-\newcommand{\textRubikBp}{\rrhBp\,}
+\newcommand{\SquareBp}{\@tlen\@SquareLetter{\rrBp}\@tlen}
+\newcommand{\rrhBp}{\raisebox{-0.25mm}{\SquareBp}}
+\newcommand{\RubikBp}{\raisebox{\@hRubik}{\SquareBp}}
+\newcommand{\textRubikBp}{\rrhBp}
 \newcommand{\rrBw}{\@rrw{B}}
-\newcommand{\SquareBw}{\@SquareLetter{\rrBw}}
-\newcommand{\rrhBw}{\raisebox{-0.25mm}{\SquareBw}\,}
-\newcommand{\RubikBw}{\raisebox{\@hRubik}{\SquareBw}\,}
-\newcommand{\textRubikBw}{\rrhBw\,}
+\newcommand{\SquareBw}{\@tlen\@SquareLetter{\rrBw}\@tlen}
+\newcommand{\rrhBw}{\raisebox{-0.25mm}{\SquareBw}}
+\newcommand{\RubikBw}{\raisebox{\@hRubik}{\SquareBw}}
+\newcommand{\textRubikBw}{\rrhBw}
 \newcommand{\rrBwp}{\@rrwp{B}}
-\newcommand{\SquareBwp}{\@SquareLetter{\rrBwp}}
-\newcommand{\rrhBwp}{\raisebox{-0.25mm}{\SquareBwp}\,}
-\newcommand{\RubikBwp}{\raisebox{\@hRubik}{\SquareBwp}\,}
-\newcommand{\textRubikBwp}{\rrhBwp\,}
+\newcommand{\SquareBwp}{\@tlen\@SquareLetter{\rrBwp}\@tlen}
+\newcommand{\rrhBwp}{\raisebox{-0.25mm}{\SquareBwp}}
+\newcommand{\RubikBwp}{\raisebox{\@hRubik}{\SquareBwp}}
+\newcommand{\textRubikBwp}{\rrhBwp}
 \newcommand{\rrBs}{\@rrs{B}}
-\newcommand{\SquareBs}{\@SquareLetter{\rrBs}}
-\newcommand{\rrhBs}{\raisebox{-0.25mm}{\SquareBs}\,}
-\newcommand{\RubikBs}{\raisebox{\@hRubik}{\SquareBs}\,}
-\newcommand{\textRubikBs}{\rrhBs\,}
+\newcommand{\SquareBs}{\@tlen\@SquareLetter{\rrBs}\@tlen}
+\newcommand{\rrhBs}{\raisebox{-0.25mm}{\SquareBs}}
+\newcommand{\RubikBs}{\raisebox{\@hRubik}{\SquareBs}}
+\newcommand{\textRubikBs}{\rrhBs}
 \newcommand{\rrBsp}{\@rrsp{B}}
-\newcommand{\SquareBsp}{\@SquareLetter{\rrBsp}}
-\newcommand{\rrhBsp}{\raisebox{-0.25mm}{\SquareBsp}\,}
-\newcommand{\RubikBsp}{\raisebox{\@hRubik}{\SquareBsp}\,}
-\newcommand{\textRubikBsp}{\rrhBsp\,}
+\newcommand{\SquareBsp}{\@tlen\@SquareLetter{\rrBsp}\@tlen}
+\newcommand{\rrhBsp}{\raisebox{-0.25mm}{\SquareBsp}}
+\newcommand{\RubikBsp}{\raisebox{\@hRubik}{\SquareBsp}}
+\newcommand{\textRubikBsp}{\rrhBsp}
 \newcommand{\rrBa}{\@rra{B}}
-\newcommand{\SquareBa}{\@SquareLetter{\rrBa}}
-\newcommand{\rrhBa}{\raisebox{-0.25mm}{\SquareBa}\,}
-\newcommand{\RubikBa}{\raisebox{\@hRubik}{\SquareBa}\,}
-\newcommand{\textRubikBa}{\rrhBa\,}
+\newcommand{\SquareBa}{\@tlen\@SquareLetter{\rrBa}\@tlen}
+\newcommand{\rrhBa}{\raisebox{-0.25mm}{\SquareBa}}
+\newcommand{\RubikBa}{\raisebox{\@hRubik}{\SquareBa}}
+\newcommand{\textRubikBa}{\rrhBa}
 \newcommand{\rrBap}{\@rrap{B}}
-\newcommand{\SquareBap}{\@SquareLetter{\rrBap}}
-\newcommand{\rrhBap}{\raisebox{-0.25mm}{\SquareBap}\,}
-\newcommand{\RubikBap}{\raisebox{\@hRubik}{\SquareBap}\,}
-\newcommand{\textRubikBap}{\rrhBap\,}
-\newcommand{\rrD}{\textbf{\textsf{D}}}
+\newcommand{\SquareBap}{\@tlen\@SquareLetter{\rrBap}\@tlen}
+\newcommand{\rrhBap}{\raisebox{-0.25mm}{\SquareBap}}
+\newcommand{\RubikBap}{\raisebox{\@hRubik}{\SquareBap}}
+\newcommand{\textRubikBap}{\rrhBap}
+\newcommand{\rrD}{\@rr{D}}
 %%
 \newcommand{\SquareD}{%
 \begin{tikzpicture}[scale=0.5]
@@ -988,17 +1102,18 @@
 \draw [thick, ->]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhD}{\raisebox{-0.333\height}{\SquareD}\,}
+\newcommand{\rrhD}{\raisebox{-0.333\height}{\@tlen\SquareD\@tlen}}
 %%
 \newcommand{\RubikD}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareD\\
-\rrD
+\rrD%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikD}{\rrD\,\rrhD}
-\newcommand{\rrDp}{\textbf{\textsf{D}$^\prime$}}
+\newcommand{\rrDp}{\@rrp{D}}
 %%
 \newcommand{\SquareDp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1008,17 +1123,18 @@
 \draw [thick, <-] (\@sb,\@sd)   -- (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDp}{\raisebox{-0.333\height}{\SquareDp}\,}
+\newcommand{\rrhDp}{\raisebox{-0.333\height}{\@tlen\SquareDp\@tlen}}
 %%
 \newcommand{\RubikDp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDp\\
-\rrDp
+\rrDp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDp}{\rrDp\,\rrhDp}
-\newcommand{\rrDw}{\textbf{\textsf{D\footnotesize{w}}}}
+\newcommand{\rrDw}{\@rrw{D}}
 %%
 \newcommand{\SquareDw}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1028,17 +1144,18 @@
 \draw [thick, ->] (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDw}{\raisebox{-0.333\height}{\SquareDw}\,}
+\newcommand{\rrhDw}{\raisebox{-0.333\height}{\@tlen\SquareDw\@tlen}}
 %%
 \newcommand{\RubikDw}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDw\\
-\rrDw
+\rrDw%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDw}{\rrDw\,\rrhDw}
-\newcommand{\rrDwp}{\textbf{\textsf{D\footnotesize{w}}$^\prime$}}
+\newcommand{\rrDwp}{\@rrwp{D}}
 %%
 \newcommand{\SquareDwp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1048,15 +1165,16 @@
 \draw [thick, <-] (\@sb,\@sd)   -- (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDwp}{\raisebox{-0.333\height}{\SquareDwp}\,}
+\newcommand{\rrhDwp}{\raisebox{-0.333\height}{\@tlen\SquareDwp\@tlen}}
 %%
 \newcommand{\RubikDwp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDwp\\
-\rrDwp
+\rrDwp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDwp}{\rrDwp\,\rrhDwp}
 \newcommand{\rrDs}{\@rrs{D}}
 %%
@@ -1068,15 +1186,16 @@
 \draw [thick, ->]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDs}{\raisebox{-0.333\height}{\SquareDs}\,}
+\newcommand{\rrhDs}{\raisebox{-0.333\height}{\@tlen\SquareDs\@tlen}}
 %%
 \newcommand{\RubikDs}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDs\\
-\rrDs
+\rrDs%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDs}{\rrDs\,\rrhDs}
 \newcommand{\rrDsp}{\@rrsp{D}}
 %%
@@ -1088,15 +1207,16 @@
 \draw [thick, <-]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDsp}{\raisebox{-0.333\height}{\SquareDsp}\,}
+\newcommand{\rrhDsp}{\raisebox{-0.333\height}{\@tlen\SquareDsp\@tlen}}
 %%
 \newcommand{\RubikDsp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDsp\\
-\rrDsp
+\rrDsp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDsp}{\rrDsp\,\rrhDsp}
 \newcommand{\rrDa}{\@rra{D}}
 %%
@@ -1108,15 +1228,16 @@
 \draw [thick, ->]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDa}{\raisebox{-0.333\height}{\SquareDa}\,}
+\newcommand{\rrhDa}{\raisebox{-0.333\height}{\@tlen\SquareDa\@tlen}}
 %%
 \newcommand{\RubikDa}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDa\\
-\rrDa
+\rrDa%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDa}{\rrDa\,\rrhDa}
 \newcommand{\rrDap}{\@rrap{D}}
 %%
@@ -1128,17 +1249,18 @@
 \draw [thick, <-]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhDap}{\raisebox{-0.333\height}{\SquareDap}\,}
+\newcommand{\rrhDap}{\raisebox{-0.333\height}{\@tlen\SquareDap\@tlen}}
 %%
 \newcommand{\RubikDap}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareDap\\
-\rrDap
+\rrDap%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikDap}{\rrDap\,\rrhDap}
-\newcommand{\rrE}{\textbf{\textsf{E}}}
+\newcommand{\rrE}{\@rr{E}}
 %%
 \newcommand{\SquareE}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1148,17 +1270,18 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhE}{\raisebox{-0.333\height}{\SquareE}\,}
+\newcommand{\rrhE}{\raisebox{-0.333\height}{\@tlen\SquareE\@tlen}}
 %%
 \newcommand{\RubikE}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareE\\
-\rrE
+\rrE%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikE}{\rrE\,\rrhE}
-\newcommand{\rrEp}{\textbf{\textsf{E}$^\prime$}}
+\newcommand{\rrEp}{\@rrp{E}}
 %%
 \newcommand{\SquareEp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1168,17 +1291,18 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhEp}{\raisebox{-0.333\height}{\SquareEp}\,}
+\newcommand{\rrhEp}{\raisebox{-0.333\height}{\@tlen\SquareEp\@tlen}}
 %%
 \newcommand{\RubikEp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareEp\\
-\rrEp
+\rrEp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikEp}{\rrEp\,\rrhEp}
-\newcommand{\rrF}{\textbf{\textsf{F}}}
+\newcommand{\rrF}{\@rr{F}}
 %%
 \newcommand{\SquareF}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1186,17 +1310,18 @@
 \draw [thick, <-] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
 \end{tikzpicture}%
 }
-\newcommand{\rrhF}{\raisebox{-0.333\height}{\SquareF}\,}
+\newcommand{\rrhF}{\raisebox{-0.333\height}{\@tlen\SquareF\@tlen}}
 %%
 \newcommand{\RubikF}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareF\\
-\rrF
+\rrF%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikF}{\rrF\,\rrhF}
-\newcommand{\rrFp}{\textbf{\textsf{F}$^\prime$}}
+\newcommand{\rrFp}{\@rrp{F}}
 %%
 \newcommand{\SquareFp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1204,17 +1329,18 @@
 \draw [thick, ->] (\@scx, \@scy) arc[radius=0.35, start angle=-60, delta angle=290];
 \end{tikzpicture}%
 }
-\newcommand{\rrhFp}{\raisebox{-0.333\height}{\SquareFp}\,}
+\newcommand{\rrhFp}{\raisebox{-0.333\height}{\@tlen\SquareFp\@tlen}}
 %%
 \newcommand{\RubikFp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareFp\\
-\rrFp
+\rrFp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikFp}{\rrFp\,\rrhFp}
-\newcommand{\rrFw}{\textbf{\textsf{F\footnotesize{w}}}}
+\newcommand{\rrFw}{\@rrw{F}}
 %%
 \newcommand{\SquareFw}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1223,17 +1349,18 @@
 \draw [thick] (\@sqcx,\@sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
 \end{tikzpicture}%
 }
-\newcommand{\rrhFw}{\raisebox{-0.333\height}{\SquareFw}\,}
+\newcommand{\rrhFw}{\raisebox{-0.333\height}{\@tlen\SquareFw\@tlen}}
 %%
 \newcommand{\RubikFw}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareFw\\
-\rrFw
+\rrFw%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikFw}{\rrFw\,\rrhFw}
-\newcommand{\rrFwp}{\textbf{\textsf{F\footnotesize{w}}$^\prime$}}
+\newcommand{\rrFwp}{\@rrwp{F}}
 %%
 \newcommand{\SquareFwp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1242,38 +1369,39 @@
 \draw [thick] (\@sqcx,\@sqcy) arc[radius=0.1, start angle=-60, delta angle=360];
 \end{tikzpicture}%
 }
-\newcommand{\rrhFwp}{\raisebox{-0.333\height}{\SquareFwp}\,}
+\newcommand{\rrhFwp}{\raisebox{-0.333\height}{\@tlen\SquareFwp\@tlen}}
 %%
 \newcommand{\RubikFwp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareFwp\\
-\rrFwp
+\rrFwp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikFwp}{\rrFwp\,\rrhFwp}
 %%
 \newcommand{\rrFs}{\@rrs{F}}
-\newcommand{\SquareFs}{\@SquareLetter{\rrFs}}
-\newcommand{\rrhFs}{\raisebox{-0.25mm}{\SquareFs}\,}
-\newcommand{\RubikFs}{\raisebox{\@hRubik}{\SquareFs}\,}
-\newcommand{\textRubikFs}{\rrhFs\,}
+\newcommand{\SquareFs}{\@tlen\@SquareLetter{\rrFs}\@tlen}
+\newcommand{\rrhFs}{\raisebox{-0.25mm}{\SquareFs}}
+\newcommand{\RubikFs}{\raisebox{\@hRubik}{\SquareFs}}
+\newcommand{\textRubikFs}{\rrhFs}
 \newcommand{\rrFsp}{\@rrsp{F}}
-\newcommand{\SquareFsp}{\@SquareLetter{\rrFsp}}
-\newcommand{\rrhFsp}{\raisebox{-0.25mm}{\SquareFsp}\,}
-\newcommand{\RubikFsp}{\raisebox{\@hRubik}{\SquareFsp}\,}
-\newcommand{\textRubikFsp}{\rrhFsp\,}
+\newcommand{\SquareFsp}{\@tlen\@SquareLetter{\rrFsp}\@tlen}
+\newcommand{\rrhFsp}{\raisebox{-0.25mm}{\SquareFsp}}
+\newcommand{\RubikFsp}{\raisebox{\@hRubik}{\SquareFsp}}
+\newcommand{\textRubikFsp}{\rrhFsp}
 \newcommand{\rrFa}{\@rra{F}}
-\newcommand{\SquareFa}{\@SquareLetter{\rrFa}}
-\newcommand{\rrhFa}{\raisebox{-0.25mm}{\SquareFa}\,}
-\newcommand{\RubikFa}{\raisebox{\@hRubik}{\SquareFa}\,}
-\newcommand{\textRubikFa}{\rrhFa\,}
+\newcommand{\SquareFa}{\@tlen\@SquareLetter{\rrFa}\@tlen}
+\newcommand{\rrhFa}{\raisebox{-0.25mm}{\SquareFa}}
+\newcommand{\RubikFa}{\raisebox{\@hRubik}{\SquareFa}}
+\newcommand{\textRubikFa}{\rrhFa}
 \newcommand{\rrFap}{\@rrap{F}}
-\newcommand{\SquareFap}{\@SquareLetter{\rrFap}}
-\newcommand{\rrhFap}{\raisebox{-0.25mm}{\SquareFap}\,}
-\newcommand{\RubikFap}{\raisebox{\@hRubik}{\SquareFap}\,}
-\newcommand{\textRubikFap}{\rrhFap\,}
-\newcommand{\rrL}{\textbf{\textsf{L}}}
+\newcommand{\SquareFap}{\@tlen\@SquareLetter{\rrFap}\@tlen}
+\newcommand{\rrhFap}{\raisebox{-0.25mm}{\SquareFap}}
+\newcommand{\RubikFap}{\raisebox{\@hRubik}{\SquareFap}}
+\newcommand{\textRubikFap}{\rrhFap}
+\newcommand{\rrL}{\@rr{L}}
 %%
 \newcommand{\SquareL}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1283,17 +1411,18 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhL}{\raisebox{-0.333\height}{\SquareL}\,}
+\newcommand{\rrhL}{\raisebox{-0.333\height}{\@tlen\SquareL\@tlen}}
 %%
 \newcommand{\RubikL}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareL\\
-\rrL
+\rrL%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikL}{\rrL\,\rrhL}
-\newcommand{\rrLp}{\textbf{\textsf{L}$^\prime$}}
+\newcommand{\rrLp}{\@rrp{L}}
 %%
 \newcommand{\SquareLp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1303,17 +1432,18 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLp}{\raisebox{-0.333\height}{\SquareLp}\,}
+\newcommand{\rrhLp}{\raisebox{-0.333\height}{\@tlen\SquareLp\@tlen}}
 %%
 \newcommand{\RubikLp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLp\\
-\rrLp
+\rrLp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLp}{\rrLp\,\rrhLp}
-\newcommand{\rrLw}{\textbf{\textsf{L\footnotesize{w}}}}
+\newcommand{\rrLw}{\@rrw{L}}
 %%
 \newcommand{\SquareLw}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1323,17 +1453,18 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLw}{\raisebox{-0.333\height}{\SquareLw}\,}
+\newcommand{\rrhLw}{\raisebox{-0.333\height}{\@tlen\SquareLw\@tlen}}
 %%
 \newcommand{\RubikLw}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLw\\
-\rrLw
+\rrLw%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLw}{\rrLw\,\rrhLw}
-\newcommand{\rrLwp}{\textbf{\textsf{L\footnotesize{w}}$^\prime$}}
+\newcommand{\rrLwp}{\@rrwp{L}}
 %%
 \newcommand{\SquareLwp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1343,15 +1474,16 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLwp}{\raisebox{-0.333\height}{\SquareLwp}\,}
+\newcommand{\rrhLwp}{\raisebox{-0.333\height}{\@tlen\SquareLwp\@tlen}}
 %%
 \newcommand{\RubikLwp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLwp\\
-\rrLwp
+\rrLwp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLwp}{\rrLwp\,\rrhLwp}
 \newcommand{\rrLs}{\@rrs{L}}
 %%
@@ -1363,15 +1495,16 @@
 \draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLs}{\raisebox{-0.333\height}{\SquareLs}\,}
+\newcommand{\rrhLs}{\raisebox{-0.333\height}{\@tlen\SquareLs\@tlen}}
 %%
 \newcommand{\RubikLs}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLs\\
-\rrLs
+\rrLs%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLs}{\rrLs\,\rrhLs}
 \newcommand{\rrLsp}{\@rrsp{L}}
 %%
@@ -1383,15 +1516,16 @@
 \draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLsp}{\raisebox{-0.333\height}{\SquareLsp}\,}
+\newcommand{\rrhLsp}{\raisebox{-0.333\height}{\@tlen\SquareLsp\@tlen}}
 %%
 \newcommand{\RubikLsp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLsp\\
-\rrLsp
+\rrLsp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLsp}{\rrLsp\,\rrhLsp}
 \newcommand{\rrLa}{\@rra{L}}
 %%
@@ -1403,15 +1537,16 @@
 \draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLa}{\raisebox{-0.333\height}{\SquareLa}\,}
+\newcommand{\rrhLa}{\raisebox{-0.333\height}{\@tlen\SquareLa\@tlen}}
 %%
 \newcommand{\RubikLa}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLa\\
-\rrLa
+\rrLa%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLa}{\rrLa\,\rrhLa}
 \newcommand{\rrLap}{\@rrap{L}}
 %%
@@ -1423,17 +1558,18 @@
 \draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhLap}{\raisebox{-0.333\height}{\SquareLap}\,}
+\newcommand{\rrhLap}{\raisebox{-0.333\height}{\@tlen\SquareLap\@tlen}}
 %%
 \newcommand{\RubikLap}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareLap\\
-\rrLap
+\rrLap%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikLap}{\rrLap\,\rrhLap}
-\newcommand{\rrM}{\textbf{\textsf{M}}}
+\newcommand{\rrM}{\@rr{M}}
 %%
 \newcommand{\SquareM}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1443,17 +1579,18 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhM}{\raisebox{-0.333\height}{\SquareM}\,}
+\newcommand{\rrhM}{\raisebox{-0.333\height}{\@tlen\SquareM\@tlen}}
 %%
 \newcommand{\RubikM}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareM\\
-\rrM
+\rrM%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikM}{\rrM\,\rrhM}
-\newcommand{\rrMp}{\textbf{\textsf{M}$^\prime$}}
+\newcommand{\rrMp}{\@rrp{M}}
 %%
 \newcommand{\SquareMp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1463,17 +1600,18 @@
 \draw [thick] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhMp}{\raisebox{-0.333\height}{\SquareMp}\,}
+\newcommand{\rrhMp}{\raisebox{-0.333\height}{\@tlen\SquareMp\@tlen}}
 %%
 \newcommand{\RubikMp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareMp\\
-\rrMp
+\rrMp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikMp}{\rrMp\,\rrhMp}
-\newcommand{\rrR}{\textbf{\textsf{R}}}
+\newcommand{\rrR}{\@rr{R}}
 %%
 \newcommand{\SquareR}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1484,17 +1622,18 @@
 \draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhR}{\raisebox{-0.333\height}{\SquareR}\,}
+\newcommand{\rrhR}{\raisebox{-0.333\height}{\@tlen\SquareR\@tlen}}
 %%
 \newcommand{\RubikR}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareR\\
-\rrR
+\rrR%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikR}{\rrR\,\rrhR}
-\newcommand{\rrRp}{\textbf{\textsf{R}$^\prime$}}
+\newcommand{\rrRp}{\@rrp{R}}
 %%
 \newcommand{\SquareRp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1504,17 +1643,18 @@
 \draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRp}{\raisebox{-0.333\height}{\SquareRp}\,}
+\newcommand{\rrhRp}{\raisebox{-0.333\height}{\@tlen\SquareRp\@tlen}}
 %%
 \newcommand{\RubikRp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRp\\
-\rrRp
+\rrRp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRp}{\rrRp\,\rrhRp}
-\newcommand{\rrRw}{\textbf{\textsf{R\footnotesize{w}}}}
+\newcommand{\rrRw}{\@rrw{R}}
 %%
 \newcommand{\SquareRw}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1524,17 +1664,18 @@
 \draw [thick, ->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRw}{\raisebox{-0.333\height}{\SquareRw}\,}
+\newcommand{\rrhRw}{\raisebox{-0.333\height}{\@tlen\SquareRw\@tlen}}
 %%
 \newcommand{\RubikRw}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRw\\
-\rrRw
+\rrRw%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRw}{\rrRw\,\rrhRw}
-\newcommand{\rrRwp}{\textbf{\textsf{R\footnotesize{w}}$^\prime$}}
+\newcommand{\rrRwp}{\@rrwp{R}}
 %%
 \newcommand{\SquareRwp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1544,15 +1685,16 @@
 \draw [thick, <-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRwp}{\raisebox{-0.333\height}{\SquareRwp}\,}
+\newcommand{\rrhRwp}{\raisebox{-0.333\height}{\@tlen\SquareRwp\@tlen}}
 %%
 \newcommand{\RubikRwp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRwp\\
-\rrRwp
+\rrRwp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRwp}{\rrRwp\,\rrhRwp}
 \newcommand{\rrRs}{\@rrs{R}}
 %%
@@ -1564,15 +1706,16 @@
 \draw [thick,->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRs}{\raisebox{-0.333\height}{\SquareRs}\,}
+\newcommand{\rrhRs}{\raisebox{-0.333\height}{\@tlen\SquareRs\@tlen}}
 %%
 \newcommand{\RubikRs}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRs\\
-\rrRs
+\rrRs%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRs}{\rrRs\,\rrhRs}
 \newcommand{\rrRsp}{\@rrsp{R}}
 %%
@@ -1584,15 +1727,16 @@
 \draw [thick,<-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRsp}{\raisebox{-0.333\height}{\SquareRsp}\,}
+\newcommand{\rrhRsp}{\raisebox{-0.333\height}{\@tlen\SquareRsp\@tlen}}
 %%
 \newcommand{\RubikRsp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRsp\\
-\rrRsp
+\rrRsp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRsp}{\rrRsp\,\rrhRsp}
 \newcommand{\rrRa}{\@rra{R}}
 %%
@@ -1604,15 +1748,16 @@
 \draw [thick,->] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRa}{\raisebox{-0.333\height}{\SquareRa}\,}
+\newcommand{\rrhRa}{\raisebox{-0.333\height}{\@tlen\SquareRa\@tlen}}
 %%
 \newcommand{\RubikRa}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRa\\
-\rrRa
+\rrRa%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRa}{\rrRa\,\rrhRa}
 \newcommand{\rrRap}{\@rrap{R}}
 %%
@@ -1624,127 +1769,136 @@
 \draw [thick,<-] (\@sddd, \@sb) -- (\@sddd, \@sbh);
 \end{tikzpicture}%
 }
-\newcommand{\rrhRap}{\raisebox{-0.333\height}{\SquareRap}\,}
+\newcommand{\rrhRap}{\raisebox{-0.333\height}{\@tlen\SquareRap\@tlen}}
 %%
 \newcommand{\RubikRap}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareRap\\
-\rrRap
+\rrRap%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikRap}{\rrRap\,\rrhRap}
 \newcommand{\rrS}{\@rr{S}}
-\newcommand{\SquareS}{\@SquareLetter{\rrS}}
-\newcommand{\rrhS}{\raisebox{-0.25mm}{\SquareS}\,}
-\newcommand{\RubikS}{\raisebox{\@hRubik}{\SquareS}\,}
-\newcommand{\textRubikS}{\rrhS\,}
+\newcommand{\SquareS}{\@tlen\@SquareLetter{\rrS}\@tlen}
+\newcommand{\rrhS}{\raisebox{-0.25mm}{\SquareS}}
+\newcommand{\RubikS}{\raisebox{\@hRubik}{\SquareS}}
+\newcommand{\textRubikS}{\rrhS}
 \newcommand{\rrSp}{\@rrp{S}}
-\newcommand{\SquareSp}{\@SquareLetter{\rrSp}}
-\newcommand{\rrhSp}{\raisebox{-0.25mm}{\SquareSp}\,}
-\newcommand{\RubikSp}{\raisebox{\@hRubik}{\SquareSp}\,}
-\newcommand{\textRubikSp}{\rrhSp\,}
-\newcommand{\rrSu}{\textbf{\textsf{S\footnotesize{u}}}}
+\newcommand{\SquareSp}{\@tlen\@SquareLetter{\rrSp}\@tlen}
+\newcommand{\rrhSp}{\raisebox{-0.25mm}{\SquareSp}}
+\newcommand{\RubikSp}{\raisebox{\@hRubik}{\SquareSp}}
+\newcommand{\textRubikSp}{\rrhSp}
+\newcommand{\rrSu}{\@rru{S}}
 \newcommand{\rrhSu}{\rrhEp}%
 \newcommand{\RubikSu}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareEp\\
-\rrSu
+\rrSu%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSu}{\rrSu\,\rrhEp}
-\newcommand{\rrSup}{\textbf{\textsf{S\footnotesize{u}}$^\prime$}}
+\newcommand{\rrSup}{\@rrup{S}}
 \newcommand{\rrhSup}{\rrhE}%
 \newcommand{\RubikSup}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareE\\
-\rrSup
+\rrSup%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSup}{\rrSup\,\rrhE}
-\newcommand{\rrSd}{\textbf{\textsf{S\footnotesize{d}}}}
+\newcommand{\rrSd}{\@rrd{S}}
 \newcommand{\rrhSd}{\rrhE}%
 \newcommand{\RubikSd}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareE\\
-\rrSd
+\rrSd%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSd}{\rrSd\,\rrhE}
-\newcommand{\rrSdp}{\textbf{\textsf{S\footnotesize{d}}$^\prime$}}
+\newcommand{\rrSdp}{\@rrdp{S}}
 \newcommand{\rrhSdp}{\rrhEp}%
 \newcommand{\RubikSdp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareEp\\
-\rrSdp
+\rrSdp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSdp}{\rrSdp\,\rrhEp}
-\newcommand{\rrSl}{\textbf{\textsf{S\footnotesize{l}}}}
+\newcommand{\rrSl}{\@rrl{S}}
 \newcommand{\rrhSl}{\rrhM}%
 \newcommand{\RubikSl}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareM\\
-\rrSl
+\rrSl%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSl}{\rrSl\,\rrhM}
-\newcommand{\rrSlp}{\textbf{\textsf{S\footnotesize{l}}$^\prime$}}
+\newcommand{\rrSlp}{\@rrlp{S}}
 \newcommand{\rrhSlp}{\rrhMp}%
 \newcommand{\RubikSlp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareMp\\
-\rrSlp
+\rrSlp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSlp}{\rrSlp\,\rrhMp}
-\newcommand{\rrSr}{\textbf{\textsf{S\footnotesize{r}}}}
+\newcommand{\rrSr}{\@rrr{S}}
 \newcommand{\rrhSr}{\rrhMp}%
 \newcommand{\RubikSr}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareMp\\
-\rrSr
+\rrSr%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSr}{\rrSr\,\rrhMp}
-\newcommand{\rrSrp}{\textbf{\textsf{S\footnotesize{r}}$^\prime$}}
+\newcommand{\rrSrp}{\@rrrp{S}}
 \newcommand{\rrhSrp}{\rrhM}%
 \newcommand{\RubikSrp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareM\\
-\rrSrp
+\rrSrp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikSrp}{\rrSrp\,\rrhM}
-\newcommand{\rrSf}{\textbf{\textsf{S\footnotesize{f}}}}
-\newcommand{\SquareSf}{\@SquareLetter{\rrSf}}
-\newcommand{\rrhSf}{\raisebox{-0.25mm}{\SquareSf}\,}
-\newcommand{\RubikSf}{\raisebox{\@hRubik}{\SquareSf}\,}
-\newcommand{\textRubikSf}{\rrhSf\,}
-\newcommand{\rrSfp}{\textbf{\textsf{S\footnotesize{f}}$^\prime$}}
-\newcommand{\SquareSfp}{\@SquareLetter{\rrSfp}}
-\newcommand{\rrhSfp}{\raisebox{-0.25mm}{\SquareSfp}\,}
-\newcommand{\RubikSfp}{\raisebox{\@hRubik}{\SquareSfp}\,}
-\newcommand{\textRubikSfp}{\rrhSfp\,}
-\newcommand{\rrSb}{\textbf{\textsf{S\footnotesize{b}}}}
-\newcommand{\SquareSb}{\@SquareLetter{\rrSb}}
-\newcommand{\rrhSb}{\raisebox{-0.25mm}{\SquareSb}\,}
-\newcommand{\RubikSb}{\raisebox{\@hRubik}{\SquareSb}\,}
-\newcommand{\textRubikSb}{\rrhSb\,}
-\newcommand{\rrSbp}{\textbf{\textsf{S\footnotesize{b}}$^\prime$}}
-\newcommand{\SquareSbp}{\@SquareLetter{\rrSbp}}
-\newcommand{\rrhSbp}{\raisebox{-0.25mm}{\SquareSbp}\,}
-\newcommand{\RubikSbp}{\raisebox{\@hRubik}{\SquareSbp}\,}
-\newcommand{\textRubikSbp}{\rrhSbp\,}
-\newcommand{\rrU}{\textbf{\textsf{U}}}
+\newcommand{\rrSf}{\@rrf{S}}
+\newcommand{\SquareSf}{\@tlen\@SquareLetter{\rrSf}\@tlen}
+\newcommand{\rrhSf}{\raisebox{-0.25mm}{\SquareSf}}
+\newcommand{\RubikSf}{\raisebox{\@hRubik}{\SquareSf}}
+\newcommand{\textRubikSf}{\rrhSf}
+\newcommand{\rrSfp}{\@rrfp{S}}
+\newcommand{\SquareSfp}{\@tlen\@SquareLetter{\rrSfp}\@tlen}
+\newcommand{\rrhSfp}{\raisebox{-0.25mm}{\SquareSfp}}
+\newcommand{\RubikSfp}{\raisebox{\@hRubik}{\SquareSfp}}
+\newcommand{\textRubikSfp}{\rrhSfp}
+\newcommand{\rrSb}{\@rrb{S}}
+\newcommand{\SquareSb}{\@tlen\@SquareLetter{\rrSb}\@tlen}
+\newcommand{\rrhSb}{\raisebox{-0.25mm}{\SquareSb}}
+\newcommand{\RubikSb}{\raisebox{\@hRubik}{\SquareSb}}
+\newcommand{\textRubikSb}{\rrhSb}
+\newcommand{\rrSbp}{\@rrbp{S}}
+\newcommand{\SquareSbp}{\@tlen\@SquareLetter{\rrSbp}\@tlen}
+\newcommand{\rrhSbp}{\raisebox{-0.25mm}{\SquareSbp}}
+\newcommand{\RubikSbp}{\raisebox{\@hRubik}{\SquareSbp}}
+\newcommand{\textRubikSbp}{\rrhSbp}
+\newcommand{\rrU}{\@rr{U}}
 %%
 \newcommand{\SquareU}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1754,17 +1908,18 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhU}{\raisebox{-0.333\height}{\SquareU}\,}
+\newcommand{\rrhU}{\raisebox{-0.333\height}{\@tlen\SquareU\@tlen}}
 %%
 \newcommand{\RubikU}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareU\\
-\rrU
+\rrU%
 \end{minipage}%%
-}
+}}
 \newcommand{\textRubikU}{\rrU\,\rrhU}
-\newcommand{\rrUw}{\textbf{\textsf{U\footnotesize{w}}}}
+\newcommand{\rrUw}{\@rrw{U}}
 %%
 \newcommand{\SquareUw}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1774,18 +1929,19 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUw}{\raisebox{-0.333\height}{\SquareUw}\,}
+\newcommand{\rrhUw}{\raisebox{-0.333\height}{\@tlen\SquareUw\@tlen}}
 %%
 \newcommand{\RubikUw}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUw\\
-\rrUw
+\rrUw%
 \end{minipage}%%
-}
+}}
 %%
 \newcommand{\textRubikUw}{\rrUw\,\rrhUw}
-\newcommand{\rrUp}{\textbf{\textsf{U}$^\prime$}}
+\newcommand{\rrUp}{\@rrp{U}}
 %%
 \newcommand{\SquareUp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1795,17 +1951,18 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUp}{\raisebox{-0.333\height}{\SquareUp}\,}
+\newcommand{\rrhUp}{\raisebox{-0.333\height}{\@tlen\SquareUp\@tlen}}
 %%
 \newcommand{\RubikUp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUp\\
-\rrUp
+\rrUp%
 \end{minipage}%%
-}
+}}
 \newcommand{\textRubikUp}{\rrUp\,\rrhUp}
-\newcommand{\rrUwp}{\textbf{\textsf{U\footnotesize{w}}$^\prime$}}
+\newcommand{\rrUwp}{\@rrwp{U}}
 %%
 \newcommand{\SquareUwp}{%
 \begin{tikzpicture}[scale=0.5]
@@ -1815,15 +1972,16 @@
 \draw [thick]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUwp}{\raisebox{-0.333\height}{\SquareUwp}\,}
+\newcommand{\rrhUwp}{\raisebox{-0.333\height}{\@tlen\SquareUwp\@tlen}}
 %%
 \newcommand{\RubikUwp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUwp\\
-\rrUwp
+\rrUwp%
 \end{minipage}%%
-}
+}}
 \newcommand{\textRubikUwp}{\rrUwp\,\rrhUwp}
 \newcommand{\rrUs}{\@rrs{U}}
 %%
@@ -1835,15 +1993,16 @@
 \draw [thick, <-]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUs}{\raisebox{-0.333\height}{\SquareUs}\,}
+\newcommand{\rrhUs}{\raisebox{-0.333\height}{\@tlen\SquareUs\@tlen}}
 %%
 \newcommand{\RubikUs}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUs\\
-\rrUs
+\rrUs%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikUs}{\rrUs\,\rrhUs}
 \newcommand{\rrUsp}{\@rrsp{U}}
 %%
@@ -1855,15 +2014,16 @@
 \draw [thick, ->]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUsp}{\raisebox{-0.333\height}{\SquareUsp}\,}
+\newcommand{\rrhUsp}{\raisebox{-0.333\height}{\@tlen\SquareUsp\@tlen}}
 %%
 \newcommand{\RubikUsp}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUsp\\
-\rrUsp
+\rrUsp%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikUsp}{\rrUsp\,\rrhUsp}
 \newcommand{\rrUa}{\@rra{U}}
 %%
@@ -1875,15 +2035,16 @@
 \draw [thick, ->]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUa}{\raisebox{-0.333\height}{\SquareUa}\,}
+\newcommand{\rrhUa}{\raisebox{-0.333\height}{\@tlen\SquareUa\@tlen}}
 %%
 \newcommand{\RubikUa}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUa\\
-\rrUa
+\rrUa%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikUa}{\rrUa\,\rrhUa}
 \newcommand{\rrUap}{\@rrap{U}}
 %%
@@ -1895,52 +2056,573 @@
 \draw [thick, <-]     (\@sb,\@sd) --   (\@sbh, \@sd);
 \end{tikzpicture}%
 }
-\newcommand{\rrhUap}{\raisebox{-0.333\height}{\SquareUap}\,}
+\newcommand{\rrhUap}{\raisebox{-0.333\height}{\@tlen\SquareUap\@tlen}}
 %%
 \newcommand{\RubikUap}{%
+{\@rubikfont%
 \begin{minipage}{0.6cm}
-\centering
+\centering%
 \SquareUap\\
-\rrUap
+\rrUap%
 \end{minipage}%
-}
+}}
 \newcommand{\textRubikUap}{\rrUap\,\rrhUap}
-\newcommand{\rrx}{\textbf{\textsf{x}}}
+\newcommand{\rrx}{\@rr{x}}
 \newcommand{\Rubikx}{\@xyzRubik{x}}
 \newcommand{\rrhx}{\@xyzh{x}}
-\newcommand{\rrxp}{\textbf{\textsf{x}$^\prime$}}
+\newcommand{\rrxp}{\@rrp{x}}
 \newcommand{\Rubikxp}{\@xyzRubikp{x}}
 \newcommand{\rrhxp}{\@xyzhp{x}}
-\newcommand{\rry}{\textbf{\textsf{y}}}
+\newcommand{\rry}{\@rr{y}}
 \newcommand{\Rubiky}{\@xyzRubik{y}}
 \newcommand{\rrhy}{\@xyzh{y}}
-\newcommand{\rryp}{\textbf{\textsf{y}$^\prime$}}
+\newcommand{\rryp}{\@rrp{y}}
 \newcommand{\Rubikyp}{\@xyzRubikp{y}}
 \newcommand{\rrhyp}{\@xyzhp{y}}
-\newcommand{\rrz}{\textbf{\textsf{z}}}
+\newcommand{\rrz}{\@rr{z}}
 \newcommand{\Rubikz}{\@xyzRubik{z}}
 \newcommand{\rrhz}{\@xyzh{z}}
-\newcommand{\rrzp}{\textbf{\textsf{z}$^\prime$}}
+\newcommand{\rrzp}{\@rrp{z}}
 \newcommand{\Rubikzp}{\@xyzRubikp{z}}
 \newcommand{\rrhzp}{\@xyzhp{z}}
-\newcommand{\rru}{\textbf{\textsf{u}}}
+\newcommand{\rru}{\@rr{u}}
 \newcommand{\Rubiku}{\@xyzRubik{u}}
 \newcommand{\rrhu}{\@xyzh{u}}
-\newcommand{\rrd}{\textbf{\textsf{d}}}
-\newcommand{\Rubikd}{\@xyzRubik{d}}
-\newcommand{\rrhd}{\@xyzh{d}}
-\newcommand{\rrl}{\textbf{\textsf{l}}}
-\newcommand{\Rubikl}{\@xyzRubik{l}}
-\newcommand{\rrhl}{\@xyzh{l}}
-\newcommand{\rrr}{\textbf{\textsf{r}}}
+\newcommand{\rrd}{\@rr{d}}
+\newcommand{\rrhd}{\@xyzhbdfl{d}}
+\newcommand{\Rubikd}{\@xyzbdflRubik{d}}
+\newcommand{\rrl}{\@rr{l}}
+\newcommand{\rrhl}{\@xyzhbdfl{l}}
+\newcommand{\Rubikl}{\@xyzbdflRubik{l}}
+\newcommand{\rrr}{\@rr{r}}
 \newcommand{\Rubikr}{\@xyzRubik{r}}
 \newcommand{\rrhr}{\@xyzh{r}}
-\newcommand{\rrf}{\textbf{\textsf{f}}}
-\newcommand{\Rubikf}{\@xyzRubik{f}}
-\newcommand{\rrhf}{\@xyzh{f}}
-\newcommand{\rrb}{\textbf{\textsf{b}}}
-\newcommand{\Rubikb}{\@xyzRubik{b}}
-\newcommand{\rrhb}{\@xyzh{b}}
+\newcommand{\rrf}{\@rr{f}}
+\newcommand{\rrhf}{\@xyzhbdfl{f}}
+\newcommand{\Rubikf}{\@xyzbdflRubik{f}}
+\newcommand{\rrb}{\@rr{b}}
+\newcommand{\rrhb}{\@xyzhbdfl{b}}
+\newcommand{\Rubikb}{\@xyzbdflRubik{b}}
+\newcommand{\@xyzhc}[1]{[\raisebox{-1.2pt}%
+   {{\@rubikfont #1\@rubikfontFNS c}}]}
+\newcommand{\@xyzhcp}[1]{[\raisebox{-1.2pt}%
+   {{\@rubikfont #1{\@rubikfontFNS c}\@rubikprime}}]}
+\newcommand{\@xyzRubikc}[1]{\raisebox{3.45pt}%
+   {[\raisebox{-1.2pt}{{\@rubikfont #1\@rubikfontFNS c}}]}}
+\newcommand{\@xyzRubikcp}[1]{\raisebox{3.45pt}%
+   {[\raisebox{-1.2pt}{{\@rubikfont #1{\@rubikfontFNS c}\@rubikprime}}]}}
+\newcommand{\rrRc}{\@rrc{R}}
+\newcommand{\RubikRc}{\@xyzRubikc{R}}
+\newcommand{\rrhRc}{\@xyzhc{R}}
+\newcommand{\rrRcp}{\@rrcp{R}}
+\newcommand{\RubikRcp}{\@xyzRubikcp{R}}
+\newcommand{\rrhRcp}{\@xyzhcp{R}}
+\newcommand{\rrLc}{\@rrc{L}}
+\newcommand{\RubikLc}{\@xyzRubikc{L}}
+\newcommand{\rrhLc}{\@xyzhc{L}}
+\newcommand{\rrLcp}{\@rrcp{L}}
+\newcommand{\RubikLcp}{\@xyzRubikcp{L}}
+\newcommand{\rrhLcp}{\@xyzhcp{L}}
+\newcommand{\rrUc}{\@rrc{U}}
+\newcommand{\RubikUc}{\@xyzRubikc{U}}
+\newcommand{\rrhUc}{\@xyzhc{U}}
+\newcommand{\rrUcp}{\@rrcp{U}}
+\newcommand{\RubikUcp}{\@xyzRubikcp{U}}
+\newcommand{\rrhUcp}{\@xyzhcp{U}}
+\newcommand{\rrDc}{\@rrc{D}}
+\newcommand{\RubikDc}{\@xyzRubikc{D}}
+\newcommand{\rrhDc}{\@xyzhc{D}}
+\newcommand{\rrDcp}{\@rrcp{D}}
+\newcommand{\RubikDcp}{\@xyzRubikcp{D}}
+\newcommand{\rrhDcp}{\@xyzhcp{D}}
+\newcommand{\rrFc}{\@rrc{F}}
+\newcommand{\RubikFc}{\@xyzRubikc{F}}
+\newcommand{\rrhFc}{\@xyzhc{F}}
+\newcommand{\rrFcp}{\@rrcp{F}}
+\newcommand{\RubikFcp}{\@xyzRubikcp{F}}
+\newcommand{\rrhFcp}{\@xyzhcp{F}}
+\newcommand{\rrBc}{\@rrc{B}}
+\newcommand{\RubikBc}{\@xyzRubikc{B}}
+\newcommand{\rrhBc}{\@xyzhc{B}}
+\newcommand{\rrBcp}{\@rrcp{B}}
+\newcommand{\RubikBcp}{\@xyzRubikcp{B}}
+\newcommand{\rrhBcp}{\@xyzhcp{B}}
+\newcommand{\rrRm}{\@rrm{R}}
+\newcommand{\rrhRm}{\rrhMp}%
+\newcommand{\RubikRm}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareMp\\
+\rrRm%
+\end{minipage}%
+}}
+\newcommand{\textRubikRm}{\rrRm\,\rrhMp}
+\newcommand{\rrRmp}{\@rrmp{R}}
+\newcommand{\rrhRmp}{\rrhM}%
+\newcommand{\RubikRmp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareM\\
+\rrRmp%
+\end{minipage}%
+}}
+\newcommand{\textRubikRmp}{\rrRmp\,\rrhM}
+\newcommand{\rrLm}{\@rrm{L}}
+\newcommand{\rrhLm}{\rrhM}%
+\newcommand{\RubikLm}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareM\\
+\rrLm%
+\end{minipage}%
+}}
+\newcommand{\textRubikLm}{\rrLm\,\rrhM}
+\newcommand{\rrLmp}{\@rrmp{L}}
+\newcommand{\rrhLmp}{\rrhMp}%
+\newcommand{\RubikLmp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareMp\\
+\rrLmp%
+\end{minipage}%
+}}
+\newcommand{\textRubikLmp}{\rrLmp\,\rrhMp}
+\newcommand{\rrUm}{\@rrm{U}}
+\newcommand{\rrhUm}{\rrhEp}%
+\newcommand{\RubikUm}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareEp\\
+\rrUm%
+\end{minipage}%
+}}
+\newcommand{\textRubikUm}{\rrUm\,\rrhEp}
+\newcommand{\rrUmp}{\@rrmp{U}}
+\newcommand{\rrhUmp}{\rrhE}%
+\newcommand{\RubikUmp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareE\\
+\rrUmp%
+\end{minipage}%
+}}
+\newcommand{\textRubikUmp}{\rrUmp\,\rrhE}
+\newcommand{\rrDm}{\@rrm{D}}
+\newcommand{\rrhDm}{\rrhE}%
+\newcommand{\RubikDm}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareE\\
+\rrDm%
+\end{minipage}%
+}}
+\newcommand{\textRubikDm}{\rrDm\,\rrhE}
+\newcommand{\rrDmp}{\@rrmp{D}}
+\newcommand{\rrhDmp}{\rrhEp}%
+\newcommand{\RubikDmp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareEp\\
+\rrDmp%
+\end{minipage}%
+}}
+\newcommand{\textRubikDmp}{\rrDmp\,\rrhEp}
+\newcommand{\rrFm}{\@rrm{F}}
+\newcommand{\SquareFm}{\@tlen\@SquareLetter{\rrFm}\@tlen}
+\newcommand{\rrhFm}{\raisebox{-0.25mm}{\SquareFm}}
+\newcommand{\RubikFm}{\raisebox{\@hRubik}{\SquareFm}}
+\newcommand{\textRubikFm}{\rrhFm}
+\newcommand{\rrFmp}{\@rrmp{F}}
+\newcommand{\SquareFmp}{\@tlen\@SquareLetter{\rrFmp}\@tlen}
+\newcommand{\rrhFmp}{\raisebox{-0.25mm}{\SquareFmp}}
+\newcommand{\RubikFmp}{\raisebox{\@hRubik}{\SquareFmp}}
+\newcommand{\textRubikFmp}{\rrhFmp}
+\newcommand{\rrBm}{\@rrm{B}}
+\newcommand{\SquareBm}{\@tlen\@SquareLetter{\rrBm}\@tlen}
+\newcommand{\rrhBm}{\raisebox{-0.25mm}{\SquareBm}}
+\newcommand{\RubikBm}{\raisebox{\@hRubik}{\SquareBm}}
+\newcommand{\textRubikBm}{\rrhBm}
+\newcommand{\rrBmp}{\@rrmp{B}}
+\newcommand{\SquareBmp}{\@tlen\@SquareLetter{\rrBmp}\@tlen}
+\newcommand{\rrhBmp}{\raisebox{-0.25mm}{\SquareBmp}}
+\newcommand{\RubikBmp}{\raisebox{\@hRubik}{\SquareBmp}}
+\newcommand{\textRubikBmp}{\rrhBmp}
+\newcommand{\@randhc}[1]{[\raisebox{-1.2pt}{{\@rubikfont C#1}}]}
+\newcommand{\@randhcp}[1]{[\raisebox{-1.2pt}{{\@rubikfont C#1\@rubikprime}}]}
+\newcommand{\@randRubikc}[1]%
+   {\raisebox{3.45pt}{[\raisebox{-1.2pt}{{\@rubikfont C#1}}]}}
+\newcommand{\@randRubikcp}[1]%
+   {\raisebox{3.45pt}{[\raisebox{-1.2pt}{{\@rubikfont C#1\@rubikprime}}]}}
+\newcommand{\rrCR}{\@rr{CR}}
+\newcommand{\RubikCR}{\@randRubikc{R}}
+\newcommand{\rrhCR}{\@randhc{R}}
+\newcommand{\rrCRp}{\@rrp{CR}}
+\newcommand{\RubikCRp}{\@randRubikcp{R}}
+\newcommand{\rrhCRp}{\@randhcp{R}}
+\newcommand{\rrCL}{\@rr{CL}}
+\newcommand{\RubikCL}{\@randRubikc{L}}
+\newcommand{\rrhCL}{\@randhc{L}}
+\newcommand{\rrCLp}{\@rrp{CL}}
+\newcommand{\RubikCLp}{\@randRubikcp{L}}
+\newcommand{\rrhCLp}{\@randhcp{L}}
+\newcommand{\rrCU}{\@rr{CU}}
+\newcommand{\RubikCU}{\@randRubikc{U}}
+\newcommand{\rrhCU}{\@randhc{U}}
+\newcommand{\rrCUp}{\@rrp{CU}}
+\newcommand{\RubikCUp}{\@randRubikcp{U}}
+\newcommand{\rrhCUp}{\@randhcp{U}}
+\newcommand{\rrCD}{\@rr{CD}}
+\newcommand{\RubikCD}{\@randRubikc{D}}
+\newcommand{\rrhCD}{\@randhc{D}}
+\newcommand{\rrCDp}{\@rrp{CD}}
+\newcommand{\RubikCDp}{\@randRubikcp{D}}
+\newcommand{\rrhCDp}{\@randhcp{D}}
+\newcommand{\rrCF}{\@rr{CF}}
+\newcommand{\RubikCF}{\@randRubikc{F}}
+\newcommand{\rrhCF}{\@randhc{F}}
+\newcommand{\rrCFp}{\@rrp{CF}}
+\newcommand{\RubikCFp}{\@randRubikcp{F}}
+\newcommand{\rrhCFp}{\@randhcp{F}}
+\newcommand{\rrCB}{\@rr{CB}}
+\newcommand{\RubikCB}{\@randRubikc{B}}
+\newcommand{\rrhCB}{\@randhc{B}}
+\newcommand{\rrCBp}{\@rrp{CB}}
+\newcommand{\RubikCBp}{\@randRubikcp{B}}
+\newcommand{\rrhCBp}{\@randhcp{B}}
+\newcommand{\rrMR}{\@rr{MR}}
+\newcommand{\rrhMR}{\rrhMp}%
+\newcommand{\RubikMR}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareMp\\
+\rrMR%
+\end{minipage}%
+}}
+\newcommand{\textRubikMR}{\rrMR\,\rrhMp}
+\newcommand{\rrMRp}{\@rrp{MR}}
+\newcommand{\rrhMRp}{\rrhM}%
+\newcommand{\RubikMRp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareM\\
+\rrMRp%
+\end{minipage}%
+}}
+\newcommand{\textRubikMRp}{\rrMRp\,\rrhM}
+\newcommand{\rrML}{\@rr{ML}}
+\newcommand{\rrhML}{\rrhM}%
+\newcommand{\RubikML}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareM\\
+\rrML%
+\end{minipage}%
+}}
+\newcommand{\textRubikML}{\rrML\,\rrhM}
+\newcommand{\rrMLp}{\@rrp{ML}}
+\newcommand{\rrhMLp}{\rrhMp}%
+\newcommand{\RubikMLp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareMp\\
+\rrMLp%
+\end{minipage}%
+}}
+\newcommand{\textRubikMLp}{\rrMLp\,\rrhMp}
+\newcommand{\rrMU}{\@rr{MU}}
+\newcommand{\rrhMU}{\rrhEp}%
+\newcommand{\RubikMU}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareEp\\
+\rrMU%
+\end{minipage}%
+}}
+\newcommand{\textRubikMU}{\rrMU\,\rrhEp}
+\newcommand{\rrMUp}{\@rrp{MU}}
+\newcommand{\rrhMUp}{\rrhE}%
+\newcommand{\RubikMUp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareE\\
+\rrMUp%
+\end{minipage}%
+}}
+\newcommand{\textRubikMUp}{\rrMUp\,\rrhE}
+\newcommand{\rrMD}{\@rr{MD}}
+\newcommand{\rrhMD}{\rrhE}%
+\newcommand{\RubikMD}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareE\\
+\rrMD%
+\end{minipage}%
+}}
+\newcommand{\textRubikMD}{\rrMD\,\rrhE}
+\newcommand{\rrMDp}{\@rrp{MD}}
+\newcommand{\rrhMDp}{\rrhEp}%
+\newcommand{\RubikMDp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareEp\\
+\rrMDp%
+\end{minipage}%
+}}
+\newcommand{\textRubikMDp}{\rrMDp\,\rrhEp}
+\newcommand{\rrMF}{\@rr{MF}}
+\newcommand{\SquareMF}{\@tlen\@SquareLetter{\rrMF}\@tlen}
+\newcommand{\rrhMF}{\raisebox{-0.25mm}{\SquareMF}}
+\newcommand{\RubikMF}{\raisebox{\@hRubik}{\SquareMF}}
+\newcommand{\textRubikMF}{\rrhMF}
+\newcommand{\rrMFp}{\@rrp{MF}}
+\newcommand{\SquareMFp}{\@tlen\@SquareLetter{\rrMFp}\@tlen}
+\newcommand{\rrhMFp}{\raisebox{-0.25mm}{\SquareMFp}}
+\newcommand{\RubikMFp}{\raisebox{\@hRubik}{\SquareMFp}}
+\newcommand{\textRubikMFp}{\rrhMFp}
+\newcommand{\rrMB}{\@rr{MB}}
+\newcommand{\SquareMB}{\@tlen\@SquareLetter{\rrMB}\@tlen}
+\newcommand{\rrhMB}{\raisebox{-0.25mm}{\SquareMB}}
+\newcommand{\RubikMB}{\raisebox{\@hRubik}{\SquareMB}}
+\newcommand{\textRubikMB}{\rrhMB}
+\newcommand{\rrMBp}{\@rrp{MB}}
+\newcommand{\SquareMBp}{\@tlen\@SquareLetter{\rrMBp}\@tlen}
+\newcommand{\rrhMBp}{\raisebox{-0.25mm}{\SquareMBp}}
+\newcommand{\RubikMBp}{\raisebox{\@hRubik}{\SquareMBp}}
+\newcommand{\textRubikMBp}{\rrhMBp}
+\newcommand{\@rrT}[1]{{\@rubikfont T#1}}
+\newcommand{\@rrhT}[1]{\@join{\rrh#1}{w}}%
+\newcommand{\@textRubikT}[1]{\@rrT{#1}\,\@join{\rrh#1}{w}}
+\newcommand{\@RubikT}[1]{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%%
+\@join{\Square#1}{w}\\%
+\@rrT{#1}%%
+\end{minipage}%
+}}
+%%
+\newcommand{\@rrTp}[1]{{\@rubikfont T#1\@rubikprime}}
+\newcommand{\@rrhTp}[1]{\@join{\rrh#1}{wp}}%
+\newcommand{\@textRubikTp}[1]{\@rrTp{#1}\,\@join{\rrh#1}{wp}}
+%%
+\newcommand{\@RubikTp}[1]{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%%
+\@join{\Square#1}{wp}\\%
+\@rrTp{#1}%%
+\end{minipage}%
+}}
+\newcommand{\rrTL}{\@rrT{L}}% = rrLw
+\newcommand{\rrhTL}{\@rrhT{L}}
+\newcommand{\textRubikTL}{\@textRubikT{L}}
+\newcommand{\RubikTL}{\@RubikT{L}}
+\newcommand{\rrTLp}{\@rrTp{L}}
+\newcommand{\rrhTLp}{\@rrhTp{L}}
+\newcommand{\textRubikTLp}{\@textRubikTp{L}}
+\newcommand{\RubikTLp}{\@RubikTp{L}}
+\newcommand{\rrTR}{\@rrT{R}}
+\newcommand{\rrhTR}{\@rrhT{R}}
+\newcommand{\textRubikTR}{\@textRubikT{R}}
+\newcommand{\RubikTR}{\@RubikT{R}}
+\newcommand{\rrTRp}{\@rrTp{R}}
+\newcommand{\rrhTRp}{\@rrhTp{R}}
+\newcommand{\textRubikTRp}{\@textRubikTp{R}}
+\newcommand{\RubikTRp}{\@RubikTp{R}}
+\newcommand{\rrTU}{\@rrT{U}}
+\newcommand{\rrhTU}{\@rrhT{U}}
+\newcommand{\textRubikTU}{\@textRubikT{U}}
+\newcommand{\RubikTU}{\@RubikT{U}}
+\newcommand{\rrTUp}{\@rrTp{U}}
+\newcommand{\rrhTUp}{\@rrhTp{U}}
+\newcommand{\textRubikTUp}{\@textRubikTp{U}}
+\newcommand{\RubikTUp}{\@RubikTp{U}}
+\newcommand{\rrTD}{\@rrT{D}}
+\newcommand{\rrhTD}{\@rrhT{D}}
+\newcommand{\textRubikTD}{\@textRubikT{D}}
+\newcommand{\RubikTD}{\@RubikT{D}}
+\newcommand{\rrTDp}{\@rrTp{D}}
+\newcommand{\rrhTDp}{\@rrhTp{D}}
+\newcommand{\textRubikTDp}{\@textRubikTp{D}}
+\newcommand{\RubikTDp}{\@RubikTp{D}}
+\newcommand{\rrTF}{\@rrT{F}}
+\newcommand{\rrhTF}{\@rrhT{F}}
+\newcommand{\textRubikTF}{\@textRubikT{F}}
+\newcommand{\RubikTF}{\@RubikT{F}}
+\newcommand{\rrTFp}{\@rrTp{F}}
+\newcommand{\rrhTFp}{\@rrhTp{F}}
+\newcommand{\textRubikTFp}{\@textRubikTp{F}}
+\newcommand{\RubikTFp}{\@RubikTp{F}}
+\newcommand{\rrTB}{\@rrT{B}}
+\newcommand{\SquareTB}{\@tlen\@SquareLetter{\rrTB}\@tlen}
+\newcommand{\rrhTB}{\raisebox{-0.25mm}{\SquareTB}}
+\newcommand{\textRubikTB}{\rrhTB}
+\newcommand{\RubikTB}{\raisebox{\@hRubik}{\SquareTB}}
+\newcommand{\rrTBp}{\@rrTp{B}}
+\newcommand{\SquareTBp}{\@tlen\@SquareLetter{\rrTBp}\@tlen}
+\newcommand{\rrhTBp}{\raisebox{-0.25mm}{\SquareTBp}}
+\newcommand{\textRubikTBp}{\rrhTBp}
+\newcommand{\RubikTBp}{\raisebox{\@hRubik}{\SquareTBp}}
+\newcommand{\rrSR}{\@rr{SR}}
+\newcommand{\rrhSR}{\rrhRs}%
+\newcommand{\RubikSR}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareRs\\
+\rrSR%
+\end{minipage}%
+}}
+\newcommand{\textRubikSR}{\rrSR\,\rrhRs}
+\newcommand{\rrSRp}{\@rrp{SR}}
+\newcommand{\rrhSRp}{\rrhRsp}%
+\newcommand{\RubikSRp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareRsp\\
+\rrSRp%
+\end{minipage}%
+}}
+\newcommand{\textRubikSRp}{\rrSRp\,\rrhRsp}
+\newcommand{\rrSL}{\@rr{SL}}
+\newcommand{\rrhSL}{\rrhLs}%
+\newcommand{\RubikSL}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareLs\\
+\rrSL%
+\end{minipage}%
+}}
+\newcommand{\textRubikSL}{\rrSL\,\rrhLs}
+\newcommand{\rrSLp}{\@rrp{SL}}
+\newcommand{\rrhSLp}{\rrhLsp}%
+\newcommand{\RubikSLp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareLsp\\
+\rrSLp%
+\end{minipage}%
+}}
+\newcommand{\textRubikSLp}{\rrSLp\,\rrhLsp}
+\newcommand{\rrSU}{\@rr{SU}}
+\newcommand{\rrhSU}{\rrhUs}%
+\newcommand{\RubikSU}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareUs\\
+\rrSU%
+\end{minipage}%
+}}
+\newcommand{\textRubikSU}{\rrSU\,\rrhUs}
+\newcommand{\rrSUp}{\@rrp{SU}}
+\newcommand{\rrhSUp}{\rrhUsp}%
+\newcommand{\RubikSUp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareUsp\\
+\rrSUp%
+\end{minipage}%
+}}
+\newcommand{\textRubikSUp}{\rrSUp\,\rrhUsp}
+\newcommand{\rrSD}{\@rr{SD}}
+\newcommand{\rrhSD}{\rrhDs}%
+\newcommand{\RubikSD}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareDs\\
+\rrSD%
+\end{minipage}%
+}}
+\newcommand{\textRubikSD}{\rrSD\,\rrhDs}
+\newcommand{\rrSDp}{\@rrp{SD}}
+\newcommand{\rrhSDp}{\rrhDsp}%
+\newcommand{\RubikSDp}{%
+{\@rubikfont%
+\begin{minipage}{0.6cm}
+\centering%
+\SquareDsp\\
+\rrSDp%
+\end{minipage}%
+}}
+\newcommand{\textRubikSDp}{\rrSDp\,\rrhDsp}
+\newcommand{\rrSF}{\@rr{SF}}
+\newcommand{\SquareSF}{\@tlen\@SquareLetter{\rrSF}\@tlen}
+\newcommand{\rrhSF}{\raisebox{-0.25mm}{\SquareSF}}
+\newcommand{\RubikSF}{\raisebox{\@hRubik}{\SquareSF}}
+\newcommand{\textRubikSF}{\rrhSF}
+\newcommand{\rrSFp}{\@rrp{SF}}
+\newcommand{\SquareSFp}{\@tlen\@SquareLetter{\rrSFp}\@tlen}
+\newcommand{\rrhSFp}{\raisebox{-0.25mm}{\SquareSFp}}
+\newcommand{\RubikSFp}{\raisebox{\@hRubik}{\SquareSFp}}
+\newcommand{\textRubikSFp}{\rrhSFp}
+\newcommand{\rrSB}{\@rr{SB}}
+\newcommand{\SquareSB}{\@tlen\@SquareLetter{\rrSB}\@tlen}
+\newcommand{\rrhSB}{\raisebox{-0.25mm}{\SquareSB}}
+\newcommand{\RubikSB}{\raisebox{\@hRubik}{\SquareSB}}
+\newcommand{\textRubikSB}{\rrhSB}
+\newcommand{\rrSBp}{\@rrp{SB}}
+\newcommand{\SquareSBp}{\@tlen\@SquareLetter{\rrSBp}\@tlen}
+\newcommand{\rrhSBp}{\raisebox{-0.25mm}{\SquareSBp}}
+\newcommand{\RubikSBp}{\raisebox{\@hRubik}{\SquareSBp}}
+\newcommand{\textRubikSBp}{\rrhSBp}
+\newcommand{\textRubikx}{\rrhx}
+\newcommand{\textRubikxp}{\rrhxp}
+\newcommand{\textRubiky}{\rrhy}
+\newcommand{\textRubikyp}{\rrhyp}
+\newcommand{\textRubikz}{\rrhz}
+\newcommand{\textRubikzp}{\rrhzp}
+\newcommand{\textRubikl}{\rrhl}
+\newcommand{\textRubikr}{\rrhr}
+\newcommand{\textRubiku}{\rrhu}
+\newcommand{\textRubikd}{\rrhd}
+\newcommand{\textRubikf}{\rrhf}
+\newcommand{\textRubikb}{\rrhb}
+\newcommand{\textRubikLc}{\rrhLc}
+\newcommand{\textRubikLcp}{\rrhLcp}
+\newcommand{\textRubikRc}{\rrhRc}
+\newcommand{\textRubikRcp}{\rrhRcp}
+\newcommand{\textRubikUc}{\rrhUc}
+\newcommand{\textRubikUcp}{\rrhUcp}
+\newcommand{\textRubikDc}{\rrhDc}
+\newcommand{\textRubikDcp}{\rrhDcp}
+\newcommand{\textRubikFc}{\rrhFc}
+\newcommand{\textRubikFcp}{\rrhFcp}
+\newcommand{\textRubikBc}{\rrhBc}
+\newcommand{\textRubikBcp}{\rrhBcp}
+\newcommand{\textRubikCL}{\rrhCL}
+\newcommand{\textRubikCLp}{\rrhCLp}
+\newcommand{\textRubikCR}{\rrhCR}
+\newcommand{\textRubikCRp}{\rrhCRp}
+\newcommand{\textRubikCU}{\rrhCU}
+\newcommand{\textRubikCUp}{\rrhCUp}
+\newcommand{\textRubikCD}{\rrhCD}
+\newcommand{\textRubikCDp}{\rrhCDp}
+\newcommand{\textRubikCF}{\rrhCF}
+\newcommand{\textRubikCFp}{\rrhCFp}
+\newcommand{\textRubikCB}{\rrhCB}
+\newcommand{\textRubikCBp}{\rrhCBp}
 \endinput
 %%
 %% End of file `rubikcube.sty'.
diff --git a/Master/texmf-dist/tex/latex/rubik/rubikpatterns.sty b/Master/texmf-dist/tex/latex/rubik/rubikpatterns.sty
new file mode 100644
index 00000000000..3415a93d29f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/rubik/rubikpatterns.sty
@@ -0,0 +1,148 @@
+%%
+%% This is file `rubikpatterns.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% rubikpatterns.dtx  (with options: `rubikpatterns')
+%% 
+%% -----------------------------------------------------------------
+%%   Authors: RWD Nickalls (dick@nickalls.org)
+%%           and Apostolos Syropoulos (asyropoulos@yahoo.com)
+%% 
+%%   Copyright  March 03, 2017     RWD Nickalls and A Syropoulos
+%% 
+%%   VERSION 4.0
+%% 
+%%   This work may be distributed and/or modified under the
+%%   conditions of the LaTeX Project Public License, either
+%%   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.
+%% -----------------------------------------------------------------
+%% 
+%%   This is a LaTeX/TikZ package for drawing Rubik cubes
+%%   Please report errors or suggestions for improvement to
+%% 
+%%          RWD Nickalls  (dick@nickalls.org)
+%%          Apostolos Syropoulos (asyropoulos@yahoo.com)
+%% 
+%%  This package requires the basic TikZ package to be loaded already
+%% ------------------------------------------------------------------
+%%% \CheckSum{187}
+%%% \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
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+
+\def\RPfileversion{4.0}%
+\def\RPfiledate{2017/03/03}%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{rubikpatterns}[\RPfiledate\space (v\RPfileversion)]
+\newcommand{\rubikpatterns}{\textsc{rubikpatterns}}
+\newcommand{\Superflip}{[Superflip],Dp,R2,Fp,D2,F2,U2,Lp,R,Dp,R2,B,F,Rp,%
+U2,Lp,F2,Rp,U2,Rp,Up,<(20f*)>}%
+\newcommand{\superflip}{\Superflip}
+\newcommand{\PonsAsinorum}{[PonsAsinorum],F2,B2,R2,L2,U2,D2,<(12q*, 6f*)>}%
+\newcommand{\ponsasinorum}{\PonsAsinorum}%
+\newcommand{\CheckerboardsThree}%
+{[CheckerboardsThree],F,B2,Rp,D2,B,R,U,Dp,R,Lp,Dp,Fp,R2,D,F2,Bp,<(20q*, 16f*), order 3>}%
+\newcommand{\checkerboardsthree}{\CheckerboardsThree}%
+\newcommand{\CheckerboardsSix}%
+{[CheckerboardsSix],R2,L2,U,B,L2,Dp,F,B2,R,Lp,Fp,B,R,D,F2,Lp,Up,<(17f*, 22q), order 6>}%
+\newcommand{\checkerboardssix}{\CheckerboardsSix}%
+\newcommand{\Stripes}{[Stripes],F,U,F,R,L2,B,Dp,R,D2,L,Dp,B,R2,L,F,U,F,<(20q*, 17f*)>}%
+\newcommand{\stripes}{\Stripes}%
+\newcommand{\CubeInCube}{[CubeInCube],F,L,F,Up,R,U,F2,L2,Up,Lp,B,Dp,Bp,L2,U,<(18q*, 15f*)>}%
+\newcommand{\cubeincube}{\CubeInCube}%
+\newcommand{\CubeInCubeInCube}%
+{[CubeInCubeInCube],Fp,U,Bp,Rp,U,F2,U2,Fp,Up,F,U2,D,Bp,Dp,R2,B2,Up,<(17f*, 22q)>}%
+\newcommand{\cubeincubeincube}{\CubeInCubeInCube}%
+\newcommand{\ChristmasCross}{[ChristmansCross],U,F,Bp,L2,U2,L2,Fp,B,U2,L2,U,<(16q*, 11f*)>}%
+\newcommand{\christmascross}{\ChristmansCross}%
+\newcommand{\PlummersCross}%
+{[PlummersCross],R2,Lp,D,F2,Rp,Dp,Rp,L,Up,D,R,D,B2,Rp,U,D2,<(20q*, 16f*)>}%
+\newcommand{\plummerscross}{\PlummersCross}%
+\newcommand{\Anaconda}{[Anaconda],L,U,Bp,Up,R,Lp,B,Rp,F,Bp,D,R,Dp,Fp,<(14q*, 14f*)>}%
+\newcommand{\anaconda}{\Anaconda}%
+\newcommand{\Python}{[Python],F2,Rp,Bp,U,Rp,L,Fp,L,Fp,B,Dp,R,B,L2,<(16q*, 14f*)>}%
+\newcommand{\python}{\Python}%
+\newcommand{\BlackMamba}{[BlackMamba],R,D,L,Fp,R,Lp,D,Rp,U,Dp,B,Up,Rp,Dp,<(14q*, 14f*)>}%
+\newcommand{\blackmamba}{\BlackMamba}%
+\newcommand{\GreenMamba}{[GreenMamba],R,D,R,F,Rp,Fp,B,D,Rp,Up,Bp,U,D2,<(14q*, 13f*)>}%
+\newcommand{\greenmamba}{\GreenMamba}%
+\newcommand{\FemaleRattlesnake}%
+{[FemaleRattlesnake],U2,Dp,L2,D,B,U,Bp,Rp,L2,U2,F,Up,F,R,<(18q*, 14f*)>}%
+\newcommand{\femalerattlesnake}{\FemaleRattlesnake}%
+\newcommand{\MaleRattlesnake}%
+{[MaleRattlesnake],Rp,Fp,U,Fp,U2,R,L2,B,Up,Bp,Dp,L2,U2,D,<(18q*, 14f*)>}%
+\newcommand{\malerattlesnake}{\MaleRattlesnake}%
+\newcommand{\FemaleBoa}{[FemaleBoa],R,Up,R2,U2,F,D2,R2,Up,Dp,R,Dp,Fp,<(16q*, 12f*)>}%
+\newcommand{\femaleboa}{\FemaleBoa}%
+\newcommand{\MaleBoa}{[MaleBoa],F,D,Rp,U,D,R2,D2,Fp,U2,R2,U,Rp,<(16q*, 12f*)>}%
+\newcommand{\maleboa}{\MaleBoa}%
+\newcommand{\FourSpot}{[FourSpot],F2,B2,U,Dp,R2,L2,U,Dp,<(12q*, 8f*)>}%
+\newcommand{\fourspot}{\FourSpot}%
+\newcommand{\SixSpot}{[SixSpot],U,Dp,R,Lp,F,Bp,U,Dp,<(8q*, 8f*)>}%
+\newcommand{\sixspot}{\SixSpot}%
+\newcommand{\OrthogonalBars}%
+{[OrthogonalBars],F,Rp,U,L,Fp,Lp,F,Up,R,U,Lp,Up,L,Fp,<(14q*, 14f*)>}%
+\newcommand{\orthogonalbars}{\OrthogonalBars}%
+\newcommand{\SixTs}{[SixTs],F2,R2,U2,Fp,B,D2,L2,F,B,<(14q*, 9f*)>}%
+\newcommand{\sixts}{\SixTs}%
+\newcommand{\SixTwoOne}{[SixTwoOne],U,B2,D2,L,Bp,Lp,Up,Lp,B,D2,B2,<(15q*, 11f*)>}%
+\newcommand{\sixtwoone}{\SixTwoOne}%
+\newcommand{\ExchangedPeaks}%
+{[ExchangedPeaks],F2,R2,D,R2,U,D,F2,Dp,Rp,Dp,F,L2,Fp,D,R,Up,<(16f*, 21q)>}%
+\newcommand{\exchangedpeaks}{\ExchangedPeaks}%
+\newcommand{\TwoTwistedPeaks}%
+{[TwoTwistedPeaks],F,D2,B,R,Bp,Lp,F,Dp,L2,F2,R,Fp,Rp,F2,Lp,Fp,<(16f*, 20q)>}%
+\newcommand{\twotwistedpeaks}{\TwoTwistedPeaks}%
+\newcommand{\FourTwistedPeaks}%
+{[FourTwistedPeaks],Up,D,B,Rp,F,R,Bp,Lp,Fp,B,L,F,Rp,Bp,R,Fp,Up,D,<(18q*, 18f*)>}%
+\newcommand{\fourtwistedpeaks}{\FourTwistedPeaks}%
+\newcommand{\ExchangedChickenFeet}%
+{[ExchangedChickenFeet],F,Lp,Dp,Bp,L,F,U,Fp,Dp,F,L2,Bp,Rp,U,L2,Dp,F,<(19q*, 17f*)>}%
+\newcommand{\exchangedchickenfeet}{\ExchangedChickenFeet}%
+\newcommand{\TwistedChickenFeet}%
+{[TwistedChickenFeet],F,Lp,D,Fp,Up,B,U,F,Up,F,Rp,F2,L,Up,Rp,D2,<(18q*, 16f*)>}%
+\newcommand{\twistedchickenfeet}{\TwistedChickenFeet}%
+\newcommand{\ExchangedRings}%
+{[ExchangedRings],F,U,Dp,Lp,B2,L,Up,D,F,U,R2,L2,Up,L2,F2,<(15f*, 20q)>}%
+\newcommand{\exchangedrings}{\ExchangedRings}%
+\newcommand{\TwistedRings}%
+{[TwistedRings],F,D,Fp,D2,Lp,Bp,U,L,D,R,U,Lp,Fp,U,L,U2,<(18q*, 16f*)>}%
+\newcommand{\twistedrings}{\TwistedRings}%
+\newcommand{\EdgeHexagonTwo}%
+{[EdgeHexagonTwo],U,B2,Up,Fp,Up,D,Lp,D2,L,U,Dp,F,Dp,L2,B2,Dp,<(20q*, 16f*) order2>}%
+\newcommand{\edgehexagontwo}{\EdgeHexagonTwo}%
+\newcommand{\EdgeHexagonThree}%
+{[EdgeHexagonThree],F,L,B,U,L,F2,B2,Rp,F2,B2,Up,Bp,Lp,Fp,<(14f*, 18q) order 3>}%
+\newcommand{\edgehexagonthree}{\EdgeHexagonThree}%
+\newcommand{\TomParksPattern}%
+{[TomParksPattern],L,U,F2,R,Lp,U2,Bp,U,D,B2,L,F,Bp,Rp,L,Fp,R,<(20q*, 17f*)>}%
+\newcommand{\tomparkspattern}{\TomParksPattern}%
+\newcommand{\RonsCubeInCube}%
+{[RonsCubeInCube],L2,D2,Lp,D2,B2,L2,B2,Lp,D2,L2,B2,Lp,B2,<(13f*, 23q)>}%
+\newcommand{\ronscubeincube}{\RonsCubeInCube}%
+\newcommand{\TwistedDuckFeet}%
+{[TwistedDuckFeet],F,Rp,B,R,U,Fp,Lp,Fp,U2,Lp,Up,D2,B,Dp,F,Bp,U2,<(20q*, 17f*)>}%
+\newcommand{\twistedduckfeet}{\TwistedDuckFeet}%
+\newcommand{\ExchangedDuckFeet}%
+{[ExchangedDuckFeet],U,F,R2,Fp,Dp,R,U,B2,U2,Fp,R2,F,D,B2,R,Bp,<(21q*, 16f*)>}%
+\newcommand{\exchangedduckfeet}{\ExchangedDuckFeet}%
+\endinput
+%%
+%% End of file `rubikpatterns.sty'.
diff --git a/Master/texmf-dist/tex/latex/rubik/rubikrotation.sty b/Master/texmf-dist/tex/latex/rubik/rubikrotation.sty
index 6a8e25d6561..6c3a06347aa 100644
--- a/Master/texmf-dist/tex/latex/rubik/rubikrotation.sty
+++ b/Master/texmf-dist/tex/latex/rubik/rubikrotation.sty
@@ -10,8 +10,9 @@
 %%   Authors: RWD Nickalls (dick@nickalls.org)
 %%           and Apostolos Syropoulos (asyropoulos@yahoo.com)
 %% 
-%%   Copyright 25 September 2015     RWD Nickalls and A Syropoulos
+%%   Copyright 03 March 2017     RWD Nickalls and A Syropoulos
 %% 
+%%   VERSION 4.0
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -30,6 +31,7 @@
 %%  This package requires the basic TikZ package to be loaded already
 %% ------------------------------------------------------------------
 
+%%% \CheckSum{322}
 %%% \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
@@ -46,9 +48,8 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 
-
-\def\RRfileversion{3.0}%
-\def\RRfiledate{2015/09/25}%
+\def\RRfileversion{4.0}%
+\def\RRfiledate{2017/03/03}%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{rubikrotation}[\RRfiledate\space (v\RRfileversion)]
 \@ifpackageloaded{rubikcube}{}{%
@@ -58,6 +59,15 @@
    \typeout{---rubikrotation requires the fancyvrb package%
        for VerbatimInput{} command.}%
    \RequirePackage{fancyvrb}}
+\@ifpackageloaded{ifluatex}{}{%
+   \typeout{---rubikrotation requires the ifluatex package.}%
+   \RequirePackage{ifluatex}}
+\ifluatex%
+   \@ifpackageloaded{shellesc}{}{%
+   \typeout{---rubikrotation requires the shellesc package
+       to run using Lua\LaTeX.}%
+   \RequirePackage{shellesc}}
+\fi%
 \newcommand{\rubikrotation}{\textsc{rubikrotation}}
 \newcommand{\Rubikrotation}{\textsc{Rubikrotation}}
 \newcommand{\@print}[1]{\immediate\write\outfile{#1}}
@@ -81,7 +91,7 @@
 \newwrite\outfile%
 \immediate\openout\outfile=rubikstateERRORS.dat%
 \@print{\@comment rubikstateERRORS.dat}%
-\@print{\@comment ---(RR.sty v\RRfileversion): comments output by Perl script}%
+\@print{\@comment --------------------}%
 \immediate\closeout\outfile%
 \typeout{---setting up newwrite for rubikrotation.sty to use...}%
 \newwrite\outfile%
@@ -134,8 +144,9 @@
    \next
 }
 \newcommand{\RubikRotation}[2][1]{%
+   \typeout{---TeX process (rubikrotation.sty)-------}%
    \typeout{---NEW rotation command------------------}%
-   \typeout{---command = RubikRotation{#1}}%
+   \typeout{---command = RubikRotation[#1]{#2}}%
    \typeout{---writing current Rubik state to file rubikstate.dat}%
    \@openstatefile% open data file
    \@print{\@comment filename: rubikstate.dat}%
@@ -147,9 +158,9 @@
    \@countingloop{\ourRRcounter} in 1:{#1}{%
          \immediate\write\outfile{rotation,#2}}%
    \@closestatefile% close data file
-   \typeout{---running Perl script (rubikrotation)}%
+   \typeout{---CALLing Perl script (rubikrotation.pl)}%
    \immediate\write18{\rubikperlcmd}%
-   \typeout{---inputting NEW datafile (written by Perl script)}%
+   \typeout{---inputting NEW datafile (data written by Perl script)}%
    \input{rubikstateNEW.dat}%
    \typeout{-----------------------------------------}%
  }
@@ -157,6 +168,7 @@
    \typeout{---ShowRubikErrors: inputting file rubikstateERRORS.dat}%
    \VerbatimInput{rubikstateERRORS.dat}%
  }
+\newcommand{\ShowErrors}{\ShowRubikErrors}
 \newcommand{\CheckRubikState}{%
    \typeout{---NEW check command------------------}%
    \typeout{---command = CheckRubikState}%
@@ -165,9 +177,9 @@
    \@print{\@comment filename: rubikstate.dat}%
    \@printrubikstate%
    \@closestatefile% close data file
-   \typeout{---running Perl script (rubikrotation)}%
+   \typeout{---running Perl script (rubikrotation.pl)}%
    \immediate\write18{\rubikperlcmd}%
-   \typeout{---inputting NEW datafile (written by Perl script)}%
+   \typeout{---inputting NEW datafile (data written by Perl script)}%
    \input{rubikstateNEW.dat}%
    \typeout{-----------------------------------------}%
  }