Merge pull request #29 from atlassian/issue-28-spec-updates

Update to CommonMark spec 0.24

Author: robinst

commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java

@@ -157,14 +157,14 @@ public static class Factory extends AbstractBlockParserFactory {
         @Override
         public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
             CharSequence line = state.getLine();
-            CharSequence paragraphStartLine = matchedBlockParser.getParagraphStartLine();
-            if (paragraphStartLine != null && paragraphStartLine.toString().contains("|")) {
+            CharSequence paragraph = matchedBlockParser.getParagraphContent();
+            if (paragraph != null && paragraph.toString().contains("|") && !paragraph.toString().contains("\n")) {
                 CharSequence separatorLine = line.subSequence(state.getIndex(), line.length());
                 if (TABLE_HEADER_SEPARATOR.matcher(separatorLine).matches()) {
-                    List<String> headParts = split(paragraphStartLine);
+                    List<String> headParts = split(paragraph);
                     List<String> separatorParts = split(separatorLine);
                     if (separatorParts.size() >= headParts.size()) {
-                        return BlockStart.of(new TableBlockParser(paragraphStartLine))
+                        return BlockStart.of(new TableBlockParser(paragraph))
                                 .atIndex(state.getIndex())
                                 .replaceActiveBlockParser();
                     }

commonmark-ext-gfm-tables/src/test/java/org/commonmark/ext/gfm/tables/TablesTest.java

@@ -32,6 +32,11 @@ public void separatorCanNotHaveLeadingSpaceThenPipe() {
         assertRendering("Abc|Def\n |---|---", "<p>Abc|Def\n|---|---</p>\n");
     }
 
+    @Test
+    public void headerMustBeOneLine() {
+        assertRendering("No\nAbc|Def\n---|---", "<p>No\nAbc|Def\n---|---</p>\n");
+    }
+
     @Test
     public void oneHeadNoBody() {
         assertRendering("Abc|Def\n---|---", "<table>\n" +

commonmark-test-util/src/main/java/org/commonmark/spec/SpecReader.java

@@ -82,21 +82,20 @@ private List<SpecExample> read() throws IOException {
     }
 
     private void processLine(String line) {
-        boolean dot = line.equals(".");
         switch (state) {
             case BEFORE:
                 Matcher matcher = SECTION_PATTERN.matcher(line);
                 if (matcher.matches()) {
                     section = matcher.group(1);
                     exampleNumber = 0;
                 }
-                if (dot) {
+                if (line.equals("```````````````````````````````` example")) {
                     state = State.SOURCE;
                     exampleNumber++;
                 }
                 break;
             case SOURCE:
-                if (dot) {
+                if (line.equals(".")) {
                     state = State.HTML;
                 } else {
                     // examples use "rightwards arrow" to show tab
@@ -105,7 +104,7 @@ private void processLine(String line) {
                 }
                 break;
             case HTML:
-                if (dot) {
+                if (line.equals("````````````````````````````````")) {
                     state = State.BEFORE;
                     examples.add(new SpecExample(section, exampleNumber,
                             source.toString(), html.toString()));