From 1243d017f314c29237adc94fe6277c0090e50362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20=C5=A0orn?= Date: Sat, 6 Jul 2019 12:59:11 +0200 Subject: [PATCH] New table --- README.md | 38 ++++++++++++++------- index.html | 37 +++++++++++++------- parse.js | 91 ++++++++++++++++++++++++++++++++----------------- web/script_2.js | 81 +++++++++++++++++++++++++++++-------------- 4 files changed, 166 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 74a3092..aebb88a 100644 --- a/README.md +++ b/README.md @@ -435,18 +435,32 @@ Format #### Comparison of float presentation types: ```text -+----------------+--------------+---------------+---------------+---------------+ -| | {:.2} | {:.2f} | {:.2e} | {:.2%} | -+----------------+--------------+---------------+---------------+---------------+ -| 0.000056789 | '5.7e-05' | '0.00' | '5.68e-05' | '0.01%' | -| 0.00056789 | '0.00057' | '0.00' | '5.68e-04' | '0.06%' | -| 0.0056789 | '0.0057' | '0.01' | '5.68e-03' | '0.57%' | -| 0.056789 | '0.057' | '0.06' | '5.68e-02' | '5.68%' | -| 0.56789 | '0.57' | '0.57' | '5.68e-01' | '56.79%' | -| 5.6789 | '5.7' | '5.68' | '5.68e+00' | '567.89%' | -| 56.789 | '5.7e+01' | '56.79' | '5.68e+01' | '5678.90%' | -| 567.89 | '5.7e+02' | '567.89' | '5.68e+02' | '56789.00%' | -+----------------+--------------+---------------+---------------+---------------+ ++----------------+----------------+---------------+----------------+-----------------+ +| | {} | {:f} | {:e} | {:%} | ++----------------+----------------+---------------+----------------+-----------------+ +| 0.000056789 | '5.6789e-05' | '0.000057' | '5.678900e-05' | '0.005679%' | +| 0.00056789 | '0.00056789' | '0.000568' | '5.678900e-04' | '0.056789%' | +| 0.0056789 | '0.0056789' | '0.005679' | '5.678900e-03' | '0.567890%' | +| 0.056789 | '0.056789' | '0.056789' | '5.678900e-02' | '5.678900%' | +| 0.56789 | '0.56789' | '0.567890' | '5.678900e-01' | '56.789000%' | +| 5.6789 | '5.6789' | '5.678900' | '5.678900e+00' | '567.890000%' | +| 56.789 | '56.789' | '56.789000' | '5.678900e+01' | '5678.900000%' | +| 567.89 | '567.89' | '567.890000' | '5.678900e+02' | '56789.000000%' | ++----------------+----------------+---------------+----------------+-----------------+ +``` +```text ++----------------+----------------+---------------+----------------+-----------------+ +| | {:.2} | {:.2f} | {:.2e} | {:.2%} | ++----------------+----------------+---------------+----------------+-----------------+ +| 0.000056789 | '5.7e-05' | '0.00' | '5.68e-05' | '0.01%' | +| 0.00056789 | '0.00057' | '0.00' | '5.68e-04' | '0.06%' | +| 0.0056789 | '0.0057' | '0.01' | '5.68e-03' | '0.57%' | +| 0.056789 | '0.057' | '0.06' | '5.68e-02' | '5.68%' | +| 0.56789 | '0.57' | '0.57' | '5.68e-01' | '56.79%' | +| 5.6789 | '5.7' | '5.68' | '5.68e+00' | '567.89%' | +| 56.789 | '5.7e+01' | '56.79' | '5.68e+01' | '5678.90%' | +| 567.89 | '5.7e+02' | '567.89' | '5.68e+02' | '56789.00%' | ++----------------+----------------+---------------+----------------+-----------------+ ``` ### Ints diff --git a/index.html b/index.html index 0932106..6a66047 100644 --- a/index.html +++ b/index.html @@ -509,18 +509,31 @@ to_exclusive = <range>.stop {1.23456:10.3%} # ' 123.456%'

Comparison of float presentation types:

-
┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┓
-┃                │ {<float>:.2} │ {<float>:.2f} │ {<float>:.2e} │ {<float>:.2%} ┃
-┠────────────────┼──────────────┼───────────────┼───────────────┼───────────────┨
-┃    0.000056789 │  '5.7e-05'   │      '0.00'   │   '5.68e-05'  │      '0.01%'  ┃
-┃    0.00056789  │  '0.00057'   │      '0.00'   │   '5.68e-04'  │      '0.06%'  ┃
-┃    0.0056789   │  '0.0057'    │      '0.01'   │   '5.68e-03'  │      '0.57%'  ┃
-┃    0.056789    │  '0.057'     │      '0.06'   │   '5.68e-02'  │      '5.68%'  ┃
-┃    0.56789     │  '0.57'      │      '0.57'   │   '5.68e-01'  │     '56.79%'  ┃
-┃    5.6789      │  '5.7'       │      '5.68'   │   '5.68e+00'  │    '567.89%'  ┃
-┃   56.789       │  '5.7e+01'   │     '56.79'   │   '5.68e+01'  │   '5678.90%'  ┃
-┃  567.89        │  '5.7e+02'   │    '567.89'   │   '5.68e+02'  │  '56789.00%'  ┃
-┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┛
+
┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓
+┃                │    {<float>}   │  {<float>:f}  │   {<float>:e}  │   {<float>:%}   ┃
+┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨
+┃    0.000056789 │   '5.6789e-05' │    '0.000057' │ '5.678900e-05' │     '0.005679%' ┃
+┃    0.00056789  │   '0.00056789' │    '0.000568' │ '5.678900e-04' │     '0.056789%' ┃
+┃    0.0056789   │   '0.0056789'  │    '0.005679' │ '5.678900e-03' │     '0.567890%' ┃
+┃    0.056789    │   '0.056789'   │    '0.056789' │ '5.678900e-02' │     '5.678900%' ┃
+┃    0.56789     │   '0.56789'    │    '0.567890' │ '5.678900e-01' │    '56.789000%' ┃
+┃    5.6789      │   '5.6789'     │    '5.678900' │ '5.678900e+00' │   '567.890000%' ┃
+┃   56.789       │  '56.789'      │   '56.789000' │ '5.678900e+01' │  '5678.900000%' ┃
+┃  567.89        │ '567.89'       │  '567.890000' │ '5.678900e+02' │ '56789.000000%' ┃
+┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛
+
+
┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓
+┃                │  {<float>:.2}  │ {<float>:.2f} │  {<float>:.2e} │  {<float>:.2%}  ┃
+┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨
+┃    0.000056789 │   '5.7e-05'    │      '0.00'   │   '5.68e-05'   │       '0.01%'   ┃
+┃    0.00056789  │   '0.00057'    │      '0.00'   │   '5.68e-04'   │       '0.06%'   ┃
+┃    0.0056789   │   '0.0057'     │      '0.01'   │   '5.68e-03'   │       '0.57%'   ┃
+┃    0.056789    │   '0.057'      │      '0.06'   │   '5.68e-02'   │       '5.68%'   ┃
+┃    0.56789     │   '0.57'       │      '0.57'   │   '5.68e-01'   │      '56.79%'   ┃
+┃    5.6789      │   '5.7'        │      '5.68'   │   '5.68e+00'   │     '567.89%'   ┃
+┃   56.789       │   '5.7e+01'    │     '56.79'   │   '5.68e+01'   │    '5678.90%'   ┃
+┃  567.89        │   '5.7e+02'    │    '567.89'   │   '5.68e+02'   │   '56789.00%'   ┃
+┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛
 

Ints

{90:c}           # 'Z'
diff --git a/parse.js b/parse.js
index ffc7cb5..dcba0af 100755
--- a/parse.js
+++ b/parse.js
@@ -113,34 +113,62 @@ const DIAGRAM_4_B =
   '┗━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━┷━━━━━━━━━┷━━━━━━━━┛\n';
 
 const DIAGRAM_5_A =
-  "+----------------+--------------+---------------+---------------+---------------+\n" +
-  "|                | {:.2} | {:.2f} | {:.2e} | {:.2%} |\n" +
-  "+----------------+--------------+---------------+---------------+---------------+\n" +
-  "|    0.000056789 |  '5.7e-05'   |      '0.00'   |   '5.68e-05'  |      '0.01%'  |\n" +
-  "|    0.00056789  |  '0.00057'   |      '0.00'   |   '5.68e-04'  |      '0.06%'  |\n" +
-  "|    0.0056789   |  '0.0057'    |      '0.01'   |   '5.68e-03'  |      '0.57%'  |\n" +
-  "|    0.056789    |  '0.057'     |      '0.06'   |   '5.68e-02'  |      '5.68%'  |\n" +
-  "|    0.56789     |  '0.57'      |      '0.57'   |   '5.68e-01'  |     '56.79%'  |\n" +
-  "|    5.6789      |  '5.7'       |      '5.68'   |   '5.68e+00'  |    '567.89%'  |\n" +
-  "|   56.789       |  '5.7e+01'   |     '56.79'   |   '5.68e+01'  |   '5678.90%'  |\n" +
-  "|  567.89        |  '5.7e+02'   |    '567.89'   |   '5.68e+02'  |  '56789.00%'  |\n" +
-  "+----------------+--------------+---------------+---------------+---------------+\n";
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|                |    {}   |  {:f}  |   {:e}  |   {:%}   |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|    0.000056789 |   '5.6789e-05' |    '0.000057' | '5.678900e-05' |     '0.005679%' |\n" +
+  "|    0.00056789  |   '0.00056789' |    '0.000568' | '5.678900e-04' |     '0.056789%' |\n" +
+  "|    0.0056789   |   '0.0056789'  |    '0.005679' | '5.678900e-03' |     '0.567890%' |\n" +
+  "|    0.056789    |   '0.056789'   |    '0.056789' | '5.678900e-02' |     '5.678900%' |\n" +
+  "|    0.56789     |   '0.56789'    |    '0.567890' | '5.678900e-01' |    '56.789000%' |\n" +
+  "|    5.6789      |   '5.6789'     |    '5.678900' | '5.678900e+00' |   '567.890000%' |\n" +
+  "|   56.789       |  '56.789'      |   '56.789000' | '5.678900e+01' |  '5678.900000%' |\n" +
+  "|  567.89        | '567.89'       |  '567.890000' | '5.678900e+02' | '56789.000000%' |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n";
 
 const DIAGRAM_5_B =
-  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┓\n" +
-  "┃                │ {:.2} │ {:.2f} │ {:.2e} │ {:.2%} ┃\n" +
-  "┠────────────────┼──────────────┼───────────────┼───────────────┼───────────────┨\n" +
-  "┃    0.000056789 │  '5.7e-05'   │      '0.00'   │   '5.68e-05'  │      '0.01%'  ┃\n" +
-  "┃    0.00056789  │  '0.00057'   │      '0.00'   │   '5.68e-04'  │      '0.06%'  ┃\n" +
-  "┃    0.0056789   │  '0.0057'    │      '0.01'   │   '5.68e-03'  │      '0.57%'  ┃\n" +
-  "┃    0.056789    │  '0.057'     │      '0.06'   │   '5.68e-02'  │      '5.68%'  ┃\n" +
-  "┃    0.56789     │  '0.57'      │      '0.57'   │   '5.68e-01'  │     '56.79%'  ┃\n" +
-  "┃    5.6789      │  '5.7'       │      '5.68'   │   '5.68e+00'  │    '567.89%'  ┃\n" +
-  "┃   56.789       │  '5.7e+01'   │     '56.79'   │   '5.68e+01'  │   '5678.90%'  ┃\n" +
-  "┃  567.89        │  '5.7e+02'   │    '567.89'   │   '5.68e+02'  │  '56789.00%'  ┃\n" +
-  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┛\n";
+  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓\n" +
+  "┃                │    {}   │  {:f}  │   {:e}  │   {:%}   ┃\n" +
+  "┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨\n" +
+  "┃    0.000056789 │   '5.6789e-05' │    '0.000057' │ '5.678900e-05' │     '0.005679%' ┃\n" +
+  "┃    0.00056789  │   '0.00056789' │    '0.000568' │ '5.678900e-04' │     '0.056789%' ┃\n" +
+  "┃    0.0056789   │   '0.0056789'  │    '0.005679' │ '5.678900e-03' │     '0.567890%' ┃\n" +
+  "┃    0.056789    │   '0.056789'   │    '0.056789' │ '5.678900e-02' │     '5.678900%' ┃\n" +
+  "┃    0.56789     │   '0.56789'    │    '0.567890' │ '5.678900e-01' │    '56.789000%' ┃\n" +
+  "┃    5.6789      │   '5.6789'     │    '5.678900' │ '5.678900e+00' │   '567.890000%' ┃\n" +
+  "┃   56.789       │  '56.789'      │   '56.789000' │ '5.678900e+01' │  '5678.900000%' ┃\n" +
+  "┃  567.89        │ '567.89'       │  '567.890000' │ '5.678900e+02' │ '56789.000000%' ┃\n" +
+  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛\n";
 
 const DIAGRAM_6_A =
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|                |  {:.2}  | {:.2f} |  {:.2e} |  {:.2%}  |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|    0.000056789 |   '5.7e-05'    |      '0.00'   |   '5.68e-05'   |       '0.01%'   |\n" +
+  "|    0.00056789  |   '0.00057'    |      '0.00'   |   '5.68e-04'   |       '0.06%'   |\n" +
+  "|    0.0056789   |   '0.0057'     |      '0.01'   |   '5.68e-03'   |       '0.57%'   |\n" +
+  "|    0.056789    |   '0.057'      |      '0.06'   |   '5.68e-02'   |       '5.68%'   |\n" +
+  "|    0.56789     |   '0.57'       |      '0.57'   |   '5.68e-01'   |      '56.79%'   |\n" +
+  "|    5.6789      |   '5.7'        |      '5.68'   |   '5.68e+00'   |     '567.89%'   |\n" +
+  "|   56.789       |   '5.7e+01'    |     '56.79'   |   '5.68e+01'   |    '5678.90%'   |\n" +
+  "|  567.89        |   '5.7e+02'    |    '567.89'   |   '5.68e+02'   |   '56789.00%'   |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n";
+
+const DIAGRAM_6_B =
+  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓\n" +
+  "┃                │  {:.2}  │ {:.2f} │  {:.2e} │  {:.2%}  ┃\n" +
+  "┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨\n" +
+  "┃    0.000056789 │   '5.7e-05'    │      '0.00'   │   '5.68e-05'   │       '0.01%'   ┃\n" +
+  "┃    0.00056789  │   '0.00057'    │      '0.00'   │   '5.68e-04'   │       '0.06%'   ┃\n" +
+  "┃    0.0056789   │   '0.0057'     │      '0.01'   │   '5.68e-03'   │       '0.57%'   ┃\n" +
+  "┃    0.056789    │   '0.057'      │      '0.06'   │   '5.68e-02'   │       '5.68%'   ┃\n" +
+  "┃    0.56789     │   '0.57'       │      '0.57'   │   '5.68e-01'   │      '56.79%'   ┃\n" +
+  "┃    5.6789      │   '5.7'        │      '5.68'   │   '5.68e+00'   │     '567.89%'   ┃\n" +
+  "┃   56.789       │   '5.7e+01'    │     '56.79'   │   '5.68e+01'   │    '5678.90%'   ┃\n" +
+  "┃  567.89        │   '5.7e+02'    │    '567.89'   │   '5.68e+02'   │   '56789.00%'   ┃\n" +
+  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛\n";
+
+const DIAGRAM_7_A =
   '+------------+----------+------------+----------+--------------+\n' +
   '|            | Iterable | Collection | Sequence | abc.Sequence |\n' +
   '+------------+----------+------------+----------+--------------+\n' +
@@ -150,7 +178,7 @@ const DIAGRAM_6_A =
   '| contains() |          |    yes     |          |     yes      |\n' +
   '+------------+----------+------------+----------+--------------+\n';
 
-const DIAGRAM_6_B =
+const DIAGRAM_7_B =
   '┏━━━━━━━━━━━━┯━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━┯━━━━━━━━━━━━━━┓\n' +
   '┃            │ Iterable │ Collection │ Sequence │ abc.Sequence ┃\n' +
   '┠────────────┼──────────┼────────────┼──────────┼──────────────┨\n' +
@@ -187,12 +215,13 @@ function getMd() {
 }
 
 function switchClassDiagrams(readme) {
-  readme = readme.replace(DIAGRAM_1_A, DIAGRAM_1_B)
-  readme = readme.replace(DIAGRAM_2_A, DIAGRAM_2_B)
-  readme = readme.replace(DIAGRAM_3_A, DIAGRAM_3_B)
-  readme = readme.replace(DIAGRAM_4_A, DIAGRAM_4_B)
-  readme = readme.replace(DIAGRAM_5_A, DIAGRAM_5_B)
-  readme = readme.replace(DIAGRAM_6_A, DIAGRAM_6_B)
+  readme = readme.replace(DIAGRAM_1_A, DIAGRAM_1_B);
+  readme = readme.replace(DIAGRAM_2_A, DIAGRAM_2_B);
+  readme = readme.replace(DIAGRAM_3_A, DIAGRAM_3_B);
+  readme = readme.replace(DIAGRAM_4_A, DIAGRAM_4_B);
+  readme = readme.replace(DIAGRAM_5_A, DIAGRAM_5_B);
+  readme = readme.replace(DIAGRAM_6_A, DIAGRAM_6_B);
+  readme = readme.replace(DIAGRAM_7_A, DIAGRAM_7_B);
   return readme
 }
 
diff --git a/web/script_2.js b/web/script_2.js
index 7a8807d..9422d70 100644
--- a/web/script_2.js
+++ b/web/script_2.js
@@ -81,34 +81,62 @@ const DIAGRAM_4_B =
   '┗━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━┷━━━━━━━━━┷━━━━━━━━┛\n';
 
 const DIAGRAM_5_A =
-  "+----------------+--------------+---------------+---------------+---------------+\n" +
-  "|                | {<float>:.2} | {<float>:.2f} | {<float>:.2e} | {<float>:.2%} |\n" +
-  "+----------------+--------------+---------------+---------------+---------------+\n" +
-  "|    0.000056789 |  '5.7e-05'   |      '0.00'   |   '5.68e-05'  |      '0.01%'  |\n" +
-  "|    0.00056789  |  '0.00057'   |      '0.00'   |   '5.68e-04'  |      '0.06%'  |\n" +
-  "|    0.0056789   |  '0.0057'    |      '0.01'   |   '5.68e-03'  |      '0.57%'  |\n" +
-  "|    0.056789    |  '0.057'     |      '0.06'   |   '5.68e-02'  |      '5.68%'  |\n" +
-  "|    0.56789     |  '0.57'      |      '0.57'   |   '5.68e-01'  |     '56.79%'  |\n" +
-  "|    5.6789      |  '5.7'       |      '5.68'   |   '5.68e+00'  |    '567.89%'  |\n" +
-  "|   56.789       |  '5.7e+01'   |     '56.79'   |   '5.68e+01'  |   '5678.90%'  |\n" +
-  "|  567.89        |  '5.7e+02'   |    '567.89'   |   '5.68e+02'  |  '56789.00%'  |\n" +
-  "+----------------+--------------+---------------+---------------+---------------+\n";
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|                |    {<float>}   |  {<float>:f}  |   {<float>:e}  |   {<float>:%}   |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|    0.000056789 |   '5.6789e-05' |    '0.000057' | '5.678900e-05' |     '0.005679%' |\n" +
+  "|    0.00056789  |   '0.00056789' |    '0.000568' | '5.678900e-04' |     '0.056789%' |\n" +
+  "|    0.0056789   |   '0.0056789'  |    '0.005679' | '5.678900e-03' |     '0.567890%' |\n" +
+  "|    0.056789    |   '0.056789'   |    '0.056789' | '5.678900e-02' |     '5.678900%' |\n" +
+  "|    0.56789     |   '0.56789'    |    '0.567890' | '5.678900e-01' |    '56.789000%' |\n" +
+  "|    5.6789      |   '5.6789'     |    '5.678900' | '5.678900e+00' |   '567.890000%' |\n" +
+  "|   56.789       |  '56.789'      |   '56.789000' | '5.678900e+01' |  '5678.900000%' |\n" +
+  "|  567.89        | '567.89'       |  '567.890000' | '5.678900e+02' | '56789.000000%' |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n";
 
 const DIAGRAM_5_B =
-  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┓\n" +
-  "┃                │ {:.2} │ {:.2f} │ {:.2e} │ {:.2%} ┃\n" +
-  "┠────────────────┼──────────────┼───────────────┼───────────────┼───────────────┨\n" +
-  "┃    0.000056789 │  '5.7e-05'   │      '0.00'   │   '5.68e-05'  │      '0.01%'  ┃\n" +
-  "┃    0.00056789  │  '0.00057'   │      '0.00'   │   '5.68e-04'  │      '0.06%'  ┃\n" +
-  "┃    0.0056789   │  '0.0057'    │      '0.01'   │   '5.68e-03'  │      '0.57%'  ┃\n" +
-  "┃    0.056789    │  '0.057'     │      '0.06'   │   '5.68e-02'  │      '5.68%'  ┃\n" +
-  "┃    0.56789     │  '0.57'      │      '0.57'   │   '5.68e-01'  │     '56.79%'  ┃\n" +
-  "┃    5.6789      │  '5.7'       │      '5.68'   │   '5.68e+00'  │    '567.89%'  ┃\n" +
-  "┃   56.789       │  '5.7e+01'   │     '56.79'   │   '5.68e+01'  │   '5678.90%'  ┃\n" +
-  "┃  567.89        │  '5.7e+02'   │    '567.89'   │   '5.68e+02'  │  '56789.00%'  ┃\n" +
-  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┛\n";
+  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓\n" +
+  "┃                │    {}   │  {:f}  │   {:e}  │   {:%}   ┃\n" +
+  "┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨\n" +
+  "┃    0.000056789 │   '5.6789e-05' │    '0.000057' │ '5.678900e-05' │     '0.005679%' ┃\n" +
+  "┃    0.00056789  │   '0.00056789' │    '0.000568' │ '5.678900e-04' │     '0.056789%' ┃\n" +
+  "┃    0.0056789   │   '0.0056789'  │    '0.005679' │ '5.678900e-03' │     '0.567890%' ┃\n" +
+  "┃    0.056789    │   '0.056789'   │    '0.056789' │ '5.678900e-02' │     '5.678900%' ┃\n" +
+  "┃    0.56789     │   '0.56789'    │    '0.567890' │ '5.678900e-01' │    '56.789000%' ┃\n" +
+  "┃    5.6789      │   '5.6789'     │    '5.678900' │ '5.678900e+00' │   '567.890000%' ┃\n" +
+  "┃   56.789       │  '56.789'      │   '56.789000' │ '5.678900e+01' │  '5678.900000%' ┃\n" +
+  "┃  567.89        │ '567.89'       │  '567.890000' │ '5.678900e+02' │ '56789.000000%' ┃\n" +
+  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛\n";
 
 const DIAGRAM_6_A =
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|                |  {<float>:.2}  | {<float>:.2f} |  {<float>:.2e} |  {<float>:.2%}  |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n" +
+  "|    0.000056789 |   '5.7e-05'    |      '0.00'   |   '5.68e-05'   |       '0.01%'   |\n" +
+  "|    0.00056789  |   '0.00057'    |      '0.00'   |   '5.68e-04'   |       '0.06%'   |\n" +
+  "|    0.0056789   |   '0.0057'     |      '0.01'   |   '5.68e-03'   |       '0.57%'   |\n" +
+  "|    0.056789    |   '0.057'      |      '0.06'   |   '5.68e-02'   |       '5.68%'   |\n" +
+  "|    0.56789     |   '0.57'       |      '0.57'   |   '5.68e-01'   |      '56.79%'   |\n" +
+  "|    5.6789      |   '5.7'        |      '5.68'   |   '5.68e+00'   |     '567.89%'   |\n" +
+  "|   56.789       |   '5.7e+01'    |     '56.79'   |   '5.68e+01'   |    '5678.90%'   |\n" +
+  "|  567.89        |   '5.7e+02'    |    '567.89'   |   '5.68e+02'   |   '56789.00%'   |\n" +
+  "+----------------+----------------+---------------+----------------+-----------------+\n";
+
+const DIAGRAM_6_B =
+  "┏━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━┓\n" +
+  "┃                │  {:.2}  │ {:.2f} │  {:.2e} │  {:.2%}  ┃\n" +
+  "┠────────────────┼────────────────┼───────────────┼────────────────┼─────────────────┨\n" +
+  "┃    0.000056789 │   '5.7e-05'    │      '0.00'   │   '5.68e-05'   │       '0.01%'   ┃\n" +
+  "┃    0.00056789  │   '0.00057'    │      '0.00'   │   '5.68e-04'   │       '0.06%'   ┃\n" +
+  "┃    0.0056789   │   '0.0057'     │      '0.01'   │   '5.68e-03'   │       '0.57%'   ┃\n" +
+  "┃    0.056789    │   '0.057'      │      '0.06'   │   '5.68e-02'   │       '5.68%'   ┃\n" +
+  "┃    0.56789     │   '0.57'       │      '0.57'   │   '5.68e-01'   │      '56.79%'   ┃\n" +
+  "┃    5.6789      │   '5.7'        │      '5.68'   │   '5.68e+00'   │     '567.89%'   ┃\n" +
+  "┃   56.789       │   '5.7e+01'    │     '56.79'   │   '5.68e+01'   │    '5678.90%'   ┃\n" +
+  "┃  567.89        │   '5.7e+02'    │    '567.89'   │   '5.68e+02'   │   '56789.00%'   ┃\n" +
+  "┗━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━┛\n";
+
+const DIAGRAM_7_A =
   '+------------+----------+------------+----------+--------------+\n' +
   '|            | Iterable | Collection | Sequence | abc.Sequence |\n' +
   '+------------+----------+------------+----------+--------------+\n' +
@@ -118,7 +146,7 @@ const DIAGRAM_6_A =
   '| contains() |          |    yes     |          |     yes      |\n' +
   '+------------+----------+------------+----------+--------------+\n';
 
-const DIAGRAM_6_B =
+const DIAGRAM_7_B =
   '┏━━━━━━━━━━━━┯━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━┯━━━━━━━━━━━━━━┓\n' +
   '┃            │ Iterable │ Collection │ Sequence │ abc.Sequence ┃\n' +
   '┠────────────┼──────────┼────────────┼──────────┼──────────────┨\n' +
@@ -138,7 +166,8 @@ if (!isFontAvailable('Menlo')) {
   $(`code:contains(${DIAGRAM_3_B})`).html(DIAGRAM_3_A);
   $(`code:contains(${DIAGRAM_4_B})`).html(DIAGRAM_4_A);
   $(`code:contains(${DIAGRAM_5_B})`).html(DIAGRAM_5_A);
-  // $(`code:contains(${DIAGRAM_6_B})`).html(DIAGRAM_6_A);
+  $(`code:contains(${DIAGRAM_6_B})`).html(DIAGRAM_6_A);
+  $(`code:contains(${DIAGRAM_7_B})`).html(DIAGRAM_7_A);
   // var htmlString = $('code:contains(ᴺᴱᵂ)').html().replace(/ᴺᴱᵂ/g, '');
   // $('code:contains(ᴺᴱᵂ)').html(htmlString);
 }