commonmarker 0.14.0 → 0.14.1

data/ext/commonmarker/cmark/src/blocks.c

@@ -639,7 +639,7 @@ static void S_parser_feed(cmark_parser *parser, const unsigned char *buffer,
           if (buffer == end)
             parser->last_buffer_ended_with_cr = true;
         }
-        if (*buffer == '\n')
+        if (buffer < end && *buffer == '\n')
           buffer++;
       }
     }

data/ext/commonmarker/cmark/src/cmark_extension_api.h

@@ -7,6 +7,7 @@ extern "C" {
 
 #include <cmark.h>
 #include <render.h>
+#include <buffer.h>
 
 /**
  * ## Extension Support
@@ -113,6 +114,7 @@ typedef struct delimiter {
   struct delimiter *previous;
   struct delimiter *next;
   cmark_node *inl_text;
+  bufsize_t length;
   int position;
   unsigned char delim_char;
   int can_open;

data/ext/commonmarker/cmark/src/inlines.c

@@ -150,7 +150,7 @@ static void subject_from_buf(cmark_mem *mem, subject *e, cmark_strbuf *buffer,
   e->refmap = refmap;
   e->last_delim = NULL;
   e->last_bracket = NULL;
-  for (i=0; i <= MAXBACKTICKS; i++) {
+  for (i = 0; i <= MAXBACKTICKS; i++) {
     e->backticks[i] = 0;
   }
   e->scanned_for_backticks = false;
@@ -391,6 +391,7 @@ static void push_delimiter(subject *subj, unsigned char c, bool can_open,
   delim->can_open = can_open;
   delim->can_close = can_close;
   delim->inl_text = inl_text;
+  delim->length = inl_text->as.literal.len;
   delim->previous = subj->last_delim;
   delim->next = NULL;
   if (delim->previous != NULL) {
@@ -500,21 +501,6 @@ static cmark_node *handle_period(subject *subj, bool smart) {
   }
 }
 
-static void add_extensions_openers_bottom(cmark_parser *parser,
-    delimiter **openers_bottom, delimiter *stack_bottom) {
-  cmark_llist *tmp_ext;
-
-  for (tmp_ext = parser->inline_syntax_extensions; tmp_ext; tmp_ext=tmp_ext->next) {
-    cmark_syntax_extension *ext = (cmark_syntax_extension *) tmp_ext->data;
-    cmark_llist *tmp_char;
-    for (tmp_char = ext->special_inline_chars; tmp_char; tmp_char=tmp_char->next) {
-      unsigned char c = (unsigned char)(size_t)tmp_char->data;
-
-      openers_bottom[c] = stack_bottom;
-    }
-  }
-}
-
 static cmark_syntax_extension *get_extension_for_special_char(cmark_parser *parser, unsigned char c) {
   cmark_llist *tmp_ext;
 
@@ -539,14 +525,17 @@ static void process_emphasis(cmark_parser *parser, subject *subj, delimiter *sta
   delimiter *old_closer;
   bool opener_found;
   bool odd_match;
-  delimiter *openers_bottom[128];
+  delimiter *openers_bottom[3][128];
+  int i;
 
   // initialize openers_bottom:
-  openers_bottom['*'] = stack_bottom;
-  openers_bottom['_'] = stack_bottom;
-  openers_bottom['\''] = stack_bottom;
-  openers_bottom['"'] = stack_bottom;
-  add_extensions_openers_bottom(parser, openers_bottom, stack_bottom);
+  memset(&openers_bottom, 0, sizeof(openers_bottom));
+  for (i=0; i < 3; i++) {
+    openers_bottom[i]['*'] = stack_bottom;
+    openers_bottom[i]['_'] = stack_bottom;
+    openers_bottom[i]['\''] = stack_bottom;
+    openers_bottom[i]['"'] = stack_bottom;
+  }
 
   // move back to first relevant delim.
   while (closer != NULL && closer->previous != stack_bottom) {
@@ -562,18 +551,16 @@ static void process_emphasis(cmark_parser *parser, subject *subj, delimiter *sta
       opener_found = false;
       odd_match = false;
       while (opener != NULL && opener != stack_bottom &&
-             opener != openers_bottom[closer->delim_char]) {
-        // interior closer of size 2 can't match opener of size 1
-        // or of size 1 can't match 2
-        odd_match = (closer->can_open || opener->can_close) &&
-                    ((opener->inl_text->as.literal.len +
-                      closer->inl_text->as.literal.len) %
-                         3 ==
-                     0);
-        if (opener->delim_char == closer->delim_char && opener->can_open &&
-            !odd_match) {
-          opener_found = true;
-          break;
+             opener != openers_bottom[closer->length % 3][closer->delim_char]) {
+        if (opener->can_open && opener->delim_char == closer->delim_char) {
+          // interior closer of size 2 can't match opener of size 1
+          // or of size 1 can't match 2
+          odd_match = (closer->can_open || opener->can_close) &&
+                      ((opener->length + closer->length) % 3 == 0);
+          if (!odd_match) {
+            opener_found = true;
+            break;
+          }
         }
         opener = opener->previous;
       }
@@ -607,13 +594,10 @@ static void process_emphasis(cmark_parser *parser, subject *subj, delimiter *sta
         }
         closer = closer->next;
       }
-      if (!opener_found && !odd_match) {
+      if (!opener_found) {
         // set lower bound for future searches for openers
-        // (we don't do this with 'odd_match' set because
-        // a ** that didn't match an earlier * might turn into
-        // an opener, and the * might be matched by something
-        // else.
-        openers_bottom[old_closer->delim_char] = old_closer->previous;
+        openers_bottom[old_closer->length % 3][old_closer->delim_char] =
+		old_closer->previous;
         if (!old_closer->can_open) {
           // we can remove a closer that can't be an
           // opener, once we've seen there's no
@@ -626,7 +610,7 @@ static void process_emphasis(cmark_parser *parser, subject *subj, delimiter *sta
     }
   }
   // free all delimiters in list until stack_bottom:
-  while (subj->last_delim != stack_bottom) {
+  while (subj->last_delim != NULL && subj->last_delim != stack_bottom) {
     remove_delimiter(subj, subj->last_delim);
   }
 }
@@ -642,12 +626,7 @@ static delimiter *S_insert_emph(subject *subj, delimiter *opener,
   cmark_node *tmp, *tmpnext, *emph;
 
   // calculate the actual number of characters used from this closer
-  if (closer_num_chars < 3 || opener_num_chars < 3) {
-    use_delims = closer_num_chars <= opener_num_chars ? closer_num_chars
-                                                      : opener_num_chars;
-  } else { // closer and opener both have >= 3 characters
-    use_delims = closer_num_chars % 2 == 0 ? 2 : 1;
-  }
+  use_delims = (closer_num_chars >= 2 && opener_num_chars >=2) ? 2 : 1;
 
   // remove used characters from associated inlines.
   opener_num_chars -= use_delims;
@@ -878,11 +857,13 @@ static bufsize_t manual_scan_link_url(cmark_chunk *input, bufsize_t offset) {
       if (input->data[i] == '\\')
         i += 2;
       else if (input->data[i] == '(') {
-        ++nb_p; ++i;
+        ++nb_p;
+        ++i;
       } else if (input->data[i] == ')') {
         if (nb_p == 0)
           break;
-        --nb_p; ++i;
+        --nb_p;
+        ++i;
       } else if (cmark_isspace(input->data[i]))
         break;
       else

data/ext/commonmarker/cmark/src/latex.c

@@ -43,7 +43,7 @@ static CMARK_INLINE void outc(cmark_renderer *renderer, cmark_escaping escape,
     break;
   case 45:             // '-'
     if (nextc == 45) { // prevent ligature
-      cmark_render_ascii(renderer, "\\-");
+      cmark_render_ascii(renderer, "-{}");
     } else {
       cmark_render_ascii(renderer, "-");
     }
@@ -393,7 +393,8 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
       case URL_AUTOLINK:
         LIT("\\url{");
         OUT(url, false, URL);
-        break;
+        LIT("}");
+        return 0; // Don't process further nodes to avoid double-rendering artefacts
       case EMAIL_AUTOLINK:
         LIT("\\href{");
         OUT(url, false, URL);

data/ext/commonmarker/cmark/test/CMakeLists.txt

@@ -9,7 +9,9 @@ else(SPEC_TESTS)
   find_package(PythonInterp 3)
 endif(SPEC_TESTS)
 
-add_test(NAME api_test COMMAND api_test)
+if (CMARK_SHARED)
+  add_test(NAME api_test COMMAND api_test)
+endif()
 
 if (WIN32)
   file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/src WIN_DLL_DIR)
@@ -28,15 +30,29 @@ IF (PYTHONINTERP_FOUND)
     "${CMAKE_CURRENT_SOURCE_DIR}/normalize.py"
     )
 
-  add_test(spectest_library
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
-    "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
-    )
-
-  add_test(pathological_tests_library
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py"
-    "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
-    )
+  if (CMARK_SHARED)
+    add_test(spectest_library
+      ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
+      "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      )
+
+    add_test(pathological_tests_library
+      ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py"
+      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      )
+
+    add_test(roundtriptest_library
+      ${PYTHON_EXECUTABLE}
+      "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
+      "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt"
+      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      )
+
+    add_test(entity_library
+      ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/entity_tests.py"
+      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      )
+  endif()
 
   add_test(spectest_executable
     ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
@@ -50,13 +66,6 @@ IF (PYTHONINTERP_FOUND)
     ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark -e table -e strikethrough -e autolink -e tagfilter"
     )
 
-  add_test(roundtriptest_library
-    ${PYTHON_EXECUTABLE}
-    "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
-    "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt"
-    "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
-    )
-
   add_test(roundtrip_extensions_executable
     ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
@@ -71,10 +80,6 @@ IF (PYTHONINTERP_FOUND)
     "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
     )
 
-  add_test(entity_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/entity_tests.py"
-    "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
-    )
 
 ELSE(PYTHONINTERP_FOUND)
 

data/ext/commonmarker/cmark/test/extensions.txt

@@ -44,7 +44,7 @@ Hello!
 | _abc_ | セン |
 | ----- | ---- |
 | 1. Block elements inside cells don't work. | |
-| But **_inline elements do_**. | x |
+| But _**inline elements do**_. | x |
 
 Hi!
 .
@@ -62,7 +62,7 @@ Hi!
 <td></td>
 </tr>
 <tr>
-<td>But <strong><em>inline elements do</em></strong>.</td>
+<td>But <em><strong>inline elements do</strong></em>.</td>
 <td>x</td>
 </tr></tbody></table>
 <p>Hi!</p>
@@ -145,7 +145,7 @@ Hello!
 | _abc_ | セン |
 | ----- | ---- |
 | this row has a space at the end | | 
-| But **_inline elements do_**. | x |
+| But _**inline elements do**_. | x |
 
 Hi!
 .
@@ -163,7 +163,7 @@ Hi!
 <td></td>
 </tr>
 <tr>
-<td>But <strong><em>inline elements do</em></strong>.</td>
+<td>But <em><strong>inline elements do</strong></em>.</td>
 <td>x</td>
 </tr></tbody></table>
 <p>Hi!</p>
@@ -255,7 +255,7 @@ Tables with embedded pipes could be tricky.
 | --- | --- |
 | Escaped pipes are \|okay\|. | Like \| this. |
 | Within `|code| is okay` too. |
-| **_`c|`_** \| complex
+| _**`c|`**_ \| complex
 | don't **\_reparse\_**
 .
 <table>
@@ -275,7 +275,7 @@ Tables with embedded pipes could be tricky.
 <td></td>
 </tr>
 <tr>
-<td><strong><em><code>c|</code></em></strong> | complex</td>
+<td><em><strong><code>c|</code></strong></em> | complex</td>
 <td></td>
 </tr>
 <tr>

data/ext/commonmarker/cmark/test/pathological_tests.py

@@ -38,6 +38,9 @@ pathological = {
     "mismatched openers and closers":
                  (("*a_ " * 50000),
                   re.compile("([*]a[_] ){49999}[*]a_")),
+    "openers and closers multiple of 3":
+                 (("a**b" + ("c* " * 50000)),
+                  re.compile("a[*][*]b(c[*] ){49999}c[*]")),
     "link openers and emph closers":
                  (("[ a_" * 50000),
                   re.compile("(\[ a_){50000}")),

data/ext/commonmarker/cmark/test/regression.txt

@@ -66,3 +66,11 @@ hi
 <h2>hi</h2>
 ````````````````````````````````
 
+Issue #177 - incorrect emphasis parsing
+
+```````````````````````````````` example
+a***b* c*
+.
+<p>a*<em><em>b</em> c</em></p>
+````````````````````````````````
+

data/ext/commonmarker/cmark/test/spec.txt

@@ -5976,8 +5976,8 @@ the following principles resolve ambiguity:
     an interpretation `<strong>...</strong>` is always preferred to
     `<em><em>...</em></em>`.
 
-14. An interpretation `<strong><em>...</em></strong>` is always
-    preferred to `<em><strong>..</strong></em>`.
+14. An interpretation `<em><strong>...</strong></em>` is always
+    preferred to `<strong><em>..</em></strong>`.
 
 15. When two potential emphasis or strong emphasis spans overlap,
     so that the second begins before the first ends and ends after
@@ -7000,14 +7000,14 @@ Rule 14:
 ```````````````````````````````` example
 ***foo***
 .
-<p><strong><em>foo</em></strong></p>
+<p><em><strong>foo</strong></em></p>
 ````````````````````````````````
 
 
 ```````````````````````````````` example
 _____foo_____
 .
-<p><strong><strong><em>foo</em></strong></strong></p>
+<p><em><strong><strong>foo</strong></strong></em></p>
 ````````````````````````````````
 
 

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -165,15 +165,15 @@ files:
 - ext/commonmarker/cmark/bench/stats.py
 - ext/commonmarker/cmark/benchmarks.md
 - ext/commonmarker/cmark/build/CMakeCache.txt
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CMakeCCompiler.cmake
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CMakeCXXCompiler.cmake
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CMakeDetermineCompilerABI_C.bin
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CMakeDetermineCompilerABI_CXX.bin
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CMakeSystem.cmake
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CompilerIdC/CMakeCCompilerId.c
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CompilerIdC/a.out
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CompilerIdCXX/CMakeCXXCompilerId.cpp
-- ext/commonmarker/cmark/build/CMakeFiles/3.7.1/CompilerIdCXX/a.out
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CMakeCCompiler.cmake
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CMakeCXXCompiler.cmake
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CMakeDetermineCompilerABI_C.bin
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CMakeDetermineCompilerABI_CXX.bin
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CMakeSystem.cmake
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CompilerIdC/CMakeCCompilerId.c
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CompilerIdC/a.out
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CompilerIdCXX/CMakeCXXCompilerId.cpp
+- ext/commonmarker/cmark/build/CMakeFiles/3.7.2/CompilerIdCXX/a.out
 - ext/commonmarker/cmark/build/CMakeFiles/CMakeDirectoryInformation.cmake
 - ext/commonmarker/cmark/build/CMakeFiles/CMakeError.log
 - ext/commonmarker/cmark/build/CMakeFiles/CMakeOutput.log