markly 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ef6552d303ea4620a87168fb130a802de075b747bcc737986b86083e46825bc
-  data.tar.gz: 1f9ac70b49a3170929bf56cfae562214b86fc59d58d3a07d42c14f74fbcd47c0
+  metadata.gz: e8acce4b2ae6c9e79d70bb21548ece0ec72bf0ef3e7cd77aaae270cc408daa2c
+  data.tar.gz: d48929fd7d802c68ad1ef18bb186f3f3b349d147be7b9c64dddb853f361eedac
 SHA512:
-  metadata.gz: 7f3f69c8c4844f3c28621c6e301d4785c342d9660d305fc8f0452764e72784257f0a76ec608e5c0375171cf18455a46f0a6729e898eb805645ba8bea7c8f1ac3
-  data.tar.gz: 6c4c3505f5e0b47c927dd405d20e44b4c10043e6e2657b6ec12cbd7f02f8efaa56723f885bfa3daa33052e32e6d1e24a238d1fb7dec49e227ac9802ca54ec76f
+  metadata.gz: e7f9545009613d2e140762a337babf3ddcac13520b585d8fa07ec4ab6c90a7248a4be8df2998afbdb9a4428c315bc969426f05d521219aba671dca05371f1e1c
+  data.tar.gz: 460d177e3361f7416b7d20ab48e900f9635c83c48c132bf489a025a50bfd532c678e0b9e7467d1e7441ef362030e0c96bd5f13a8e1c0d39f9746cd096934c4e8

data/ext/markly/blocks.c

@@ -91,8 +91,8 @@ static CMARK_INLINE bool S_ends_on_current_line(cmark_parser *parser, cmark_node
          // similar to fenced code blocks.
          // Types 6-7 end at a blank line, so their last content line is
          // the previous line and they should NOT match here.
-         (S_type(b) == CMARK_NODE_HTML_BLOCK && b->as.html_block_type >= 1 &&
-          b->as.html_block_type <= 5) ||
+         (S_type(b) == CMARK_NODE_HTML_BLOCK && b->as.html_block.type >= 1 &&
+          b->as.html_block.type <= 5) ||
          // Single-line blocks: finalized on same line they started
          b->start_line == parser->line_number;
 }
@@ -1037,7 +1037,7 @@ static bool parse_code_block_prefix(cmark_parser *parser, cmark_chunk *input,
 static bool parse_html_block_prefix(cmark_parser *parser,
                                     cmark_node *container) {
   bool res = false;
-  int html_block_type = container->as.html_block_type;
+  int html_block_type = container->as.html_block.type;
 
   assert(html_block_type >= 1 && html_block_type <= 7);
   switch (html_block_type) {
@@ -1051,7 +1051,32 @@ static bool parse_html_block_prefix(cmark_parser *parser,
     break;
   case 6:
   case 7:
-    res = !parser->blank;
+    if (!(parser->options & CMARK_OPT_HTML_BLOCK_BLANK_LINES)) {
+      res = !parser->blank;
+    } else if (parser->blank) {
+      // Tentatively retain blank lines. The next nonblank line determines
+      // whether the HTML block continues:
+      res = true;
+    } else if (S_last_line_blank(container)) {
+      // Establish the content indentation lazily so a blank line may follow
+      // the opening tag. A non-indented line still terminates the block:
+      if (container->as.html_block.indent == 0 && parser->indent > 0) {
+        container->as.html_block.indent = parser->indent;
+      }
+
+      res = container->as.html_block.indent > 0 &&
+            parser->indent >= container->as.html_block.indent;
+    } else {
+      // Record the shallowest positive content indentation before a blank
+      // line. Deeper nested HTML may then continue without changing it:
+      if (parser->indent > 0 &&
+          (container->as.html_block.indent == 0 ||
+           parser->indent < container->as.html_block.indent)) {
+        container->as.html_block.indent = parser->indent;
+      }
+
+      res = true;
+    }
     break;
   }
 
@@ -1224,7 +1249,7 @@ static void open_new_blocks(cmark_parser *parser, cmark_node **container,
                                    input, parser->first_nonspace))))) {
       *container = add_child(parser, *container, CMARK_NODE_HTML_BLOCK,
                              parser->first_nonspace + 1);
-      (*container)->as.html_block_type = matched;
+      (*container)->as.html_block.type = matched;
       // note, we don't adjust parser->offset because the tag is part of the
       // text
     } else if (!indented && cont_type == CMARK_NODE_PARAGRAPH &&
@@ -1421,7 +1446,7 @@ static void add_text_to_container(cmark_parser *parser, cmark_node *container,
       add_line(container, input, parser);
 
       int matches_end_condition;
-      switch (container->as.html_block_type) {
+      switch (container->as.html_block.type) {
       case 1:
         // </script>, </style>, </pre>
         matches_end_condition =

data/ext/markly/cmark-gfm.h

@@ -798,6 +798,12 @@ char *cmark_render_latex_with_mem(cmark_node *root, int options, int width, cmar
  */
 #define CMARK_OPT_INLINE_CODE_INFO (1 << 19)
 
+/** Allow indented content in type 6 and 7 HTML blocks to continue across
+ * blank lines. The indentation established by the HTML content must be
+ * preserved after each blank line.
+ */
+#define CMARK_OPT_HTML_BLOCK_BLANK_LINES (1 << 20)
+
 /**
  * ## Version information
  */

data/ext/markly/node.h

@@ -33,6 +33,11 @@ typedef struct {
   int8_t fenced;
 } cmark_code;
 
+typedef struct {
+  int type;
+  int indent;
+} cmark_html_block;
+
 typedef struct {
   int level;
   bool setext;
@@ -104,7 +109,7 @@ struct cmark_node {
     cmark_heading heading;
     cmark_link link;
     cmark_custom custom;
-    int html_block_type;
+    cmark_html_block html_block;
     int cell_index; // For keeping track of TABLE_CELL table alignments
     void *opaque;
   } as;

data/lib/markly/flags.rb

@@ -25,10 +25,13 @@ module Markly
 	FRONT_MATTER = 1 << 18
 	# Parse language prefixes on inline code spans, e.g. ruby:`Object.new`.
 	INLINE_CODE_INFO = 1 << 19
+	# Allow consistently indented HTML content to continue across blank lines.
+	HTML_BLOCK_BLANK_LINES = 1 << 20
 	
 	PARSE_FLAGS = {
 		front_matter: FRONT_MATTER,
 		inline_code_info: INLINE_CODE_INFO,
+		html_block_blank_lines: HTML_BLOCK_BLANK_LINES,
 		validate_utf8: VALIDATE_UTF8,
 		smart_quotes: SMART,
 		liberal_html_tags: LIBERAL_HTML_TAG,

data/lib/markly/version.rb

@@ -9,5 +9,5 @@
 # @namespace
 module Markly
 	# @constant [String] The version of the Markly gem.
-	VERSION = "0.18.1"
+	VERSION = "0.19.0"
 end

data/readme.md

@@ -26,6 +26,10 @@ Please see the [project documentation](https://socketry.github.io/markly/) for m
 
 Please see the [project releases](https://socketry.github.io/markly/releases/index) for all releases.
 
+### v0.19.0
+
+  - Add `Markly::HTML_BLOCK_BLANK_LINES` for keeping consistently indented HTML content together across blank lines.
+
 ### v0.18.0
 
   - Preserve complete node and extension metadata when duplicating node trees.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.19.0
+
+  - Add `Markly::HTML_BLOCK_BLANK_LINES` for keeping consistently indented HTML content together across blank lines.
+
 ## v0.18.0
 
   - Preserve complete node and extension metadata when duplicating node trees.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markly
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Garen Torikian

metadata.gz.sig

@@ -1,4 +1,4 @@
-Z6�mDo}�v�3Ⱥ&���w��Y|h�@3��g�`���ɬ
-�姑�:��$�O�U
-�F>
-���L�U\�i<�c�?;3����L8�e?B������K���GO�
�*YgE=�M�O��i4��II��q�EJz�#d�(Ex.�鑟HZׇ~�^����O�"8�,}���j�Y�'���B�M��{z���]��\s��ɴ`�ۣo؛$�ۦ2n͐|SAhr&d���C�ÿ;G!��"�a߅���p����)�J`���e�#n����V�%�Ҕ�'��|�/+1w���� s�#��YY</a�0�H.E�8	u��4��džع;�&:�\�_4b��u�U�
��2�ۅ�Ck��p�֯1�:���
+�����֨K���t�A�����j���ۚ�����sL'�R���&�%�_�]_f���I�|�y�g�Ǚ��� �MN2!�Q��/R~�J��,FV�HJn߉%�j�����^��k�*��h(9.򟇬-dw�r�9E�=���n�����+��ǎ������9Fr�� %��1�Iv
+�[/˔H���	=��j#�~<�����
+S8��,_����y��g~��Q�
+��8�JAgK�7|ʠ���ݹ���