Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions html2docx/html2docx.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def init_p(self, attrs: List[Tuple[str, Optional[str]]]) -> None:
self.padding_left = Pt(style_decl["value"])

def finish_p(self) -> None:
if self.r is not None:
if not self.pre and self.r is not None:
self.r.text = self.r.text.rstrip()
self._reset()

Expand Down Expand Up @@ -161,7 +161,10 @@ def add_text(self, data: str) -> None:
for attrs in self.attrs:
for font_attr, value in attrs:
setattr(self.r.font, font_attr, value)
self.r.add_text(data)
if self.pre:
self.r.text = data
else:
self.r.add_text(data)

def add_list_style(self, name: str) -> None:
self.finish_p()
Expand Down
2 changes: 2 additions & 0 deletions tests/data/pre-nested-strong.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<pre>line1
<strong>line2</strong></pre>
14 changes: 14 additions & 0 deletions tests/data/pre-nested-strong.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"text": "line1\nline2",
"runs": [
{
"text": "line1\n"
},
{
"text": "line2",
"bold": true
}
]
}
]