From 64580a209ddc566a5469581e3cd8a02a90b54678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=A0orn?= <sornjure@gmail.com>
Date: Wed, 4 Dec 2024 22:08:08 +0100
Subject: [PATCH] Pandas

---
 README.md  | 2 +-
 index.html | 2 +-
 parse.js   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index de71168..a929233 100644
--- a/README.md
+++ b/README.md
@@ -3291,7 +3291,7 @@ c  6  7
 |                       |    'outer'    |   'inner'  |   'left'   |       Description         |
 +-----------------------+---------------+------------+------------+---------------------------+
 | df.merge(df_2,        |    x   y   z  | x   y   z  | x   y   z  | Merges on column if 'on'  |
-|          on='y',      | 0  1   2   .  | 3   4   5  | 1   2   .  | or 'left/right_on' are    |
+|          on='y',      | 0  1   2   .  | 3   4   5  | 1   2   .  | or 'left_on/right_on' are |
 |          how=…)       | 1  3   4   5  |            | 3   4   5  | set, else on shared cols. |
 |                       | 2  .   6   7  |            |            | Uses 'inner' by default.  |
 +-----------------------+---------------+------------+------------+---------------------------+
diff --git a/index.html b/index.html
index 316f809..8e80627 100644
--- a/index.html
+++ b/index.html
@@ -2675,7 +2675,7 @@ c  <span class="hljs-number">6</span>  <span class="hljs-number">7</span>
 ┃                       │    <span class="hljs-string">'outer'</span>    │   <span class="hljs-string">'inner'</span>  │   <span class="hljs-string">'left'</span>   │       Description         ┃
 ┠───────────────────────┼───────────────┼────────────┼────────────┼───────────────────────────┨
 ┃ df.merge(df_2,        │    x   y   z  │ x   y   z  │ x   y   z  │ Merges on column if 'on'  ┃
-┃          on=<span class="hljs-string">'y'</span>,      │ <span class="hljs-number">0</span>  <span class="hljs-number">1</span>   <span class="hljs-number">2</span>   .  │ <span class="hljs-number">3</span>   <span class="hljs-number">4</span>   <span class="hljs-number">5</span>  │ <span class="hljs-number">1</span>   <span class="hljs-number">2</span>   .  │ or 'left/right_on' are    ┃
+┃          on=<span class="hljs-string">'y'</span>,      │ <span class="hljs-number">0</span>  <span class="hljs-number">1</span>   <span class="hljs-number">2</span>   .  │ <span class="hljs-number">3</span>   <span class="hljs-number">4</span>   <span class="hljs-number">5</span>  │ <span class="hljs-number">1</span>   <span class="hljs-number">2</span>   .  │ or 'left_on/right_on' are ┃
 ┃          how=…)       │ <span class="hljs-number">1</span>  <span class="hljs-number">3</span>   <span class="hljs-number">4</span>   <span class="hljs-number">5</span>  │            │ <span class="hljs-number">3</span>   <span class="hljs-number">4</span>   <span class="hljs-number">5</span>  │ set, else on shared cols. ┃
 ┃                       │ <span class="hljs-number">2</span>  .   <span class="hljs-number">6</span>   <span class="hljs-number">7</span>  │            │            │ Uses <span class="hljs-string">'inner'</span> by default.  ┃
 ┠───────────────────────┼───────────────┼────────────┼────────────┼───────────────────────────┨
diff --git a/parse.js b/parse.js
index 2325857..0107a32 100755
--- a/parse.js
+++ b/parse.js
@@ -606,7 +606,7 @@ const DIAGRAM_15_B =
   "┃                       │    'outer'    │   'inner'  │   'left'   │       Description         ┃\n" +
   "┠───────────────────────┼───────────────┼────────────┼────────────┼───────────────────────────┨\n" +
   "┃ df.merge(df_2,        │    x   y   z  │ x   y   z  │ x   y   z  │ Merges on column if 'on'  ┃\n" +
-  "┃          on='y',      │ 0  1   2   .  │ 3   4   5  │ 1   2   .  │ or 'left/right_on' are    ┃\n" +
+  "┃          on='y',      │ 0  1   2   .  │ 3   4   5  │ 1   2   .  │ or 'left_on/right_on' are ┃\n" +
   "┃          how=…)       │ 1  3   4   5  │            │ 3   4   5  │ set, else on shared cols. ┃\n" +
   "┃                       │ 2  .   6   7  │            │            │ Uses 'inner' by default.  ┃\n" +
   "┠───────────────────────┼───────────────┼────────────┼────────────┼───────────────────────────┨\n" +
@@ -906,8 +906,8 @@ function fixPandasDiagram() {
   $(`code:contains(${diagram_15})`).find(".hljs-keyword:contains(or)").after("or");
   $(`code:contains(${diagram_15})`).find(".hljs-keyword:contains(else)").after("else");
   $(`code:contains(${diagram_15})`).find(".hljs-keyword").remove();
-  $(`code:contains(${diagram_15})`).find(".hljs-string:contains(\'left/right_on\')").after("\'left/right_on\'");
-  $(`code:contains(${diagram_15})`).find(".hljs-string:contains(\'left/right_on\')").remove();
+  $(`code:contains(${diagram_15})`).find(".hljs-string:contains(\'left_on/right_on\')").after("\'left_on/right_on\'");
+  $(`code:contains(${diagram_15})`).find(".hljs-string:contains(\'left_on/right_on\')").remove();
   $(`code:contains(${diagram_15})`).find(".hljs-string:contains('on')").after("'on'");
   $(`code:contains(${diagram_15})`).find(".hljs-string:contains('on')").remove();
 }