From 235d9228831551e9a629c8e4a6551c0ff4a1931a Mon Sep 17 00:00:00 2001
From: crossdark <liuhanbo333@icloud.com>
Date: Sun, 6 Oct 2024 22:00:55 +0800
Subject: [PATCH] =?UTF-8?q?1.6=E6=8F=90=E9=86=92=E5=88=B6=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CrossDown/Core.py | 28 +++++++++++++++++++---------
 README.html       |  6 +++++-
 README.md         |  6 ++++++
 run.py            |  1 -
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/CrossDown/Core.py b/CrossDown/Core.py
index f11b38b..df88a35 100644
--- a/CrossDown/Core.py
+++ b/CrossDown/Core.py
@@ -158,25 +158,28 @@ class Syllabus(BlockProcessor):
         return False
 
 
-class BoxBlockProcessor(BlockProcessor):
-        RE_FENCE_START = r'^ *!{3,} *\n' # start line, e.g., `   !!!! `
-        RE_FENCE_END = r'\n *!{3,}\s*$'  # last non-blank line, e.g, '!!!\n  \n\n'
+class BoxBlock(BlockProcessor):
+        def __init__(self, parser, re_start, re_end, style):
+            super().__init__(parser)
+            self.re_start = re_start  # start line, e.g., `   !!!!
+            self.re_end = re_end  # last non-blank line, e.g, '!!!\n  \n\n'
+            self.style = style
 
         def test(self, parent, block):
-            return re.match(self.RE_FENCE_START, block)
+            return re.match(self.re_start, block)
 
         def run(self, parent, blocks):
             original_block = blocks[0]
-            blocks[0] = re.sub(self.RE_FENCE_START, '', blocks[0])
+            blocks[0] = re.sub(self.re_start, '', blocks[0])
 
             # Find block with ending fence
             for block_num, block in enumerate(blocks):
-                if re.search(self.RE_FENCE_END, block):
+                if re.search(self.re_end, block):
                     # remove fence
-                    blocks[block_num] = re.sub(self.RE_FENCE_END, '', block)
+                    blocks[block_num] = re.sub(self.re_end, '', block)
                     # render fenced area inside a new div
                     e = xml.etree.ElementTree.SubElement(parent, 'div')
-                    e.set('style', 'display: inline-block; border: 1px solid red;')
+                    e.set('style', self.style)
                     self.parser.parseBlocks(e, blocks[0:block_num + 1])
                     # remove used blocks
                     for i in range(0, block_num + 1):
@@ -214,7 +217,14 @@ class Box(Extension):
 
     def extendMarkdown(self, md):
         md.registerExtension(self)  # 注册扩展
-        md.parser.blockprocessors.register(BoxBlockProcessor(md.parser), 'box', 175)
+        # 红框警告
+        md.parser.blockprocessors.register(BoxBlock(
+            md.parser, r'^ *!{3,} *\n', r'\n *!{3,}\s*$', 'display: inline-block; border: 1px solid red;'
+        ), 'warning_box', 175)  # 块
+        # 黄框提醒
+        md.parser.blockprocessors.register(BoxBlock(
+            md.parser, r'^ *!{2,} *\n', r'\n *!{2,}\s*$', 'display: inline-block; border: 1px solid yellow;'
+        ), 'reminding_box', 175)
 
 
 def main(text: str) -> Tuple[str, Dict[str, List[str]]]:
diff --git a/README.html b/README.html
index 8a5a5ce..40f7aa5 100644
--- a/README.html
+++ b/README.html
@@ -4,7 +4,6 @@
     <meta charset="UTF-8">  
     <meta name="viewport" content="width=device-width, initial-scale=1.0">  
     <title>UTF-8编码示例</title>  
-    <link href="style.css" rel="stylesheet" />
     <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_CHTML"></script>
     <link href="https://cdn.jsdelivr.net/npm/prismjs/themes/prism.css" rel="stylesheet" />
     <script src="https://cdn.jsdelivr.net/npm/prismjs/prism.js"></script>
@@ -119,6 +118,7 @@
     </li>
     <li><a href="#14">14 外框</a><ul>
     <li><a href="#14.1">14.1 警告</a></li>
+    <li><a href="#14.2">14.2 提醒</a></li>
     </ul>
     </li>
     </ul>
@@ -299,5 +299,9 @@
     <div style="display: inline-block; border: 1px solid red;">
     <p>这是一条警告</p>
     </div>
+    <h2 id="14.2">14.2 提醒</h2>
+    <div style="display: inline-block; border: 1px solid yellow;">
+    <p>这是一条提醒</p>
+    </div>
 </body>  
 </html>
diff --git a/README.md b/README.md
index f6f1b3e..5e7fe8d 100644
--- a/README.md
+++ b/README.md
@@ -251,3 +251,9 @@ graph LR
 !!!
 这是一条警告
 !!!
+
+14.2 提醒
+
+!!
+这是一条提醒
+!!
diff --git a/run.py b/run.py
index 4b00fee..51d28cb 100644
--- a/run.py
+++ b/run.py
@@ -17,7 +17,6 @@ if __name__ == '__main__':
     <meta charset="UTF-8">  
     <meta name="viewport" content="width=device-width, initial-scale=1.0">  
     <title>UTF-8编码示例</title>  
-    <link href="style.css" rel="stylesheet" />
 {indent(HEAD)}
     <!-- 可以在这里添加其他元数据和CSS链接 -->  
 </head>