Skip to content

Changes for DEV-2649: Addendum Gen #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanamannion merged 4 commits into from
Jun 8, 2023
Merged

Changes for DEV-2649: Addendum Gen #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
302929f
DEV-2649: fix text setter for CT_DR and CT_IR
ryanamannion May 18, 2023
7cf87d1
DEV-2649: add w:shd to CT_TcPr for cell shading properties
ryanamannion May 18, 2023
96124e4
commit for 1961-rc.1 - first addendum rc version
ryanamannion May 23, 2023
f9b3b69
change version back to dev version
ryanamannion May 26, 2023
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
Binary file added dist/python-docx-1961rc1.tar.gz
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions docx/oxml/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ class CT_TcPr(BaseOxmlElement):
gridSpan = ZeroOrOne('w:gridSpan', successors=_tag_seq[3:])
tcBorders = ZeroOrOne('w:tcBorders', successors = ('w:tcPr',))
vMerge = ZeroOrOne('w:vMerge', successors=_tag_seq[5:])
shd = ZeroOrOne('w:shd', successors=_tag_seq[7:])
vAlign = ZeroOrOne('w:vAlign', successors=_tag_seq[12:])

del _tag_seq
Expand Down
10 changes: 6 additions & 4 deletions docx/oxml/text/delrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from ..ns import qn
from ..simpletypes import ST_BrClear, ST_BrType
from ..xmlchemy import (BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne)
from ..xmlchemy import (BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne, OxmlElement)


class CT_DR(BaseOxmlElement):
Expand Down Expand Up @@ -46,14 +46,16 @@ def text(self):
@text.setter
def text(self, text):
self.clear_content()
_RunContentAppender.append_to_run_from_text(self, text)
new_run = OxmlElement("w:r")
new_run.add_dt(text)
self.append(new_run)

def clear_content(self):
"""
Remove all child elements except the ``<w:rPr>`` element if present.
"""
content_child_elms = self[1:] if self.rPr is not None else self[:]
for child in content_child_elms:
# content_child_elms = self[1:] if self.rPr is not None else self[:]
for child in self[:]:
self.remove(child)

def copy_rpr(self,rprCopy):
Expand Down
10 changes: 6 additions & 4 deletions docx/oxml/text/insrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from ..ns import qn
from ..simpletypes import ST_BrClear, ST_BrType
from ..xmlchemy import (BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne)
from ..xmlchemy import (BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne, OxmlElement)


class CT_IR(BaseOxmlElement):
Expand Down Expand Up @@ -47,7 +47,9 @@ def text(self):
@text.setter
def text(self, text):
self.clear_content()
_RunContentAppender.append_to_run_from_text(self, text)
new_run = OxmlElement("w:r")
new_run.text = text
self.append(new_run)

def copy_rpr(self,rprCopy):
rPr = self._r.get_or_add_rPr()
Expand Down Expand Up @@ -86,8 +88,8 @@ def clear_content(self):
"""
Remove all child elements except the ``<w:rPr>`` element if present.
"""
content_child_elms = self[1:] if self.rPr is not None else self[:]
for child in content_child_elms:
# content_child_elms = self[1:] if self.rPr is not None else self[:]
for child in self[:]:
self.remove(child)


Expand Down