#7 Fix minor spacing issues

TritonDataCenter · Mar 6, 2019 · 35377ec · 35377ec
1 parent e363301
commit 35377ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -124,7 +124,7 @@ var semantics = grammar.createSemantics().addOperation('toHTML', {
 
         return ha + sep + hb;
     },
-    blocks: function (blocks, _sp, _nl) {
+    blocks: function (_nl1, blocks, _nl2) {
         return nodesToHTML(blocks, '\n');
     },
     tblock_paragraph: function (a, _nls) {

diff --git a/lib/jira.ohm b/lib/jira.ohm
@@ -14,7 +14,7 @@
 JIRA {
   Document = blocks tblock?
 
-  blocks = (tblock (space* nl)+)*
+  blocks = blankl* (tblock blankl+)*
 
   tblock
    = block<empty>
@@ -107,9 +107,10 @@ JIRA {
   urlend = urlexcl* ~urichar
   urlexcl = "." | ")" | "!" | "," | "'"
 
-  space := " " | "\t"
+  space := " " | "\t" | "\u00a0"
 
   nl (a newline) = "\r\n" | "\n" | "\r"
+  blankl = space* nl
 
   blockStart = "{quote" | "{panel" | "{color" | "{noformat" | "{code"
 

diff --git a/test/basic.test.js b/test/basic.test.js
@@ -81,6 +81,10 @@ test('Single Paragraph', function (t) {
     t.equals(toHTML('hello world,\nand\ngood\nmorning!'),
         '<p>hello world,<br />\nand<br />\ngood<br />\nmorning!</p>');
 
+    // Leading lines at start of document are okay
+    t.equals(toHTML('\nhello world'), '<p>hello world</p>');
+    t.equals(toHTML('\n\n\nhello world'), '<p>hello world</p>');
+
     // Formatting at start of line that could be confused for bullets
     t.equals(toHTML('hello world,\n*and*\n-good morning!-'),
         '<p>hello world,<br />\n' +
@@ -142,6 +146,10 @@ test('Multiple Paragraphs', function (t) {
     // Lines that are nothing but space can separate blocks
     t.equals(toHTML('this is paragraph 1\n    \nthis is paragraph 2'),
         '<p>this is paragraph 1</p>\n<p>this is paragraph 2</p>');
+    t.equals(toHTML('this is paragraph 1\n\t\t\nthis is paragraph 2'),
+        '<p>this is paragraph 1</p>\n<p>this is paragraph 2</p>');
+    t.equals(toHTML('this is paragraph 1\n\u00a0\nthis is paragraph 2'),
+        '<p>this is paragraph 1</p>\n<p>this is paragraph 2</p>');
 
     // Line breaks within a paragraph are preserved
     t.equals(toHTML('this\nis\nparagraph\n1\n\nthis\nis\nparagraph\n2'),