From ab8469127880f0c1e4c3ccbd03deb3b74452ef9b Mon Sep 17 00:00:00 2001 From: Duncan Tourolle Date: Sat, 7 Jun 2025 14:42:32 +0200 Subject: [PATCH] all tests now discoverable, linebreak now inline object. --- pyWebLayout/abstract/__init__.py | 4 ++-- pyWebLayout/abstract/block.py | 4 ++++ pyWebLayout/html_parser.py | 4 ++-- pyWebLayout/io/readers/html_elements.py | 3 ++- tests/test_abstract_blocks.py | 4 ++-- tests/test_html_content.py | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pyWebLayout/abstract/__init__.py b/pyWebLayout/abstract/__init__.py index 0fb2ef7..82cca42 100644 --- a/pyWebLayout/abstract/__init__.py +++ b/pyWebLayout/abstract/__init__.py @@ -1,6 +1,6 @@ from .block import Block, BlockType, Paragraph, Heading, HeadingLevel, Quote, CodeBlock from .block import HList, ListItem, ListStyle, Table, TableRow, TableCell -#from .block import HorizontalRule, LineBreak, Image -from .inline import Word, FormattedSpan +from .block import HorizontalRule, Image +from .inline import Word, FormattedSpan, LineBreak from .document import Document, MetadataType, Chapter, Book from .functional import Link, LinkType, Button, Form, FormField, FormFieldType diff --git a/pyWebLayout/abstract/block.py b/pyWebLayout/abstract/block.py index 5ab98e0..c139fc5 100644 --- a/pyWebLayout/abstract/block.py +++ b/pyWebLayout/abstract/block.py @@ -1017,4 +1017,8 @@ class Table(Block): class Image: + pass + +class HorizontalRule: + pass \ No newline at end of file diff --git a/pyWebLayout/html_parser.py b/pyWebLayout/html_parser.py index 61b40a0..b622645 100644 --- a/pyWebLayout/html_parser.py +++ b/pyWebLayout/html_parser.py @@ -8,9 +8,9 @@ from .style import Font, FontStyle, FontWeight, TextDecoration from .abstract.document import Document, MetadataType, Book, Chapter from .abstract.block import ( Block, BlockType, Paragraph, Heading, HeadingLevel, Quote, CodeBlock, - HList, ListStyle, ListItem, Table, TableRow, TableCell, HorizontalRule, LineBreak + HList, ListStyle, ListItem, Table, TableRow, TableCell, HorizontalRule ) -from .abstract.inline import Word, FormattedSpan +from .abstract.inline import Word, FormattedSpan, LineBreak from .abstract.functional import Link, LinkType, Button, Form, FormField, FormFieldType from .concrete.page import Page from pyWebLayout.layout import Alignment diff --git a/pyWebLayout/io/readers/html_elements.py b/pyWebLayout/io/readers/html_elements.py index 0f3400e..57070d0 100644 --- a/pyWebLayout/io/readers/html_elements.py +++ b/pyWebLayout/io/readers/html_elements.py @@ -11,8 +11,9 @@ from pyWebLayout.abstract.document import Document from pyWebLayout.abstract.block import ( Block, Paragraph, Heading, HeadingLevel, Quote, CodeBlock, HList, ListStyle, ListItem, Table, TableRow, TableCell, - #HorizontalRule, LineBreak, Image + HorizontalRule, Image ) +from pyWebLayout.abstract.inline import LineBreak from pyWebLayout.abstract.functional import Link, LinkType from pyWebLayout.io.readers.html_style import HTMLStyleManager from pyWebLayout.io.readers.html_text import HTMLTextProcessor diff --git a/tests/test_abstract_blocks.py b/tests/test_abstract_blocks.py index 22c3f2b..90fb339 100644 --- a/tests/test_abstract_blocks.py +++ b/tests/test_abstract_blocks.py @@ -8,9 +8,9 @@ import unittest from pyWebLayout.abstract.block import ( Block, BlockType, Paragraph, Heading, HeadingLevel, Quote, CodeBlock, HList, ListStyle, ListItem, Table, TableRow, TableCell, - HorizontalRule, LineBreak, Image + HorizontalRule, Image ) -from pyWebLayout.abstract.inline import Word +from pyWebLayout.abstract.inline import Word, LineBreak from pyWebLayout.style import Font diff --git a/tests/test_html_content.py b/tests/test_html_content.py index 05cd2e9..7376c4c 100644 --- a/tests/test_html_content.py +++ b/tests/test_html_content.py @@ -10,9 +10,9 @@ from pyWebLayout.io.readers.html_content import HTMLContentReader from pyWebLayout.abstract.document import Document from pyWebLayout.abstract.block import ( Paragraph, Heading, HeadingLevel, HList, ListStyle, - Table, Quote, CodeBlock, HorizontalRule, LineBreak + Table, Quote, CodeBlock, HorizontalRule ) - +from pyWebLayout.abstract.inline import LineBreak class TestHTMLContentReader(unittest.TestCase): """Test cases for HTMLContentReader."""