Changes to cubing page

24 files changed, 174 insertions, 7 deletions

diff --git a/src/speedcubing/notation/b.png b/src/speedcubing/notation/b.png
new file mode 100644
index 0000000..e9d4109
--- /dev/null
+++ b/src/speedcubing/notation/b.png
diff --git a/src/speedcubing/notation/b2.png b/src/speedcubing/notation/b2.png
new file mode 100644
index 0000000..e8ccff8
--- /dev/null
+++ b/src/speedcubing/notation/b2.png
diff --git a/src/speedcubing/notation/b3.png b/src/speedcubing/notation/b3.png
new file mode 100644
index 0000000..3625b76
--- /dev/null
+++ b/src/speedcubing/notation/b3.png
diff --git a/src/speedcubing/notation/d.png b/src/speedcubing/notation/d.png
new file mode 100644
index 0000000..b5e6b2d
--- /dev/null
+++ b/src/speedcubing/notation/d.png
diff --git a/src/speedcubing/notation/d2.png b/src/speedcubing/notation/d2.png
new file mode 100644
index 0000000..d9cb458
--- /dev/null
+++ b/src/speedcubing/notation/d2.png
diff --git a/src/speedcubing/notation/d3.png b/src/speedcubing/notation/d3.png
new file mode 100644
index 0000000..69d4e92
--- /dev/null
+++ b/src/speedcubing/notation/d3.png
diff --git a/src/speedcubing/notation/e.png b/src/speedcubing/notation/e.png
new file mode 100644
index 0000000..a047f22
--- /dev/null
+++ b/src/speedcubing/notation/e.png
diff --git a/src/speedcubing/notation/f.png b/src/speedcubing/notation/f.png
new file mode 100644
index 0000000..ee01221
--- /dev/null
+++ b/src/speedcubing/notation/f.png
diff --git a/src/speedcubing/notation/f2.png b/src/speedcubing/notation/f2.png
new file mode 100644
index 0000000..467a4d3
--- /dev/null
+++ b/src/speedcubing/notation/f2.png
diff --git a/src/speedcubing/notation/f3.png b/src/speedcubing/notation/f3.png
new file mode 100644
index 0000000..3118207
--- /dev/null
+++ b/src/speedcubing/notation/f3.png
diff --git a/src/speedcubing/notation/l.png b/src/speedcubing/notation/l.png
new file mode 100644
index 0000000..9e573b8
--- /dev/null
+++ b/src/speedcubing/notation/l.png
diff --git a/src/speedcubing/notation/l2.png b/src/speedcubing/notation/l2.png
new file mode 100644
index 0000000..ef30d34
--- /dev/null
+++ b/src/speedcubing/notation/l2.png
diff --git a/src/speedcubing/notation/l3.png b/src/speedcubing/notation/l3.png
new file mode 100644
index 0000000..f7d0cb3
--- /dev/null
+++ b/src/speedcubing/notation/l3.png
diff --git a/src/speedcubing/notation/m.png b/src/speedcubing/notation/m.png
new file mode 100644
index 0000000..713caf5
--- /dev/null
+++ b/src/speedcubing/notation/m.png
diff --git a/src/speedcubing/notation/notation.html b/src/speedcubing/notation/notation.html
new file mode 100644
index 0000000..845f72f
--- /dev/null
+++ b/src/speedcubing/notation/notation.html
@@ -0,0 +1,141 @@
+<!--TITLE: Rubik's cube notation-->
+<h1>Rubik's cube notation</h1>
+
+<p>
+This page describes the classic
+<a href="https://www.speedsolving.com/wiki/index.php/Singmaster_notation">
+Singmaster notation</a> for the Rubik's cube, with some commonly used additions.
+</p>
+
+<h2>Basic moves</h2>
+
+<p>
+Each of the six faces of the cube is assigned a letter:
+</p>
+
+<table>
+<tr><td><strong>U</strong></td><td>Upper face</td></tr>
+<tr><td><strong>D</strong></td><td>Down face</td></tr>
+<tr><td><strong>R</strong></td><td>Right face</td></tr>
+<tr><td><strong>L</strong></td><td>Left face</td></tr>
+<tr><td><strong>F</strong></td><td>Front face</td></tr>
+<tr><td><strong>B</strong></td><td>Back face</td></tr>
+</table>
+
+<p>
+A single letter (like U) denotes a 90° turn <em>clockwise</em>, a
+letter followed by a single quote (like U') denotes a 90° turn
+<em>counter-clockwise</em>, and a letter followed by a 2 (like U2) denotes a
+180° turn.
+</p>
+
+<p>
+Basic moves are summarized in the following table (<strong>white face on
+top</strong> and <strong>green face on front</strong>):
+</p>
+
+<table>
+<tr>
+<td><div style="text-align: center"><img src="u.png"><strong>U</strong></div></td>
+<td><div style="text-align: center"><img src="u3.png"><strong>U'</strong></div></td>
+<td><div style="text-align: center"><img src="u2.png"><strong>U2</strong></div></td>
+</tr>
+<tr>
+<td><div style="text-align: center"><img src="d.png"><strong>D</strong></div></td>
+<td><div style="text-align: center"><img src="d3.png"><strong>D'</strong></div></td>
+<td><div style="text-align: center"><img src="d2.png"><strong>D2</strong></div></td>
+</tr>
+<tr>
+<td><div style="text-align: center"><img src="r.png"><strong>R</strong></div></td>
+<td><div style="text-align: center"><img src="r3.png"><strong>R'</strong></div></td>
+<td><div style="text-align: center"><img src="r2.png"><strong>R2</strong></div></td>
+</tr>
+<tr>
+<td><div style="text-align: center"><img src="l.png"><strong>L</strong></div></td>
+<td><div style="text-align: center"><img src="l3.png"><strong>L'</strong></div></td>
+<td><div style="text-align: center"><img src="l2.png"><strong>L2</strong></div></td>
+</tr>
+<tr>
+<td><div style="text-align: center"><img src="f.png"><strong>F</strong></div></td>
+<td><div style="text-align: center"><img src="f3.png"><strong>F'</strong></div></td>
+<td><div style="text-align: center"><img src="f2.png"><strong>F2</strong></div></td>
+</tr>
+<tr>
+<td><div style="text-align: center"><img src="b.png"><strong>B</strong></div></td>
+<td><div style="text-align: center"><img src="b3.png"><strong>B'</strong></div></td>
+<td><div style="text-align: center"><img src="b2.png"><strong>B2</strong></div></td>
+</tr>
+</table>
+
+<p>
+<strong>Note:</strong> "clockwise" or "counter-clockwise" is always
+intended when <em>looking at the face you are turning</em>. This is
+why from the pictures above it looks like, for example, U and D go in
+opposite directions.
+</p>
+<p>
+If this sounds confusing, think about it: if you put a clock face down
+on the table, does it turn clockwise or counter-clockwise?
+</p>
+
+<h2>Full-cube rotations</h2>
+
+<p>
+Sometimes it is convenient to start a move sequence with the cube in a
+different orientation. To denote this, it is common to use the "moves"
+x, y and z that denote a full-cube rotation:
+</p>
+
+<table>
+<tr><td><strong>x</strong></td><td>Follows R</td></tr>
+<tr><td><strong>y</strong></td><td>Follows U</td></tr>
+<tr><td><strong>z</strong></td><td>Follows F</td></tr>
+</table>
+
+<p>
+The same modifiers can be applied, so for example x2 is a full-cube
+rotation that follows R2 (or, equivalently, L2) and z' is a a
+full-cube rotation that follows F' (or, equivalently, B).
+</p>
+
+<h2>Inner-layer moves</h2>
+
+<p>
+Moving two parallel layers of the cube, one clockwise and one
+counter-clockwise, has the same effect as moving the inner layer
+between them. We usually denote these inner-layer moves by
+M, E and S.
+</p>
+
+<table>
+<tr><td><strong>M</strong></td><td>Follows L</td></tr>
+<tr><td><strong>E</strong></td><td>Follows D</td></tr>
+<tr><td><strong>S</strong></td><td>Follows F</td></tr>
+</table>
+
+Or in pictures:
+
+<table>
+<tr>
+<td><div style="text-align: center"><img src="m.png"><strong>M</strong></div></td>
+<td><div style="text-align: center"><img src="e.png"><strong>E</strong></div></td>
+<td><div style="text-align: center"><img src="s.png"><strong>S</strong></div></td>
+</tr>
+</table>
+
+<p>
+The same modifiers can be applied, so for example M2 means moving the inner
+layer between R and L by 180°.
+</p>
+
+<p>
+<strong>Note 1:</strong> unfortunately, the notation for inner-layer moves
+is not consistent with that for full-cube rotations. For example x follows R
+but M follows L.
+</p>
+
+<p>
+<strong>Note 2:</strong> Inner-layer moves can always be rewritten as a
+combination of basic moves and full-cube rotations. For example, M'
+is equivalent to x R' L.
+</p>
diff --git a/src/speedcubing/notation/r.png b/src/speedcubing/notation/r.png
new file mode 100644
index 0000000..ebeda49
--- /dev/null
+++ b/src/speedcubing/notation/r.png
diff --git a/src/speedcubing/notation/r2.png b/src/speedcubing/notation/r2.png
new file mode 100644
index 0000000..177c54c
--- /dev/null
+++ b/src/speedcubing/notation/r2.png
diff --git a/src/speedcubing/notation/r3.png b/src/speedcubing/notation/r3.png
new file mode 100644
index 0000000..8f27ed4
--- /dev/null
+++ b/src/speedcubing/notation/r3.png
diff --git a/src/speedcubing/notation/rw.png b/src/speedcubing/notation/rw.png
new file mode 100644
index 0000000..6963b5f
--- /dev/null
+++ b/src/speedcubing/notation/rw.png
diff --git a/src/speedcubing/notation/s.png b/src/speedcubing/notation/s.png
new file mode 100644
index 0000000..6853508
--- /dev/null
+++ b/src/speedcubing/notation/s.png
diff --git a/src/speedcubing/notation/u.png b/src/speedcubing/notation/u.png
new file mode 100644
index 0000000..d980672
--- /dev/null
+++ b/src/speedcubing/notation/u.png
diff --git a/src/speedcubing/notation/u2.png b/src/speedcubing/notation/u2.png
new file mode 100644
index 0000000..a25c2bb
--- /dev/null
+++ b/src/speedcubing/notation/u2.png
diff --git a/src/speedcubing/notation/u3.png b/src/speedcubing/notation/u3.png
new file mode 100644
index 0000000..5e32692
--- /dev/null
+++ b/src/speedcubing/notation/u3.png
diff --git a/src/speedcubing/speedcubing.md b/src/speedcubing/speedcubing.md
index 2e60f85..ee2fe4b 100644
--- a/src/speedcubing/speedcubing.md
+++ b/src/speedcubing/speedcubing.md
@@ -4,16 +4,16 @@
 
 I have been practicing
 [speedcubing](https://en.wikipedia.org/wiki/Speedcubing) since 2008,
-and since 2011 I have competed in more than 60 officially recognized
+and since 2011 I have competed in more than 70 officially recognized
 [WCA](https://www.worldcubeassociation.org) competitions.
-I am currently the leader of the WCA Disciplinary Committee and
+I am currently a senior member of the WCA Disciplinary Committee and
 a WCA Junior Delegate.
 
 I use the Roux method to solve the Rubik's cube in about 8 seconds
 on average.  I currently hold the world record for the single best
 result in the *3x3x3 Fewest Moves* event (16 moves), and some national
 records in blindfolded events.  You can see all my official results
-[here](https://www.worldcubeassociation.org/persons/2011TRON02).
+[on my WCA profile](https://www.worldcubeassociation.org/persons/2011TRON02).
 
 If you are interested in Fewest Moves solving, check out my [FMC
 Tutorial](https://fmcsolves.cubing.net/). I also upload irregularly on
@@ -21,11 +21,37 @@ Tutorial](https://fmcsolves.cubing.net/). I also upload irregularly on
 most videos consist just of me solving the cube without any comment
 or explanation.
 
-## Links
+Below you can find some links
+
+## Beginner's stuff
+
+* [Rubik's cube notation](notation), good to know before reading any
+text-based tutorial.
+
+## Software
+
+* [Computer Puzzling](https://www.jaapsch.net/puzzles/compcube.htm) by
+Jaap Scherphuis. If you are interested in implementing a puzzle solver,
+do check out this page.
+* [Nissy](https://nissy.tronto.net), a Rubik's cube solver and FMC assistant.
+
+## Fewest moves
+
+* [My FMC Tutorial](https://fmcsolves.cubing.net) - "old style" techniques,
+no Domino Reduction.
+* [Slice theory](slice-theory): optimizing DR solutions by inserting multiple
+"slice" moves.
+* [DR triggers](triggers): with pictures (work in progress / forever draft).
+* [Reconstruction of my 22.00 former WR average](https://www.youtube.com/watch?v=I0yjjwxonEE),
+including my 16 moves single (YouTube video).
+
+## Blindfolded
+
+* [My 3BLD algs for UBL/UR](https://docs.google.com/spreadsheets/d/17sL1RuiYijTMiQkBn_d5xthdgAoxGE8oaH-Po-PZ58s/edit?usp=sharing).
+They are outdated and not very good, I may upload a better version at some point.
+
+## Other links
 
 * [My WCA profile](https://www.worldcubeassociation.org/persons/2011TRON02)
 * [My YouTube channel](https://www.youtube.com/c/SebastianoTronto)
-* [My FMC Tutorial](https://fmcsolves.cubing.net/)
-* [My 3BLD algs for UBL/UR](https://docs.google.com/spreadsheets/d/17sL1RuiYijTMiQkBn_d5xthdgAoxGE8oaH-Po-PZ58s/edit?usp=sharing) (outdated, not very good)
 * [Solving a cube... without a cube](https://www.speedsolving.com/forum/threads/the-3x3x3-example-solve-thread.14345/page-273#post-1173067)
-* [Nissy, a Rubik's cube solver and FMC assistant](https://nissy.tronto.net)