made bs4 and soupsieve standalone in this project

MarkdownLivePreview.py

@@ -1,3 +1,22 @@
+import os
+import sys
+import sublime
+
+# Add the package archive path itself to sys.path
+package_path = os.path.dirname(__file__)
+if package_path not in sys.path:
+    sys.path.insert(0, package_path)
+
+# --- Add lib to sys.path ---
+# Get the directory containing this file (MarkdownLivePreview.py)
+plugin_dir = os.path.dirname(__file__)
+# Construct the absolute path to the 'lib' directory
+lib_path = os.path.join(plugin_dir, 'lib')
+# Add it to the beginning of sys.path if it's not already there
+if lib_path not in sys.path:
+    sys.path.insert(0, lib_path)
+# --- End sys.path modification ---
+
 """
 Terminology
 original_view: the view in the regular editor, without it's own window
@@ -8,9 +27,7 @@ preview_window: the window with the markdown file and the preview
 """
 
 import time
-import os.path
 import struct
-import sublime
 import sublime_plugin
 
 from functools import partial
@@ -132,7 +149,6 @@ class MarkdownLivePreviewListener(sublime_plugin.EventListener):
         if self.file_name is None:
             total_region = sublime.Region(0, markdown_view.size())
             self.content = markdown_view.substr(total_region)
-            markdown_view.erase(edit, total_region)
         else:
             self.content = None
 

channel.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "sublime://packagecontrol.io/schemas/channel",
+  "schema_version": "4.0.0",
+  "repositories": [
+    "https://git.0x42.cloud/christian.morpurgo/MarkdownLivePreview/raw/branch/master/repository.json"
+  ]
+}

dependencies.json

@@ -1,7 +0,0 @@
-{
-    "*": {
-        "*": [
-            "bs4"
-        ]
-    }
-}

lib/bs4/builder/__init__.py

@@ -4,7 +4,7 @@ __license__ = "MIT"
 from collections import defaultdict
 import itertools
 import sys
-from bs4.element import (
+from ..element import (
     CharsetMetaAttributeValue,
     ContentMetaAttributeValue,
     Stylesheet,

lib/bs4/builder/_html5lib.py

@@ -7,13 +7,13 @@ __all__ = [
 
 import warnings
 import re
-from bs4.builder import (
+from . import (
     PERMISSIVE,
     HTML,
     HTML_5,
     HTMLTreeBuilder,
     )
-from bs4.element import (
+from ..element import (
     NamespacedAttribute,
     nonwhitespace_re,
 )
@@ -22,7 +22,7 @@ from html5lib.constants import (
     namespaces,
     prefixes,
     )
-from bs4.element import (
+from ..element import (
     Comment,
     Doctype,
     NavigableString,
@@ -120,7 +120,7 @@ class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
         if soup:
             self.soup = soup
         else:
-            from bs4 import BeautifulSoup
+            from .. import BeautifulSoup
             # TODO: Why is the parser 'html.parser' here? To avoid an
             # infinite loop?
             self.soup = BeautifulSoup(
@@ -166,7 +166,7 @@ class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
         return TextNode(Comment(data), self.soup)
 
     def fragmentClass(self):
-        from bs4 import BeautifulSoup
+        from .. import BeautifulSoup
         # TODO: Why is the parser 'html.parser' here? To avoid an
         # infinite loop?
         self.soup = BeautifulSoup("", "html.parser")
@@ -184,7 +184,7 @@ class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
         return treebuilder_base.TreeBuilder.getFragment(self).element
 
     def testSerializer(self, element):
-        from bs4 import BeautifulSoup
+        from .. import BeautifulSoup
         rv = []
         doctype_re = re.compile(r'^(.*?)(?: PUBLIC "(.*?)"(?: "(.*?)")?| SYSTEM "(.*?)")?$')
 

lib/bs4/builder/_htmlparser.py

@@ -34,16 +34,16 @@ CONSTRUCTOR_STRICT_IS_DEPRECATED = major == 3 and minor == 3
 CONSTRUCTOR_TAKES_CONVERT_CHARREFS = major == 3 and minor >= 4
 
 
-from bs4.element import (
+from ..element import (
     CData,
     Comment,
     Declaration,
     Doctype,
     ProcessingInstruction,
     )
-from bs4.dammit import EntitySubstitution, UnicodeDammit
+from ..dammit import EntitySubstitution, UnicodeDammit
 
-from bs4.builder import (
+from . import (
     HTML,
     HTMLTreeBuilder,
     STRICT,

lib/bs4/builder/_lxml.py

@@ -14,14 +14,14 @@ except ImportError as e:
 from io import BytesIO
 from io import StringIO
 from lxml import etree
-from bs4.element import (
+from ..element import (
     Comment,
     Doctype,
     NamespacedAttribute,
     ProcessingInstruction,
     XMLProcessingInstruction,
 )
-from bs4.builder import (
+from . import (
     FAST,
     HTML,
     HTMLTreeBuilder,
@@ -29,7 +29,7 @@ from bs4.builder import (
     ParserRejectedMarkup,
     TreeBuilder,
     XML)
-from bs4.dammit import EncodingDetector
+from ..dammit import EncodingDetector
 
 LXML = 'lxml'
 

lib/bs4/diagnose.py

@@ -6,9 +6,9 @@ __license__ = "MIT"
 import cProfile
 from io import StringIO
 from html.parser import HTMLParser
-import bs4
+from . import BeautifulSoup as bs4
-from bs4 import BeautifulSoup, __version__
+from . import BeautifulSoup, __version__
-from bs4.builder import builder_registry
+from .builder import builder_registry
 
 import os
 import pstats

lib/bs4/element.py

@@ -9,14 +9,14 @@ import re
 import sys
 import warnings
 try:
-    import soupsieve
+    from ..soupsieve import *
 except ImportError as e:
     soupsieve = None
     warnings.warn(
         'The soupsieve package is not installed. CSS selectors cannot be used.'
     )
 
-from bs4.formatter import (
+from .formatter import (
     Formatter,
     HTMLFormatter,
     XMLFormatter,
@@ -380,7 +380,7 @@ class PageElement(object):
             and not isinstance(new_child, NavigableString)):
             new_child = NavigableString(new_child)
 
-        from bs4 import BeautifulSoup
+        from . import BeautifulSoup
         if isinstance(new_child, BeautifulSoup):
             # We don't want to end up with a situation where one BeautifulSoup
             # object contains another. Insert the children one at a time.

lib/bs4/formatter.py

@@ -1,4 +1,4 @@
-from bs4.dammit import EntitySubstitution
+from .dammit import EntitySubstitution
 
 class Formatter(EntitySubstitution):
     """Describes a strategy to use when outputting a parse tree to a string.

lib/bs4/testing.py

@@ -9,8 +9,8 @@ import copy
 import functools
 import unittest
 from unittest import TestCase
-from bs4 import BeautifulSoup
+from . import BeautifulSoup
-from bs4.element import (
+from .element import (
     CharsetMetaAttributeValue,
     Comment,
     ContentMetaAttributeValue,
@@ -22,7 +22,7 @@ from bs4.element import (
     Tag
 )
 
-from bs4.builder import HTMLParserTreeBuilder
+from .builder import HTMLParserTreeBuilder
 default_builder = HTMLParserTreeBuilder
 
 BAD_DOCUMENT = """A bare string

lib/bs4/tests/test_builder_registry.py

@@ -3,21 +3,21 @@
 import unittest
 import warnings
 
-from bs4 import BeautifulSoup
+from .. import BeautifulSoup
-from bs4.builder import (
+from ..builder import (
     builder_registry as registry,
     HTMLParserTreeBuilder,
     TreeBuilderRegistry,
 )
 
 try:
-    from bs4.builder import HTML5TreeBuilder
+    from ..builder import HTML5TreeBuilder
     HTML5LIB_PRESENT = True
 except ImportError:
     HTML5LIB_PRESENT = False
 
 try:
-    from bs4.builder import (
+    from ..builder import (
         LXMLTreeBuilderForXML,
         LXMLTreeBuilder,
         )

lib/bs4/tests/test_html5lib.py

@@ -3,12 +3,12 @@
 import warnings
 
 try:
-    from bs4.builder import HTML5TreeBuilder
+    from ..builder import HTML5TreeBuilder
     HTML5LIB_PRESENT = True
 except ImportError as e:
     HTML5LIB_PRESENT = False
-from bs4.element import SoupStrainer
+from ..element import SoupStrainer
-from bs4.testing import (
+from ..testing import (
     HTML5TreeBuilderSmokeTest,
     SoupTest,
     skipIf,

lib/bs4/tests/test_htmlparser.py

@@ -3,9 +3,9 @@ trees."""
 
 from pdb import set_trace
 import pickle
-from bs4.testing import SoupTest, HTMLTreeBuilderSmokeTest
+from ..testing import SoupTest, HTMLTreeBuilderSmokeTest
-from bs4.builder import HTMLParserTreeBuilder
+from ..builder import HTMLParserTreeBuilder
-from bs4.builder._htmlparser import BeautifulSoupHTMLParser
+from ..builder._htmlparser import BeautifulSoupHTMLParser
 
 class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest):
 

lib/bs4/tests/test_lxml.py

@@ -12,16 +12,16 @@ except ImportError as e:
     LXML_VERSION = (0,)
 
 if LXML_PRESENT:
-    from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
+    from ..builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
 
-from bs4 import (
+from .. import (
     BeautifulSoup,
     BeautifulStoneSoup,
     )
-from bs4.element import Comment, Doctype, SoupStrainer
+from ..element import Comment, Doctype, SoupStrainer
-from bs4.testing import skipIf
+from ..testing import skipIf
-from bs4.tests import test_htmlparser
+from . import test_htmlparser
-from bs4.testing import (
+from ..testing import (
     HTMLTreeBuilderSmokeTest,
     XMLTreeBuilderSmokeTest,
     SoupTest,

lib/bs4/tests/test_soup.py

@@ -7,17 +7,17 @@ import unittest
 import sys
 import tempfile
 
-from bs4 import (
+from .. import (
     BeautifulSoup,
     BeautifulStoneSoup,
     GuessedAtParserWarning,
     MarkupResemblesLocatorWarning,
 )
-from bs4.builder import (
+from ..builder import (
     TreeBuilder,
     ParserRejectedMarkup,
 )
-from bs4.element import (
+from ..element import (
     CharsetMetaAttributeValue,
     Comment,
     ContentMetaAttributeValue,
@@ -27,13 +27,13 @@ from bs4.element import (
     NavigableString,
     )
 
-import bs4.dammit
+from ..dammit import *
-from bs4.dammit import (
+from ..dammit import (
     EntitySubstitution,
     UnicodeDammit,
     EncodingDetector,
 )
-from bs4.testing import (
+from ..testing import (
     default_builder,
     SoupTest,
     skipIf,
@@ -41,7 +41,7 @@ from bs4.testing import (
 import warnings
 
 try:
-    from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
+    from ..builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
     LXML_PRESENT = True
 except ImportError as e:
     LXML_PRESENT = False
@@ -120,11 +120,10 @@ class TestConstructor(SoupTest):
             def feed(self, *args, **kwargs):
                 raise ParserRejectedMarkup("Nope.")
 
-        def prepare_markup(self, *args, **kwargs):
+            def prepare_markup(self, markup, *args, **kwargs):
-            # We're going to try two different ways of preparing this markup,
+                # We're going to try two different ways of preparing this markup,
-            # but feed() will reject both of them.
+                # but feed() will reject both of them.
-            yield markup, None, None, False
+                yield markup, None, None, False
-            yield markup, None, None, False
             
         import re
         self.assertRaisesRegex(
@@ -418,13 +417,13 @@ class TestEncodingConversion(SoupTest):
     def test_ascii_in_unicode_out(self):
         # ASCII input is converted to Unicode. The original_encoding
         # attribute is set to 'utf-8', a superset of ASCII.
-        chardet = bs4.dammit.chardet_dammit
+        chardet = chardet_dammit
         logging.disable(logging.WARNING)
         try:
             def noop(str):
                 return None
             # Disable chardet, which will realize that the ASCII is ASCII.
-            bs4.dammit.chardet_dammit = noop
+            chardet_dammit = noop
             ascii = b"<foo>a</foo>"
             soup_from_ascii = self.soup(ascii)
             unicode_output = soup_from_ascii.decode()
@@ -433,7 +432,7 @@ class TestEncodingConversion(SoupTest):
             self.assertEqual(soup_from_ascii.original_encoding.lower(), "utf-8")
         finally:
             logging.disable(logging.NOTSET)
-            bs4.dammit.chardet_dammit = chardet
+            chardet_dammit = chardet
 
     def test_unicode_in_unicode_out(self):
         # Unicode input is left alone. The original_encoding attribute
@@ -574,12 +573,12 @@ class TestUnicodeDammit(unittest.TestCase):
         doc = b"""\357\273\277<?xml version="1.0" encoding="UTF-8"?>
 <html><b>\330\250\330\252\330\261</b>
 <i>\310\322\321\220\312\321\355\344</i></html>"""
-        chardet = bs4.dammit.chardet_dammit
+        chardet = chardet_dammit
         logging.disable(logging.WARNING)
         try:
             def noop(str):
                 return None
-            bs4.dammit.chardet_dammit = noop
+            chardet_dammit = noop
             dammit = UnicodeDammit(doc)
             self.assertEqual(True, dammit.contains_replacement_characters)
             self.assertTrue("\ufffd" in dammit.unicode_markup)
@@ -588,7 +587,7 @@ class TestUnicodeDammit(unittest.TestCase):
             self.assertTrue(soup.contains_replacement_characters)
         finally:
             logging.disable(logging.NOTSET)
-            bs4.dammit.chardet_dammit = chardet
+            chardet_dammit = chardet
 
     def test_byte_order_mark_removed(self):
         # A document written in UTF-16LE will have its byte order marker stripped.
@@ -613,7 +612,7 @@ class TestUnicodeDammit(unittest.TestCase):
         self.assertRaises(UnicodeDecodeError, doc.decode, "utf8")
 
         # Unicode, Dammit thinks the whole document is Windows-1252,
-        # and decodes it into "☃☃☃“Hi, I like Windows!”☃☃☃"
+        # and decodes it into "☃☃☃"Hi, I like Windows!"☃☃☃"
 
         # But if we run it through fix_embedded_windows_1252, it's fixed:
 

lib/bs4/tests/test_tree.py

@@ -14,12 +14,12 @@ import copy
 import pickle
 import re
 import warnings
-from bs4 import BeautifulSoup
+from .. import BeautifulSoup
-from bs4.builder import (
+from ..builder import (
     builder_registry,
     HTMLParserTreeBuilder,
 )
-from bs4.element import (
+from ..element import (
     PY3K,
     CData,
     Comment,
@@ -33,11 +33,11 @@ from bs4.element import (
     Tag,
     TemplateString,
 )
-from bs4.testing import (
+from ..testing import (
     SoupTest,
     skipIf,
 )
-from soupsieve import SelectorSyntaxError
+from ...soupsieve import SelectorSyntaxError
 
 XML_BUILDER_PRESENT = (builder_registry.lookup("xml") is not None)
 LXML_PRESENT = (builder_registry.lookup("lxml") is not None)

lib/soupsieve/css_match.py

@@ -6,10 +6,13 @@ from .import css_types as ct
 import unicodedata
 from collections.abc import Sequence
 
-import bs4
+from ..bs4 import BeautifulSoup
+from ..bs4.element import (
+    Tag, NavigableString, Comment, Declaration, CData, ProcessingInstruction, Doctype
+)
 
 # Empty tag pattern (whitespace okay)
-RE_NOT_EMPTY = re.compile('[^ \t\r\n\f]')
+RE_NOT_EMPTY = re.compile(r'[^ \t\r\n\f]')
 
 RE_NOT_WS = re.compile('[^ \t\r\n\f]+')
 
@@ -90,37 +93,37 @@ class _DocumentNav(object):
     @staticmethod
     def is_doc(obj):
         """Is `BeautifulSoup` object."""
-        return isinstance(obj, bs4.BeautifulSoup)
+        return isinstance(obj, BeautifulSoup)
 
     @staticmethod
     def is_tag(obj):
         """Is tag."""
-        return isinstance(obj, bs4.Tag)
+        return isinstance(obj, Tag)
 
     @staticmethod
     def is_declaration(obj):  # pragma: no cover
         """Is declaration."""
-        return isinstance(obj, bs4.Declaration)
+        return isinstance(obj, Declaration)
 
     @staticmethod
     def is_cdata(obj):
         """Is CDATA."""
-        return isinstance(obj, bs4.CData)
+        return isinstance(obj, CData)
 
     @staticmethod
     def is_processing_instruction(obj):  # pragma: no cover
         """Is processing instruction."""
-        return isinstance(obj, bs4.ProcessingInstruction)
+        return isinstance(obj, ProcessingInstruction)
 
     @staticmethod
     def is_navigable_string(obj):
         """Is navigable string."""
-        return isinstance(obj, bs4.NavigableString)
+        return isinstance(obj, NavigableString)
 
     @staticmethod
     def is_special_string(obj):
         """Is special string."""
-        return isinstance(obj, (bs4.Comment, bs4.Declaration, bs4.CData, bs4.ProcessingInstruction, bs4.Doctype))
+        return isinstance(obj, (Comment, Declaration, CData, ProcessingInstruction, Doctype))
 
     @classmethod
     def is_content_string(cls, obj):

markdown2html.py

@@ -11,7 +11,7 @@ import os.path
 import concurrent.futures
 import urllib.request
 import base64
-import bs4
+from .lib.bs4 import BeautifulSoup as bs4
 
 from functools import partial
 
@@ -194,13 +194,19 @@ def get_image_size(fhandle, pathlike):
                 fhandle.seek(size, 1)
                 byte = fhandle.read(1)
                 if byte == b"":
-                    fhandle = end
+                    # Reached end of file unexpectedly, break the loop
-                    byte = fhandle.read(1)
+                    break
-
                 while ord(byte) == 0xFF:
                     byte = fhandle.read(1)
+                    if byte == b"": # Check EOF in inner loop too
+                        break
+                if byte == b"": # Break outer loop if inner loop hit EOF
+                    break
                 ftype = ord(byte)
                 size = struct.unpack(">H", fhandle.read(2))[0] - 2
+            # Check if the loop exited because of a break (EOF) before finding the marker
+            if not (0xC0 <= ftype <= 0xCF):
+                 return "unknown format {!r}".format(format_)
             # We are at a SOFn block
             fhandle.seek(1, 1)  # Skip `precision' byte.
             height, width = struct.unpack(">HH", fhandle.read(4))

repository.json

@@ -1,15 +1,19 @@
 {
-  "schema_version": "3",
+  "schema_version": "3.0.0",
   "packages": [
     {
-      "name": "MarkdownLivePreview-Fork",
+      "name": "MarkdownLivePreview",
       "description": "My enhanced live-preview fork of MarkdownLivePreview",
+      "author": "Christian Morpurgo",
+      "homepage": "https://git.0x42.cloud/christian.morpurgo/MarkdownLivePreview",
       "releases": [
         {
-          "version": "1.0.0",
+          "version": "6.0.2",
-          "url": "https://git.0x42.cloud/christian.morpurgo/MarkdownLivePreview/archive/v0.0.0.zip"
+          "url": "https://git.0x42.cloud/christian.morpurgo/MarkdownLivePreview/releases/download/v6.0.2/MarkdownLivePreview.sublime-package",
+          "date": "2025-04-24 00:00:00",
+          "sublime_text": "*"
         }
       ]
     }
   ]
-}
+}