From ee8ce684b464c0aa1c8462953e901aec6f047551 Mon Sep 17 00:00:00 2001
From: FurryR <awathefox@gmail.com>
Date: Mon, 19 Jan 2026 23:01:45 +0800
Subject: [PATCH 1/2] feat: inline `<style>` and `<link>` support (partial)

Currently, `<link>` use a workaround to prevent complex process during parsing stage. No CSS3 `@import` support is provided.
I imported `requests` for the implementation of the default fetcher; it's probably unnecessary. If needed, the `request` dependency can be removed, in this case `<link>` support will be disabled.

Signed-off-by: FurryR <awathefox@gmail.com>
---
 .gitignore                             |  6 ++-
 pyproject.toml                         |  3 +-
 src/html2pic/html2pic.py               | 64 ++++++++++++++++++++++++--
 src/html2pic/parsing/css_parser.py     |  2 +-
 src/html2pic/parsing/html_parser.py    | 48 ++++++++++---------
 src/html2pic/translation/translator.py |  7 ++-
 6 files changed, 100 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5156ea1..ebc468a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,4 +142,8 @@ dmypy.json
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+
+# PDM package manager
+.pdm-python
+pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
index 1d0b891..c5b41df 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ authors = [
 ]
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 keywords = ["html", "css", "image", "conversion", "rendering"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -33,6 +33,7 @@ dependencies = [
     "pictex>=2.0.0",
     "beautifulsoup4>=4.9.0",
     "tinycss2>=1.1.0",
+    "requests>=2.32.5",
 ]
 
 [project.optional-dependencies]
diff --git a/src/html2pic/html2pic.py b/src/html2pic/html2pic.py
index 377aafa..2f25375 100644
--- a/src/html2pic/html2pic.py
+++ b/src/html2pic/html2pic.py
@@ -11,7 +11,14 @@
 from .dom import DOMNode
 from .parsing import CSSRule
 from .fonts import FontRegistry
-from typing import Optional, List
+from typing import Optional, List, Callable
+
+def default_fetcher(url: str) -> str:
+    """Default fetcher function to retrieve content from a URL."""
+    import requests
+    response = requests.get(url, timeout=30)
+    response.raise_for_status()
+    return response.text
 
 class Html2Pic:
     """Convert HTML + CSS to images using PicTex.
@@ -27,9 +34,14 @@ class Html2Pic:
         ```
     """
     
-    def __init__(self, html: str, css: str = ""):
+    def __init__(self, html: str, css: str = "", fetcher: Optional[Callable[[str], str]] = None, root_url: Optional[str] = None):
         self.html = html
         self.css = css
+        if fetcher is None:
+            self.fetcher = default_fetcher
+        else:
+            self.fetcher = fetcher
+        self.root_url = root_url
         
         self._html_parser: HtmlParser = HtmlParser()
         self._css_parser: CssParser = CssParser()
@@ -48,11 +60,18 @@ def __init__(self, html: str, css: str = ""):
     def dom_tree(self) -> DOMNode:
         if self._dom_tree is None:
             self._dom_tree = self._html_parser.parse(self.html)
+            # Extract CSS from DOM and append to self.css
+            extracted_css = self._extract_css_from_dom(self._dom_tree)
+            if extracted_css:
+                self.css = self.css + "\n\n" + extracted_css if self.css else extracted_css
         return self._dom_tree
     
     @property
     def style_rules(self) -> List[CSSRule]:
         if self._style_rules is None:
+            # Ensure DOM is parsed first (which extracts CSS)
+            _ = self.dom_tree
+            # Now parse all CSS including extracted content
             self._style_rules, self._font_registry = self._css_parser.parse(self.css)
         return self._style_rules
 
@@ -60,7 +79,7 @@ def style_rules(self) -> List[CSSRule]:
     def font_registry(self) -> FontRegistry:
         if self._font_registry is None:
             _ = self.style_rules
-        return self._font_registry
+        return self._font_registry # pyright: ignore[reportReturnType]
     
     @property
     def styled_tree(self) -> DOMNode:
@@ -104,6 +123,45 @@ def render_as_svg(self, embed_font: bool = True) -> pictex.VectorImage:
             self._print_warnings()
             raise RenderError(f"Failed to render SVG: {e}") from e
     
+    def _extract_css_from_dom(self, node: DOMNode) -> str:
+        """Extract CSS from <style> tags and <link> tags."""
+        css_content = []
+        
+        def traverse(n: DOMNode):
+            if n.is_element():
+                # Extract <style> tag content
+                if n.tag and n.tag.lower() == 'style':
+                    text = n.get_all_text().strip()
+                    if text:
+                        css_content.append(text)
+                
+                # Extract <link rel="stylesheet"> tags
+                elif n.tag and n.tag.lower() == 'link':
+                    rel = n.attributes.get('rel', '').lower()
+                    if rel == 'stylesheet':
+                        href = n.attributes.get('href')
+                        if href:
+                            try:
+                                # Resolve URL if root_url is provided
+                                if self.root_url and not href.startswith(('http://', 'https://')):
+                                    from urllib.parse import urljoin
+                                    href = urljoin(self.root_url, href)
+                                
+                                # Fetch CSS content
+                                # FIXME: Workaround; CSS3 @import handling is not implemented here
+                                fetched_css = self.fetcher(href)
+                                if fetched_css:
+                                    css_content.append(fetched_css)
+                            except Exception as e:
+                                self._warnings.warn_unexpected_error(f"Failed to fetch CSS from {href}: {e}")
+                
+                # Traverse children
+                for child in n.children:
+                    traverse(child)
+        
+        traverse(node)
+        return '\n\n'.join(css_content)
+    
     def debug_info(self) -> Dict[str, Any]:
         return {
             "dom_tree": self.dom_tree,
diff --git a/src/html2pic/parsing/css_parser.py b/src/html2pic/parsing/css_parser.py
index 812a7f5..278f575 100644
--- a/src/html2pic/parsing/css_parser.py
+++ b/src/html2pic/parsing/css_parser.py
@@ -9,7 +9,7 @@
 from ..fonts import FontFace, FontRegistry, FontSrcParser
 from ..warnings import get_warning_collector
 from ..exceptions import ParseError
-from ..styiling import DEFAULT_STYLES
+from ..styling import DEFAULT_STYLES
 
 
 class CssParser:
diff --git a/src/html2pic/parsing/html_parser.py b/src/html2pic/parsing/html_parser.py
index 6772dfc..0697a89 100644
--- a/src/html2pic/parsing/html_parser.py
+++ b/src/html2pic/parsing/html_parser.py
@@ -1,7 +1,9 @@
 """HTML parser using BeautifulSoup."""
+
 from typing import Optional
 
-from bs4 import BeautifulSoup, NavigableString, Tag
+from bs4 import BeautifulSoup, Tag
+from bs4.element import NavigableString
 
 from ..dom import DOMNode, NodeType
 from ..warnings import get_warning_collector
@@ -10,67 +12,67 @@
 
 class HtmlParser:
     """Parses HTML content into a DOM tree."""
-    
-    SKIP_TAGS = {'script', 'style', 'head', 'meta', 'link', 'title'}
-    
+
+    SKIP_TAGS = {"script", "meta", "title"}
+
     def __init__(self):
         self.warnings = get_warning_collector()
-    
+
     def parse(self, html_content: str) -> DOMNode:
         """Parse HTML string into a DOM tree."""
         try:
-            soup = BeautifulSoup(html_content, 'html.parser')
+            soup = BeautifulSoup(html_content, "html.parser")
             return self._create_root(soup)
         except Exception as e:
             raise ParseError(f"Failed to parse HTML: {e}") from e
-    
+
     def _create_root(self, soup: BeautifulSoup) -> DOMNode:
-        root = DOMNode(node_type=NodeType.ELEMENT, tag='div', attributes={'class': '_root'})
-        
+        root = DOMNode(
+            node_type=NodeType.ELEMENT, tag="div", attributes={"class": "_root"}
+        )
+
         for child in soup.children:
             child_node = self._process_node(child, root)
             if child_node:
                 root.children.append(child_node)
-        
+
         return root
-    
+
     def _process_node(self, node, parent: DOMNode) -> Optional[DOMNode]:
         if isinstance(node, NavigableString):
             text = str(node).strip()
             if text:
                 return DOMNode(
-                    node_type=NodeType.TEXT,
-                    text_content=text,
-                    parent=parent
+                    node_type=NodeType.TEXT, text_content=text, parent=parent
                 )
             return None
-        
+
         if isinstance(node, Tag):
             tag_name = node.name.lower()
-            
+
             if tag_name in self.SKIP_TAGS:
                 self.warnings.warn_unsupported_html_tag(tag_name)
                 return None
-            
+
             attrs = {}
             for key, value in node.attrs.items():
                 if isinstance(value, list):
-                    attrs[key] = ' '.join(value)
+                    attrs[key] = " ".join(value)
                 else:
                     attrs[key] = value
-            
+
             dom_node = DOMNode(
                 node_type=NodeType.ELEMENT,
                 tag=tag_name,
                 attributes=attrs,
-                parent=parent
+                parent=parent,
             )
-            
+
             for child in node.children:
                 child_node = self._process_node(child, dom_node)
                 if child_node:
                     dom_node.children.append(child_node)
-            
+
             return dom_node
-        
+
         return None
diff --git a/src/html2pic/translation/translator.py b/src/html2pic/translation/translator.py
index 299f8a8..c212cd6 100644
--- a/src/html2pic/translation/translator.py
+++ b/src/html2pic/translation/translator.py
@@ -25,6 +25,8 @@
 class PicTexTranslator:
     """Translates a styled DOM tree into PicTex builders."""
     
+    SKIP_TAGS = {"link", "style", "head"}
+    
     def __init__(self):
         self.warnings = get_warning_collector()
         self.element_factory = ElementFactory()
@@ -35,7 +37,7 @@ def __init__(self):
     def translate(
         self, 
         styled_dom: DOMNode, 
-        font_registry: FontRegistry = None
+        font_registry: Optional[FontRegistry] = None
     ) -> Tuple[Canvas, Optional[Element]]:
         """Translate a styled DOM tree to PicTex builders."""
         self.font_registry = font_registry
@@ -73,6 +75,9 @@ def _create_text(self, node: DOMNode) -> Optional[Text]:
         return self.element_factory.create_text(content)
     
     def _create_element(self, node: DOMNode) -> Optional[Element]:
+        if node.tag and node.tag.lower() in self.SKIP_TAGS:
+            return None
+        
         styles = node.computed_styles
         
         if styles.get('display') == 'none':

From a5a9aab2b624c422e6814e6ef9524b00221031ec Mon Sep 17 00:00:00 2001
From: FurryR <awathefox@gmail.com>
Date: Mon, 19 Jan 2026 23:06:46 +0800
Subject: [PATCH 2/2] chore: remove default fetcher (requests)

Signed-off-by: FurryR <awathefox@gmail.com>
---
 pyproject.toml           |  3 +--
 src/html2pic/html2pic.py | 15 ++++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c5b41df..7a60381 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,8 +32,7 @@ classifiers = [
 dependencies = [
     "pictex>=2.0.0",
     "beautifulsoup4>=4.9.0",
-    "tinycss2>=1.1.0",
-    "requests>=2.32.5",
+    "tinycss2>=1.1.0"
 ]
 
 [project.optional-dependencies]
diff --git a/src/html2pic/html2pic.py b/src/html2pic/html2pic.py
index 2f25375..503a3c0 100644
--- a/src/html2pic/html2pic.py
+++ b/src/html2pic/html2pic.py
@@ -13,13 +13,6 @@
 from .fonts import FontRegistry
 from typing import Optional, List, Callable
 
-def default_fetcher(url: str) -> str:
-    """Default fetcher function to retrieve content from a URL."""
-    import requests
-    response = requests.get(url, timeout=30)
-    response.raise_for_status()
-    return response.text
-
 class Html2Pic:
     """Convert HTML + CSS to images using PicTex.
     
@@ -37,10 +30,7 @@ class Html2Pic:
     def __init__(self, html: str, css: str = "", fetcher: Optional[Callable[[str], str]] = None, root_url: Optional[str] = None):
         self.html = html
         self.css = css
-        if fetcher is None:
-            self.fetcher = default_fetcher
-        else:
-            self.fetcher = fetcher
+        self.fetcher = fetcher
         self.root_url = root_url
         
         self._html_parser: HtmlParser = HtmlParser()
@@ -139,6 +129,9 @@ def traverse(n: DOMNode):
                 elif n.tag and n.tag.lower() == 'link':
                     rel = n.attributes.get('rel', '').lower()
                     if rel == 'stylesheet':
+                        if not self.fetcher:
+                            self._warnings.warn_unexpected_error("No fetcher provided.")
+                            return
                         href = n.attributes.get('href')
                         if href:
                             try: