From dccd489fccbc9c12f0a651ffae13994e4906c0d0 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sat, 11 May 2019 09:23:31 +0100
Subject: [PATCH] Clipper: Fix: Fix handling of tables with empty headers

---
 CliClient/package-lock.json                   | 10 ++---
 CliClient/package.json                        |  2 +-
 .../html_to_md/table_with_empty_header.html   | 42 +++++++++++++++++++
 .../html_to_md/table_with_empty_header.md     |  9 ++++
 ElectronClient/app/package-lock.json          |  6 +--
 ElectronClient/app/package.json               |  2 +-
 6 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 CliClient/tests/html_to_md/table_with_empty_header.html
 create mode 100644 CliClient/tests/html_to_md/table_with_empty_header.md

diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json
index b023d944c6..856340d47f 100644
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -1440,9 +1440,9 @@
       }
     },
     "joplin-turndown-plugin-gfm": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.7.tgz",
-      "integrity": "sha512-z0SveNcchtWwglkO7SgvDzPnVHYk1WumD0QRcWvUchIihqXwDVlve3G8AHkIhM69LY1YdC0HCZJlSMp2spBe/g=="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
+      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
     },
     "jpeg-js": {
       "version": "0.1.2",
@@ -2221,7 +2221,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         },
         "simple-get": {
@@ -2838,7 +2838,7 @@
       "requires": {
         "chalk": "^2.1.0",
         "emphasize": "^1.5.0",
-        "node-emoji": "git+https://github.com/laurent22/node-emoji.git",
+        "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
         "slice-ansi": "^1.0.0",
         "string-width": "^2.1.1",
         "terminal-kit": "^1.13.11",
diff --git a/CliClient/package.json b/CliClient/package.json
index 209642bf1e..25105af4c8 100644
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -43,7 +43,7 @@
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.11",
-    "joplin-turndown-plugin-gfm": "^1.0.7",
+    "joplin-turndown-plugin-gfm": "^1.0.8",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
diff --git a/CliClient/tests/html_to_md/table_with_empty_header.html b/CliClient/tests/html_to_md/table_with_empty_header.html
new file mode 100644
index 0000000000..a98dcd3dbb
--- /dev/null
+++ b/CliClient/tests/html_to_md/table_with_empty_header.html
@@ -0,0 +1,42 @@
+<table>
+	<thead>
+		<tr>
+			<th></th>
+			<th></th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td><strong>Official Things</strong></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td><a href="https://nim-lang.org">Web Site</a></td>
+			<td>The project’s entry point</td>
+		</tr>
+		<tr>
+			<td><a href="https://github.com/nim-lang/nim">Source</a></td>
+			<td>The github project</td>
+		</tr>
+		<tr>
+			<td><a href="https://github.com/nim-lang/nimble">nimble</a></td>
+			<td>The nim package manager</td>
+		</tr>
+		<tr>
+			<td><a href="https://github.com/dom96/choosenim">choosenim</a></td>
+			<td>Toolchain installer</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td></td>
+		</tr>
+		<tr>
+			<td><strong>Community</strong></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td><a href="https://forum.nim-lang.org">Forums</a></td>
+			<td>An async discussion board</td>
+		</tr>
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/CliClient/tests/html_to_md/table_with_empty_header.md b/CliClient/tests/html_to_md/table_with_empty_header.md
new file mode 100644
index 0000000000..8fc8ea693f
--- /dev/null
+++ b/CliClient/tests/html_to_md/table_with_empty_header.md
@@ -0,0 +1,9 @@
+|     |     |
+| --- | --- |
+| **Official Things** |     |
+| [Web Site](https://nim-lang.org) | The project’s entry point |
+| [Source](https://github.com/nim-lang/nim) | The github project |
+| [nimble](https://github.com/nim-lang/nimble) | The nim package manager |
+| [choosenim](https://github.com/dom96/choosenim) | Toolchain installer |
+| **Community** |     |
+| [Forums](https://forum.nim-lang.org) | An async discussion board |
\ No newline at end of file
diff --git a/ElectronClient/app/package-lock.json b/ElectronClient/app/package-lock.json
index 146751f742..ea946abf75 100644
--- a/ElectronClient/app/package-lock.json
+++ b/ElectronClient/app/package-lock.json
@@ -3520,9 +3520,9 @@
       }
     },
     "joplin-turndown-plugin-gfm": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.7.tgz",
-      "integrity": "sha512-z0SveNcchtWwglkO7SgvDzPnVHYk1WumD0QRcWvUchIihqXwDVlve3G8AHkIhM69LY1YdC0HCZJlSMp2spBe/g=="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
+      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
     },
     "js-tokens": {
       "version": "3.0.2",
diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json
index ad1e76ac1d..78f65e77f0 100644
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@@ -102,7 +102,7 @@
     "html-entities": "^1.2.1",
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.11",
-    "joplin-turndown-plugin-gfm": "^1.0.7",
+    "joplin-turndown-plugin-gfm": "^1.0.8",
     "jssha": "^2.3.1",
     "katex": "^0.10.0",
     "levenshtein": "^1.0.5",