Add test

zestedesavoir · Jun 19, 2017 · 33b51e3 · 33b51e3
1 parent 64fea94
commit 33b51e3
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/rebber/__tests__/fixtures/mix-2.expected.tex b/packages/rebber/__tests__/fixtures/mix-2.expected.tex
@@ -1,9 +1,7 @@
 (for convenience,   are replaced with simple single spaces in the tests)
 
 \chapter{first 1}
-
 \begin{Quotation}{Quotation Source}
-
 Code inside quote
 
 \begin{codeBlock}[code source]{python}

diff --git a/packages/remark-captions/__tests__/fixtures/code.expected.html b/packages/remark-captions/__tests__/fixtures/code.expected.html
@@ -5,3 +5,6 @@ <h2>Code</h2>
 <p>With Legend</p>
 <figure><pre><code class="language-python">print('bla')
 </code></pre><figcaption>figcapt1</figcaption></figure>
+<figure><pre><code class="language-python">print('bla2')
+</code></pre><figcaption>figcapt1</figcaption></figure>
+<p>Code: bis</p>
diff --git a/packages/remark-captions/__tests__/fixtures/code.fixture.md b/packages/remark-captions/__tests__/fixtures/code.fixture.md
@@ -12,3 +12,10 @@ With Legend
 print('bla')
 ```
 Code: figcapt1
+
+
+```python
+print('bla2')
+```
+Code: figcapt1
+Code: bis
diff --git a/packages/remark-captions/dist/index.js b/packages/remark-captions/dist/index.js
@@ -64,11 +64,14 @@ function externLegendVisitor(node, index, parent) {
     var legendNode = parent.children[index + 1];
 
     if (legendNode.children[0].value.startsWith(legendBlock[node.type])) {
+      var legendText = legendNode.children[0].value.split('\n')[0].replace(legendBlock[node.type], '').trim();
+      var fullLegendLine = legendBlock[node.type] + ' ' + legendText;
+      legendNode.children[0].value = legendNode.children[0].value.replace(fullLegendLine, '').trim();
       var figcaption = {
         type: 'figcaption',
         children: [{
           type: 'text',
-          value: legendNode.children[0].value.replace(legendBlock[node.type], '').trim()
+          value: legendText
         }],
         data: {
           hName: 'figcaption'
@@ -84,7 +87,9 @@ function externLegendVisitor(node, index, parent) {
       node.type = figure.type;
       node.children = figure.children;
       node.data = figure.data;
-      parent.children.splice(index + 1, 1);
+      if (!legendNode.children[0].value) {
+        parent.children.splice(index + 1, 1);
+      }
     }
   }
 }

diff --git a/packages/remark-captions/src/index.js b/packages/remark-captions/src/index.js
@@ -63,11 +63,15 @@ function externLegendVisitor (node, index, parent) {
     const legendNode = parent.children[index + 1]
 
     if (legendNode.children[0].value.startsWith(legendBlock[node.type])) {
+      const legendText = legendNode.children[0].value
+        .split('\n')[0].replace(legendBlock[node.type], '').trim()
+      const fullLegendLine = `${legendBlock[node.type]} ${legendText}`
+      legendNode.children[0].value = legendNode.children[0].value.replace(fullLegendLine, '').trim()
       const figcaption = {
         type: 'figcaption',
         children: [{
           type: 'text',
-          value: legendNode.children[0].value.replace(legendBlock[node.type], '').trim()
+          value: legendText
         }],
         data: {
           hName: 'figcaption',
@@ -86,7 +90,9 @@ function externLegendVisitor (node, index, parent) {
       node.type = figure.type
       node.children = figure.children
       node.data = figure.data
-      parent.children.splice(index + 1, 1)
+      if (!legendNode.children[0].value) {
+        parent.children.splice(index + 1, 1)
+      }
     }
   }
 }