From 31c1fb65135939a9940183357a4ad68589d81bb4 Mon Sep 17 00:00:00 2001
From: Jorge <46056498+jorgectf@users.noreply.github.com>
Date: Mon, 3 Jul 2023 09:12:39 +0200
Subject: [PATCH 01/21] Add CodeQL workflow

---
 .github/workflows/codeql.yml | 65 ++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..0729ea9ef
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,65 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 'master' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 'master' ]
+  schedule:
+    - cron: '38 19 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

From bef287cd80b1ab1996f5adf021e4d2ceb22533aa Mon Sep 17 00:00:00 2001
From: Dave Pearson <davep@davep.org>
Date: Thu, 20 Jul 2023 10:55:58 +0100
Subject: [PATCH 02/21] Update isort pre-commit installation

I couldn't get it working as-was, so I stole the config from Textual and it
works.
---
 .pre-commit-config.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75b988eb6..1d27aae3f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,9 +35,10 @@ repos:
     hooks:
       - id: black
         exclude: ^benchmarks/
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
     hooks:
       - id: isort
-        exclude: ^benchmarks/
+        name: isort (python)
+        language_version: '3.11'
         args: ["--profile", "black"]

From 3089e9fb8a9363c64da144f324e668ad0b957ca9 Mon Sep 17 00:00:00 2001
From: Dave Pearson <davep@davep.org>
Date: Thu, 20 Jul 2023 10:56:32 +0100
Subject: [PATCH 03/21] Move the <html> tag to before the <head> in the export
 template

See #3021
---
 rich/_export_format.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rich/_export_format.py b/rich/_export_format.py
index 094d2dc22..998a9b0de 100644
--- a/rich/_export_format.py
+++ b/rich/_export_format.py
@@ -1,5 +1,6 @@
 CONSOLE_HTML_FORMAT = """\
 <!DOCTYPE html>
+<html>
 <head>
 <meta charset="UTF-8">
 <style>
@@ -10,7 +11,6 @@
 }}
 </style>
 </head>
-<html>
 <body>
     <pre style="font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><code>{code}</code></pre>
 </body>

From 3cf74dd1ae9fd03788d0cf4eb168246d33dd5a6e Mon Sep 17 00:00:00 2001
From: Dave Pearson <davep@davep.org>
Date: Thu, 20 Jul 2023 11:09:44 +0100
Subject: [PATCH 04/21] Update the export tests for the new template

---
 tests/test_console.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_console.py b/tests/test_console.py
index 990dce143..a3b73793c 100644
--- a/tests/test_console.py
+++ b/tests/test_console.py
@@ -529,7 +529,7 @@ def test_export_html():
     console.print("[b]foo <script> 'test' [link=https://example.org]Click[/link]")
     html = console.export_html()
     print(repr(html))
-    expected = '<!DOCTYPE html>\n<head>\n<meta charset="UTF-8">\n<style>\n.r1 {font-weight: bold}\n.r2 {color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold}\n.r3 {color: #008000; text-decoration-color: #008000; font-weight: bold}\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<html>\n<body>\n    <pre style="font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace"><code><span class="r1">foo &lt;</span><span class="r2">script</span><span class="r1">&gt; </span><span class="r3">&#x27;test&#x27;</span><span class="r1"> </span><a class="r1" href="https://example.org">Click</a>\n</code></pre>\n</body>\n</html>\n'
+    expected = '<!DOCTYPE html>\n<html>\n<head>\n<meta charset="UTF-8">\n<style>\n.r1 {font-weight: bold}\n.r2 {color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold}\n.r3 {color: #008000; text-decoration-color: #008000; font-weight: bold}\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<body>\n    <pre style="font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace"><code><span class="r1">foo &lt;</span><span class="r2">script</span><span class="r1">&gt; </span><span class="r3">&#x27;test&#x27;</span><span class="r1"> </span><a class="r1" href="https://example.org">Click</a>\n</code></pre>\n</body>\n</html>\n'
     assert html == expected
 
 
@@ -538,7 +538,7 @@ def test_export_html_inline():
     console.print("[b]foo [link=https://example.org]Click[/link]")
     html = console.export_html(inline_styles=True)
     print(repr(html))
-    expected = '<!DOCTYPE html>\n<head>\n<meta charset="UTF-8">\n<style>\n\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<html>\n<body>\n    <pre style="font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace"><code><span style="font-weight: bold">foo </span><span style="font-weight: bold"><a href="https://example.org">Click</a></span>\n</code></pre>\n</body>\n</html>\n'
+    expected = '<!DOCTYPE html>\n<html>\n<head>\n<meta charset="UTF-8">\n<style>\n\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<body>\n    <pre style="font-family:Menlo,\'DejaVu Sans Mono\',consolas,\'Courier New\',monospace"><code><span style="font-weight: bold">foo </span><span style="font-weight: bold"><a href="https://example.org">Click</a></span>\n</code></pre>\n</body>\n</html>\n'
     assert html == expected
 
 
@@ -591,7 +591,7 @@ def test_save_text():
 
 
 def test_save_html():
-    expected = "<!DOCTYPE html>\n<head>\n<meta charset=\"UTF-8\">\n<style>\n\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<html>\n<body>\n    <pre style=\"font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><code>foo\n</code></pre>\n</body>\n</html>\n"
+    expected = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<style>\n\nbody {\n    color: #000000;\n    background-color: #ffffff;\n}\n</style>\n</head>\n<body>\n    <pre style=\"font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><code>foo\n</code></pre>\n</body>\n</html>\n"
     console = Console(record=True, width=100)
     console.print("foo")
     with tempfile.TemporaryDirectory() as path:

From 7297ac9dabbacfa9107943bf8aa3e54b4f3499cd Mon Sep 17 00:00:00 2001
From: Dave Pearson <davep@davep.org>
Date: Thu, 20 Jul 2023 11:14:43 +0100
Subject: [PATCH 05/21] Update the ChangeLog

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f2d40f0..209f814f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [13.5.0] - Unreleased
+
+### Fixed
+
+- Fixed the HTML export template so that the `<html>` tag comes before the `<head>` tag https://github.com/Textualize/rich/issues/3021
+
 ## [13.4.2] - 2023-06-12
 
 ### Changed
@@ -76,7 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed failing tests due to Pygments dependency https://github.com/Textualize/rich/issues/2757
 - Relaxed ipywidgets https://github.com/Textualize/rich/issues/2767
 
-### Added 
+### Added
 
 - Added `encoding` parameter in `Theme.read`
 

From f25cb164aa792a27cc4bdc02d8edab0d9609735c Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Thu, 27 Jul 2023 17:30:38 +0100
Subject: [PATCH 06/21] tabs to space changes

---
 rich/text.py | 48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/rich/text.py b/rich/text.py
index c534b3b19..434d40dba 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -97,6 +97,21 @@ def right_crop(self, offset: int) -> "Span":
             return self
         return Span(start, min(offset, end), style)
 
+    def add_padding(self, padding: int) -> "Span":
+        """Add spaces the the end of a span.
+
+        Args:
+            padding (int): Number of additional spaces.
+
+        Returns:
+            Span: A span.
+        """
+        if padding:
+            start, end, style = self
+            return Span(start, end + padding, style)
+        else:
+            return self
+
 
 class Text(JupyterMixin):
     """Text with color / style.
@@ -549,6 +564,27 @@ def get_style_at_offset(self, console: "Console", offset: int) -> Style:
                 style += get_style(span_style, default="")
         return style
 
+    def extend_style(self, spaces: int) -> None:
+        """Extend the Text and styles by a given number of spaces.
+
+        Args:
+            spaces (int): Number of spaces to add to the Text.
+        """
+        if not spaces:
+            return
+        spans = self.spans
+        new_spaces = " " * spaces
+        if spans:
+            end_offset = len(self)
+            self._spans = [
+                span.add_padding(spaces) if span.end >= end_offset else span
+                for span in spans
+            ]
+            self._text.append(new_spaces)
+            self._length += spaces
+        else:
+            self += new_spaces
+
     def highlight_regex(
         self,
         re_highlight: str,
@@ -793,15 +829,14 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
             parts = line.split("\t", include_separator=True)
             for part in parts:
                 if part.plain.endswith("\t"):
-                    part._text = [part.plain[:-1] + " "]
-                    append(part)
+                    part.right_crop(1)
                     pos += len(part)
-                    spaces = tab_size - ((pos - 1) % tab_size) - 1
+                    spaces = tab_size - ((pos - 1) % tab_size)
                     if spaces:
-                        append(" " * spaces, _style)
+                        part.extend_style(spaces)
                         pos += spaces
-                else:
-                    append(part)
+                append(part)
+
         self._text = [result.plain]
         self._length = len(self.plain)
         self._spans[:] = result._spans
@@ -1088,7 +1123,6 @@ def divide(self, offsets: Iterable[int]) -> Lines:
         _Span = Span
 
         for span_start, span_end, style in self._spans:
-
             lower_bound = 0
             upper_bound = line_count
             start_line_no = (lower_bound + upper_bound) // 2

From 7a15d62e446050b91f1e68baafc39caf9b0b9cb3 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 09:24:13 +0100
Subject: [PATCH 07/21] refactor of tab_size

---
 rich/text.py        | 38 +++++++++++++++++++++-----------------
 tests/test_panel.py |  6 +++---
 tests/test_text.py  | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/rich/text.py b/rich/text.py
index 434d40dba..e1fd35279 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -123,7 +123,7 @@ class Text(JupyterMixin):
         overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
         no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
         end (str, optional): Character to end text with. Defaults to "\\\\n".
-        tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+        tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
         spans (List[Span], optional). A list of predefined style spans. Defaults to None.
     """
 
@@ -148,7 +148,7 @@ def __init__(
         overflow: Optional["OverflowMethod"] = None,
         no_wrap: Optional[bool] = None,
         end: str = "\n",
-        tab_size: Optional[int] = 8,
+        tab_size: Optional[int] = None,
         spans: Optional[List[Span]] = None,
     ) -> None:
         sanitized_text = strip_control_codes(text)
@@ -307,7 +307,7 @@ def from_ansi(
             overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
             no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\\\\n".
-            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
         """
         from .ansi import AnsiDecoder
 
@@ -369,7 +369,7 @@ def assemble(
             justify (str, optional): Justify method: "left", "center", "full", "right". Defaults to None.
             overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\\\\n".
-            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
             meta (Dict[str, Any], optional). Meta data to apply to text, or None for no meta data. Default to None
 
         Returns:
@@ -576,14 +576,14 @@ def extend_style(self, spaces: int) -> None:
         new_spaces = " " * spaces
         if spans:
             end_offset = len(self)
-            self._spans = [
+            self._spans[:] = [
                 span.add_padding(spaces) if span.end >= end_offset else span
                 for span in spans
             ]
             self._text.append(new_spaces)
             self._length += spaces
         else:
-            self += new_spaces
+            self.plain += new_spaces
 
     def highlight_regex(
         self,
@@ -682,7 +682,7 @@ def set_length(self, new_length: int) -> None:
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> Iterable[Segment]:
-        tab_size: int = console.tab_size or self.tab_size or 8
+        tab_size: int = console.tab_size if self.tab_size is None else self.tab_size
         justify = self.justify or options.justify or DEFAULT_JUSTIFY
 
         overflow = self.overflow or options.overflow or DEFAULT_OVERFLOW
@@ -824,18 +824,22 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
         result = self.blank_copy()
         append = result.append
 
-        _style = self.style
         for line in self.split("\n", include_separator=True):
             parts = line.split("\t", include_separator=True)
+            tab_parts: list[Text] = []
             for part in parts:
                 if part.plain.endswith("\t"):
-                    part.right_crop(1)
-                    pos += len(part)
-                    spaces = tab_size - ((pos - 1) % tab_size)
-                    if spaces:
+                    part._text[-1] = part._text[-1][:-1] + " "
+                    pos += part.cell_len
+                    tab_remainder = pos % tab_size
+                    if tab_remainder:
+                        spaces = tab_size - (pos % tab_size)
                         part.extend_style(spaces)
                         pos += spaces
-                append(part)
+                else:
+                    pos += part.cell_len
+                tab_parts.append(part)
+            append(Text("").join(tab_parts))
 
         self._text = [result.plain]
         self._length = len(self.plain)
@@ -967,7 +971,7 @@ def append(
                 self._text.append(sanitized_text)
                 offset = len(self)
                 text_length = len(sanitized_text)
-                if style is not None:
+                if style:
                     self._spans.append(Span(offset, offset + text_length, style))
                 self._length += text_length
             elif isinstance(text, Text):
@@ -977,7 +981,7 @@ def append(
                         "style must not be set when appending Text instance"
                     )
                 text_length = self._length
-                if text.style is not None:
+                if text.style:
                     self._spans.append(
                         _Span(text_length, text_length + len(text), text.style)
                     )
@@ -998,7 +1002,7 @@ def append_text(self, text: "Text") -> "Text":
         """
         _Span = Span
         text_length = self._length
-        if text.style is not None:
+        if text.style:
             self._spans.append(_Span(text_length, text_length + len(text), text.style))
         self._text.append(text.plain)
         self._spans.extend(
@@ -1025,7 +1029,7 @@ def append_tokens(
         offset = len(self)
         for content, style in tokens:
             append_text(content)
-            if style is not None:
+            if style:
                 append_span(_Span(offset, offset + len(content), style))
             offset += len(content)
         self._length = offset
diff --git a/tests/test_panel.py b/tests/test_panel.py
index a79a4a918..5ae3babee 100644
--- a/tests/test_panel.py
+++ b/tests/test_panel.py
@@ -63,9 +63,9 @@ def test_render_size():
     expected = [
         [
             Segment("╭─", Style()),
-            Segment("──────────────────────────────────", Style()),
-            Segment(" Hello ", Style()),
-            Segment("───────────────────────────────────", Style()),
+            Segment(
+                "────────────────────────────────── Hello ───────────────────────────────────"
+            ),
             Segment("─╮", Style()),
         ],
         [
diff --git a/tests/test_text.py b/tests/test_text.py
index 5f06715db..529e02d80 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -601,6 +601,44 @@ def test_tabs_to_spaces():
     assert text.plain == "No Tabs"
 
 
+@pytest.mark.parametrize(
+    "markup,tab_size,expected_text,expected_spans",
+    [
+        ("", 4, "", []),
+        ("\t", 4, "    ", []),
+        ("\tbar", 4, "    bar", []),
+        ("foo\tbar", 4, "foo bar", []),
+        (
+            "[bold]foo\tbar",
+            4,
+            "foo bar",
+            [
+                Span(0, 4, "bold"),
+                Span(4, 7, "bold"),
+            ],
+        ),
+        ("[bold]\tbar", 4, "    bar", [Span(0, 4, "bold"), Span(4, 7, "bold")]),
+        (
+            "\t[bold]bar",
+            4,
+            "    bar",
+            [
+                Span(4, 7, "bold"),
+            ],
+        ),
+    ],
+)
+def test_tabs_to_spaces_spans(
+    markup: str, tab_size: int, expected_text: str, expected_spans: list[Span]
+):
+    """Test spans are correct after expand_tabs"""
+    text = Text.from_markup(markup)
+    text.expand_tabs(tab_size)
+    print(expected_spans)
+    assert text.plain == expected_text
+    assert text._spans == expected_spans
+
+
 def test_markup_switch():
     """Test markup can be disabled."""
     console = Console(file=StringIO(), markup=False)

From 29dfa0e5c8fff7ad8a4fff4ca1adb6c56edaae08 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 09:37:01 +0100
Subject: [PATCH 08/21] tests

---
 rich/text.py       | 35 +++++++++++++++++++----------------
 tests/test_text.py | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/rich/text.py b/rich/text.py
index e1fd35279..ae5bd002d 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -817,7 +817,6 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
         """
         if "\t" not in self.plain:
             return
-        pos = 0
         if tab_size is None:
             tab_size = self.tab_size
         assert tab_size is not None
@@ -825,21 +824,25 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
         append = result.append
 
         for line in self.split("\n", include_separator=True):
-            parts = line.split("\t", include_separator=True)
-            tab_parts: list[Text] = []
-            for part in parts:
-                if part.plain.endswith("\t"):
-                    part._text[-1] = part._text[-1][:-1] + " "
-                    pos += part.cell_len
-                    tab_remainder = pos % tab_size
-                    if tab_remainder:
-                        spaces = tab_size - (pos % tab_size)
-                        part.extend_style(spaces)
-                        pos += spaces
-                else:
-                    pos += part.cell_len
-                tab_parts.append(part)
-            append(Text("").join(tab_parts))
+            cell_position = 0
+            if "\t" not in line.plain:
+                append(line)
+            else:
+                parts = line.split("\t", include_separator=True)
+                tab_parts: list[Text] = []
+                for part in parts:
+                    if part.plain.endswith("\t"):
+                        part._text[-1] = part._text[-1][:-1] + " "
+                        cell_position += part.cell_len
+                        tab_remainder = cell_position % tab_size
+                        if tab_remainder:
+                            spaces = tab_size - (cell_position % tab_size)
+                            part.extend_style(spaces)
+                            cell_position += spaces
+                    else:
+                        cell_position += part.cell_len
+                    tab_parts.append(part)
+                append(Text("").join(tab_parts))
 
         self._text = [result.plain]
         self._length = len(self.plain)
diff --git a/tests/test_text.py b/tests/test_text.py
index 529e02d80..2f0c7e667 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -608,6 +608,7 @@ def test_tabs_to_spaces():
         ("\t", 4, "    ", []),
         ("\tbar", 4, "    bar", []),
         ("foo\tbar", 4, "foo bar", []),
+        ("foo\nbar\nbaz", 4, "foo\nbar\nbaz", []),
         (
             "[bold]foo\tbar",
             4,
@@ -617,7 +618,15 @@ def test_tabs_to_spaces():
                 Span(4, 7, "bold"),
             ],
         ),
-        ("[bold]\tbar", 4, "    bar", [Span(0, 4, "bold"), Span(4, 7, "bold")]),
+        (
+            "[bold]\tbar",
+            4,
+            "    bar",
+            [
+                Span(0, 4, "bold"),
+                Span(4, 7, "bold"),
+            ],
+        ),
         (
             "\t[bold]bar",
             4,
@@ -626,6 +635,28 @@ def test_tabs_to_spaces():
                 Span(4, 7, "bold"),
             ],
         ),
+        (
+            "[red]foo\tbar\n[green]egg\tbaz",
+            8,
+            "foo     bar\negg     baz",
+            [
+                Span(0, 8, "red"),
+                Span(8, 12, "red"),
+                Span(12, 20, "red"),
+                Span(12, 20, "green"),
+                Span(20, 23, "red"),
+                Span(20, 23, "green"),
+            ],
+        ),
+        (
+            "[bold]💩\t💩",
+            8,
+            "💩      💩",
+            [
+                Span(0, 7, "bold"),
+                Span(7, 8, "bold"),
+            ],
+        ),
     ],
 )
 def test_tabs_to_spaces_spans(
@@ -634,7 +665,7 @@ def test_tabs_to_spaces_spans(
     """Test spans are correct after expand_tabs"""
     text = Text.from_markup(markup)
     text.expand_tabs(tab_size)
-    print(expected_spans)
+    print(text._spans)
     assert text.plain == expected_text
     assert text._spans == expected_spans
 

From fa0a62a72b30b29363d66bc6ce05bebd3c5c5de9 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 19:23:51 +0100
Subject: [PATCH 09/21] test double width, optimization

---
 rich/text.py       | 14 ++++++++------
 tests/test_text.py | 23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/rich/text.py b/rich/text.py
index ae5bd002d..dfb7cb810 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -821,28 +821,30 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
             tab_size = self.tab_size
         assert tab_size is not None
         result = self.blank_copy()
-        append = result.append
+
+        new_text: list[Text] = []
+        append = new_text.append
 
         for line in self.split("\n", include_separator=True):
-            cell_position = 0
             if "\t" not in line.plain:
                 append(line)
             else:
+                cell_position = 0
                 parts = line.split("\t", include_separator=True)
-                tab_parts: list[Text] = []
                 for part in parts:
                     if part.plain.endswith("\t"):
                         part._text[-1] = part._text[-1][:-1] + " "
                         cell_position += part.cell_len
                         tab_remainder = cell_position % tab_size
                         if tab_remainder:
-                            spaces = tab_size - (cell_position % tab_size)
+                            spaces = tab_size - tab_remainder
                             part.extend_style(spaces)
                             cell_position += spaces
                     else:
                         cell_position += part.cell_len
-                    tab_parts.append(part)
-                append(Text("").join(tab_parts))
+                    append(part)
+
+        result = Text("").join(new_text)
 
         self._text = [result.plain]
         self._length = len(self.plain)
diff --git a/tests/test_text.py b/tests/test_text.py
index 2f0c7e667..96c313b37 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -600,6 +600,11 @@ def test_tabs_to_spaces():
     text.expand_tabs()
     assert text.plain == "No Tabs"
 
+    text = Text("No Tabs", style="bold")
+    text.expand_tabs()
+    assert text.plain == "No Tabs"
+    assert text.style == "bold"
+
 
 @pytest.mark.parametrize(
     "markup,tab_size,expected_text,expected_spans",
@@ -648,6 +653,15 @@ def test_tabs_to_spaces():
                 Span(20, 23, "green"),
             ],
         ),
+        (
+            "[bold]X\tY",
+            8,
+            "X       Y",
+            [
+                Span(0, 8, "bold"),
+                Span(8, 9, "bold"),
+            ],
+        ),
         (
             "[bold]💩\t💩",
             8,
@@ -657,6 +671,15 @@ def test_tabs_to_spaces():
                 Span(7, 8, "bold"),
             ],
         ),
+        (
+            "[bold]💩💩💩💩\t💩",
+            8,
+            "💩💩💩💩        💩",
+            [
+                Span(0, 12, "bold"),
+                Span(12, 13, "bold"),
+            ],
+        ),
     ],
 )
 def test_tabs_to_spaces_spans(

From 0379ab83a9e8eb1a84563f59cb96beae01dcf4b0 Mon Sep 17 00:00:00 2001
From: jiaosenvip <62206110+jiaosenvip@users.noreply.github.com>
Date: Sat, 29 Jul 2023 03:14:11 +0800
Subject: [PATCH 10/21] Fix markup.rst

Fix a minor problem in the document.

There is an extra closing bracket in the document
---
 docs/source/markup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/markup.rst b/docs/source/markup.rst
index 7644bf862..e5eefc7a1 100644
--- a/docs/source/markup.rst
+++ b/docs/source/markup.rst
@@ -71,7 +71,7 @@ Escaping is important if you construct console markup dynamically, with ``str.fo
     def greet(name):
         console.print(f"Hello {name}!")
 
-Calling ``greet("Will")`` will print a greeting, but if you were to call ``greet("[blink]Gotcha![/blink]"])`` then you will also get blinking text, which may not be desirable. The solution is to escape the arguments::
+Calling ``greet("Will")`` will print a greeting, but if you were to call ``greet("[blink]Gotcha![/blink]")`` then you will also get blinking text, which may not be desirable. The solution is to escape the arguments::
 
     from rich.markup import escape
     def greet(name):

From 482dcee134c4de5c49db781f100e1e99ad84a3fd Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 21:54:04 +0100
Subject: [PATCH 11/21] tests

---
 CHANGELOG.md       | 11 +++++++++++
 rich/text.py       |  4 ++--
 tests/test_text.py | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f2d40f0..ff630ffd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## Unreleased
+
+### Fixed
+
+- Fixed Text.expand_tabs not expanding spans.
+
+### Added
+
+- Added Text.extend_style method.
+
 ## [13.4.2] - 2023-06-12
 
 ### Changed
diff --git a/rich/text.py b/rich/text.py
index dfb7cb810..946485a6f 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -565,12 +565,12 @@ def get_style_at_offset(self, console: "Console", offset: int) -> Style:
         return style
 
     def extend_style(self, spaces: int) -> None:
-        """Extend the Text and styles by a given number of spaces.
+        """Extend the Text given number of spaces where the spaces have the same style as the last character.
 
         Args:
             spaces (int): Number of spaces to add to the Text.
         """
-        if not spaces:
+        if spaces <= 0:
             return
         spans = self.spans
         new_spaces = " " * spaces
diff --git a/tests/test_text.py b/tests/test_text.py
index 96c313b37..77f0aa913 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -898,3 +898,19 @@ def test_markup_property():
         == "[bold]foo [italic]bar[/bold] baz[/italic]"
     )
     assert Text("[bold]foo").markup == "\\[bold]foo"
+
+
+def test_extend_style():
+    text = Text.from_markup("[red]foo[/red] [bold]bar")
+    text.extend_style(0)
+
+    assert text.plain == "foo bar"
+    assert text.spans == [Span(0, 3, "red"), Span(4, 7, "bold")]
+
+    text.extend_style(-1)
+    assert text.plain == "foo bar"
+    assert text.spans == [Span(0, 3, "red"), Span(4, 7, "bold")]
+
+    text.extend_style(2)
+    assert text.plain == "foo bar  "
+    assert text.spans == [Span(0, 3, "red"), Span(4, 9, "bold")]

From 96d61284ba3fca230cf41377e6f54e64b8b7dc40 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 22:04:01 +0100
Subject: [PATCH 12/21] rename method

---
 CHANGELOG.md |  1 +
 rich/text.py | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff630ffd1..2151aabc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added Text.extend_style method.
+- Added Span.extend method.
 
 ## [13.4.2] - 2023-06-12
 
diff --git a/rich/text.py b/rich/text.py
index 946485a6f..1f9c4f7cd 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -97,18 +97,18 @@ def right_crop(self, offset: int) -> "Span":
             return self
         return Span(start, min(offset, end), style)
 
-    def add_padding(self, padding: int) -> "Span":
-        """Add spaces the the end of a span.
+    def extend(self, cells: int) -> "Span":
+        """Extend the span by the given number of cells.
 
         Args:
-            padding (int): Number of additional spaces.
+            cells (int): Additional space to add to end of span.
 
         Returns:
             Span: A span.
         """
-        if padding:
+        if cells:
             start, end, style = self
-            return Span(start, end + padding, style)
+            return Span(start, end + cells, style)
         else:
             return self
 
@@ -577,7 +577,7 @@ def extend_style(self, spaces: int) -> None:
         if spans:
             end_offset = len(self)
             self._spans[:] = [
-                span.add_padding(spaces) if span.end >= end_offset else span
+                span.extend(spaces) if span.end >= end_offset else span
                 for span in spans
             ]
             self._text.append(new_spaces)

From 3215e61c12b99bf0d391d648846f74b1f748f22d Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 22:07:01 +0100
Subject: [PATCH 13/21] typing

---
 rich/text.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rich/text.py b/rich/text.py
index 1f9c4f7cd..d20bdbce8 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -822,7 +822,7 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
         assert tab_size is not None
         result = self.blank_copy()
 
-        new_text: list[Text] = []
+        new_text: List[Text] = []
         append = new_text.append
 
         for line in self.split("\n", include_separator=True):

From 40332a52e1925b5508598b66b33ddc99913bdd19 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 22:13:32 +0100
Subject: [PATCH 14/21] typing in tests

---
 tests/test_text.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_text.py b/tests/test_text.py
index 77f0aa913..22c34e442 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -1,4 +1,5 @@
 from io import StringIO
+from typing import List
 
 import pytest
 
@@ -683,7 +684,7 @@ def test_tabs_to_spaces():
     ],
 )
 def test_tabs_to_spaces_spans(
-    markup: str, tab_size: int, expected_text: str, expected_spans: list[Span]
+    markup: str, tab_size: int, expected_text: str, expected_spans: List[Span]
 ):
     """Test spans are correct after expand_tabs"""
     text = Text.from_markup(markup)

From d5b32821b835d79b1edf2a972eeeef4f1b2a883c Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Fri, 28 Jul 2023 22:15:24 +0100
Subject: [PATCH 15/21] changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2151aabc4..08352f2e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added Text.extend_style method.
 - Added Span.extend method.
 
+### Changed
+
+- Text.tab_size now defaults to `None` to indicate that Console.tab_size should be used.
+
 ## [13.4.2] - 2023-06-12
 
 ### Changed

From 293be90514e1f9ab8719826a27f1324479f5d7c1 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 08:09:42 +0100
Subject: [PATCH 16/21] remove superfluous doc

---
 rich/console.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rich/console.py b/rich/console.py
index cd6f5e57e..6e2bc4f27 100644
--- a/rich/console.py
+++ b/rich/console.py
@@ -1925,7 +1925,6 @@ def log(
             end (str, optional): String to write at end of print data. Defaults to "\\\\n".
             style (Union[str, Style], optional): A style to apply to output. Defaults to None.
             justify (str, optional): One of "left", "right", "center", or "full". Defaults to ``None``.
-            overflow (str, optional): Overflow method: "crop", "fold", or "ellipsis". Defaults to None.
             emoji (Optional[bool], optional): Enable emoji code, or ``None`` to use console default. Defaults to None.
             markup (Optional[bool], optional): Enable markup, or ``None`` to use console default. Defaults to None.
             highlight (Optional[bool], optional): Enable automatic highlighting, or ``None`` to use console default. Defaults to None.

From 368e8ad77c95a6bef8f9d332039091d1417296bc Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 08:47:25 +0100
Subject: [PATCH 17/21] fix negative time

---
 CHANGELOG.md     | 1 +
 rich/progress.py | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08352f2e6..ae674ef1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed Text.expand_tabs not expanding spans.
+- Fixed TimeElapsedColumn from showing negative.
 
 ### Added
 
diff --git a/rich/progress.py b/rich/progress.py
index 43c47eb98..2542b9ab6 100644
--- a/rich/progress.py
+++ b/rich/progress.py
@@ -681,7 +681,7 @@ def render(self, task: "Task") -> Text:
         elapsed = task.finished_time if task.finished else task.elapsed
         if elapsed is None:
             return Text("-:--:--", style="progress.elapsed")
-        delta = timedelta(seconds=int(elapsed))
+        delta = timedelta(seconds=max(0, int(elapsed)))
         return Text(str(delta), style="progress.elapsed")
 
 
@@ -710,7 +710,6 @@ def __init__(
         table_column: Optional[Column] = None,
         show_speed: bool = False,
     ) -> None:
-
         self.text_format_no_percentage = text_format_no_percentage
         self.show_speed = show_speed
         super().__init__(
@@ -1636,7 +1635,6 @@ def remove_task(self, task_id: TaskID) -> None:
 
 
 if __name__ == "__main__":  # pragma: no coverage
-
     import random
     import time
 
@@ -1689,7 +1687,6 @@ def remove_task(self, task_id: TaskID) -> None:
         console=console,
         transient=False,
     ) as progress:
-
         task1 = progress.add_task("[red]Downloading", total=1000)
         task2 = progress.add_task("[green]Processing", total=1000)
         task3 = progress.add_task("[yellow]Thinking", total=None)

From 2dc8398afa1a78e7bc4d3d17905e5fd2c82e1932 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 09:15:00 +0100
Subject: [PATCH 18/21] escape last slash

---
 rich/markup.py       |  3 ++-
 tests/test_markup.py | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/rich/markup.py b/rich/markup.py
index 0ffd056dd..953b124a2 100644
--- a/rich/markup.py
+++ b/rich/markup.py
@@ -64,6 +64,8 @@ def escape_backslashes(match: Match[str]) -> str:
         return f"{backslashes}{backslashes}\\{text}"
 
     markup = _escape(escape_backslashes, markup)
+    if markup.endswith("\\"):
+        return markup + "\\"
     return markup
 
 
@@ -226,7 +228,6 @@ def pop_style(style_name: str) -> Tuple[int, Tag]:
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     MARKUP = [
         "[red]Hello World[/red]",
         "[magenta]Hello [b]World[/b]",
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 894946b48..13835faca 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -3,7 +3,7 @@
 from rich.console import Console
 from rich.errors import MarkupError
 from rich.markup import RE_TAGS, Tag, _parse, escape, render
-from rich.text import Span
+from rich.text import Span, Text
 
 
 def test_re_no_match():
@@ -44,6 +44,18 @@ def test_escape():
     assert escape("[nil, [nil]]") == r"[nil, \[nil]]"
 
 
+def test_escape_backslash_end():
+    # https://github.com/Textualize/rich/issues/2987
+    value = "C:\\"
+    assert escape(value) == "C:\\\\"
+
+    escaped_tags = f"[red]{escape(value)}[/red]"
+    assert escaped_tags == "[red]C:\\\\[/red]"
+    escaped_text = Text.from_markup(escaped_tags)
+    assert escaped_text.plain == "C:\\"
+    assert escaped_text.spans == [Span(0, 3, "red")]
+
+
 def test_render_escape():
     console = Console(width=80, color_system=None)
     console.begin_capture()

From 58f54ca7a391c4f12a1737128e95757cc15587f9 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 09:43:21 +0100
Subject: [PATCH 19/21] trailing slash fix

---
 CHANGELOG.md   | 1 +
 rich/markup.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae674ef1b..31ce39119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed Text.expand_tabs not expanding spans.
 - Fixed TimeElapsedColumn from showing negative.
+- Fix for escaping strings with a trailing backslash https://github.com/Textualize/rich/issues/2987
 
 ### Added
 
diff --git a/rich/markup.py b/rich/markup.py
index 953b124a2..cb927edd1 100644
--- a/rich/markup.py
+++ b/rich/markup.py
@@ -64,8 +64,9 @@ def escape_backslashes(match: Match[str]) -> str:
         return f"{backslashes}{backslashes}\\{text}"
 
     markup = _escape(escape_backslashes, markup)
-    if markup.endswith("\\"):
+    if markup.endswith("\\") and not markup.endswith("\\\\"):
         return markup + "\\"
+
     return markup
 
 

From dbf66e8bb9d9391a268e4db8b0d3408a58a27da9 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 10:07:27 +0100
Subject: [PATCH 20/21] fix for markdown table

---
 CHANGELOG.md           | 1 +
 rich/markdown.py       | 8 ++++----
 tests/test_markdown.py | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31ce39119..2cac5fe54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed Text.expand_tabs not expanding spans.
 - Fixed TimeElapsedColumn from showing negative.
 - Fix for escaping strings with a trailing backslash https://github.com/Textualize/rich/issues/2987
+- Fixed exception in Markdown with partial table https://github.com/Textualize/rich/issues/3053 
 
 ### Added
 
diff --git a/rich/markdown.py b/rich/markdown.py
index e2cedfaa8..3ab4af0ed 100644
--- a/rich/markdown.py
+++ b/rich/markdown.py
@@ -259,10 +259,10 @@ def __rich_console__(
         for column in self.header.row.cells:
             table.add_column(column.content)
 
-        assert self.body is not None
-        for row in self.body.rows:
-            row_content = [element.content for element in row.cells]
-            table.add_row(*row_content)
+        if self.body is not None:
+            for row in self.body.rows:
+                row_content = [element.content for element in row.cells]
+                table.add_row(*row_content)
 
         yield table
 
diff --git a/tests/test_markdown.py b/tests/test_markdown.py
index 861665cff..1321dceab 100644
--- a/tests/test_markdown.py
+++ b/tests/test_markdown.py
@@ -133,6 +133,14 @@ def test_markdown_table():
     assert result == expected
 
 
+def test_partial_table():
+    markdown = Markdown("| Simple | Table |\n| ------ | ----- ")
+    result = render(markdown)
+    print(repr(result))
+    expected = "\n                  \n \x1b[1m \x1b[0m\x1b[1mSimple\x1b[0m\x1b[1m \x1b[0m \x1b[1m \x1b[0m\x1b[1mTable\x1b[0m\x1b[1m \x1b[0m \n ━━━━━━━━━━━━━━━━ \n                  \n"
+    assert result == expected
+
+
 if __name__ == "__main__":
     markdown = Markdown(MARKDOWN)
     rendered = render(markdown)

From 1e1a7b4c48ec207b2068dfb0fb49f0327cab98e1 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Sat, 29 Jul 2023 10:09:09 +0100
Subject: [PATCH 21/21] more defensive

---
 rich/markdown.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rich/markdown.py b/rich/markdown.py
index 3ab4af0ed..704da3010 100644
--- a/rich/markdown.py
+++ b/rich/markdown.py
@@ -254,10 +254,9 @@ def __rich_console__(
     ) -> RenderResult:
         table = Table(box=box.SIMPLE_HEAVY)
 
-        assert self.header is not None
-        assert self.header.row is not None
-        for column in self.header.row.cells:
-            table.add_column(column.content)
+        if self.header is not None and self.header.row is not None:
+            for column in self.header.row.cells:
+                table.add_column(column.content)
 
         if self.body is not None:
             for row in self.body.rows: