John MacFarlaneandClaude c8ee9dc545 Docx reader: preserve non-textbox content when unwrapping textboxes. ...

Previously, when a w:p paragraph contained runs with textboxes,
the entire paragraph was replaced by just the textbox content,
discarding all other runs (including image-bearing runs).
Now we walk the paragraph's children in order, grouping
non-textbox content into copies of the original w:p and splicing
unwrapped textbox content in place, preserving the original order.

We also treat text inside a textbox containing an image as a
figure caption.  (One often finds captioned images of this
kind in docx files.)

Closes #11510.
Closes #6893.
Closes #11412.
Closes #5394.
Closes #9633.

Co-Authored-By: Claude <noreply@anthropic.com>

2026-03-14 20:12:34 +00:00

..

golden

Docx writer: properly handle nested comment spans.

2025-10-15 23:33:04 +02:00

0_level_headers.docx

…

0_level_headers.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

adjacent_codeblocks.docx

[Docx Reader] Update tests

2019-09-21 11:37:21 -07:00

adjacent_codeblocks.native

Docx reader tests: Test for combining adjacent code blocks.

2018-04-17 09:29:54 -04:00

already_auto_ident.docx

…

already_auto_ident.native

…

alternate_document_path.docx

Docx reader: Tests for alternate document.xml

2019-02-06 21:14:46 -05:00

alternate_document_path.native

Support new Underline element in readers and writers (#6277)

2020-04-28 07:53:06 -07:00

anchor_header_after_anchor.docx

Docx reader: fix anchor in header after anchor (#9626)

2024-04-18 09:32:48 -07:00

anchor_header_after_anchor.native

Docx reader: fix anchor in header after anchor (#9626)

2024-04-18 09:32:48 -07:00

block_quotes.docx

Introduce support for Intense Quote in Docx conversion

2023-05-08 08:44:29 -07:00

block_quotes.native

Rename test/docx/block_quotes_parse_indent.native for consistency

2023-05-09 11:41:42 -07:00

char_styles.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

char_styles.native

…

codeblock.docx

…

codeblock.native

…

comments_no_comments.native

…

comments_warning.docx

…

comments.docx

…

comments.native

Shared: use LineBreak as default block sep in blocksToInlines

2022-12-20 13:39:16 -08:00

compact-style-removal.docx

[Docx Reader] Use style names, not ids, for assigning semantic meaning

2019-09-21 11:18:15 -07:00

compact-style-removal.native

[Docx Reader] Use style names, not ids, for assigning semantic meaning

2019-09-21 11:18:15 -07:00

cross_reference.docx

Docx reader: Handle REF link instruction (#11296)

2025-11-30 13:49:58 +01:00

cross_reference.native

Docx reader: Handle REF link instruction (#11296)

2025-11-30 13:49:58 +01:00

custom_style.native

Docx writer tests: Add tests for custom styles

2018-01-27 11:46:41 -05:00

custom-style-no-styles.native

Docx reader tests: test custom style extension.

2018-02-22 13:05:44 -05:00

custom-style-preserve.native

Preserve built-in styles in DOCX with custom style (#5670)

2019-09-20 22:13:29 -07:00

custom-style-reference.docx

Update reference docx for docx test.

2024-05-19 19:37:30 -07:00

custom-style-roundtrip-end.native

…

custom-style-with-styles.native

[Docx Reader] Update tests

2019-09-21 11:37:21 -07:00

deep_normalize.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

deep_normalize.native

Docx reader: support task lists.

2024-06-04 15:17:43 -07:00

definition_list.docx

Fix invalid OOXML in definition_list.docx test.

2025-03-05 21:41:30 -08:00

definition_list.native

Fix invalid OOXML in definition_list.docx test.

2025-03-05 21:41:30 -08:00

diagram.docx

Docx reader: Add placeholder for word diagram

2021-09-30 12:44:44 -07:00

diagram.native

Docx reader: Add placeholder for word diagram

2021-09-30 12:44:44 -07:00

document-properties-short-desc.native

Improve writing metadata for docx, pptx and odt (#5252)

2019-01-26 16:14:35 -08:00

document-properties.native

Improve writing metadata for docx, pptx and odt (#5252)

2019-01-26 16:14:35 -08:00

drop_cap.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

drop_cap.native

…

dummy_item_after_list_item.docx

…

dummy_item_after_list_item.native

…

dummy_item_after_paragraph.docx

…

dummy_item_after_paragraph.native

…

empty_field.docx

Docx reader: fix handling of empty fields

2021-10-18 19:15:40 -07:00

empty_field.native

Docx reader: parse index references as empty Spans.

2024-12-05 10:18:48 -08:00

enumerated_headings.docx

…

enumerated_headings.native

…

german_styled_lists.docx

…

german_styled_lists.native

…

german-reference.docx

Docx writer: replace generic XML traversal with direct path navigation.

2026-01-23 23:34:03 +01:00

hanging_indent.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

hanging_indent.native

…

headers.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

headers.native

…

i18n_blocks.docx

…

i18n_blocks.native

…

image_no_embed_writer.native

…

image_no_embed.native

…

image_vml_as_object.docx

Docx reader: add handling of vml image objects (jgm#4735) (#7257)

2021-04-29 09:11:44 -07:00

image_vml_as_object.native

Docx reader: add handling of vml image objects (jgm#4735) (#7257)

2021-04-29 09:11:44 -07:00

image_vml.docx

…

image_vml.native

Avoid blockquote when parent style has more indent

2021-10-10 16:27:32 -07:00

image_with_textbox_caption.docx

Docx reader: preserve non-textbox content when unwrapping textboxes.

2026-03-14 20:12:34 +00:00

image_with_textbox_caption.native

Docx reader: preserve non-textbox content when unwrapping textboxes.

2026-03-14 20:12:34 +00:00

image_writer_test.native

Docx writer: add IDs to native_numbering test

2021-10-29 08:40:20 -07:00

image.docx

…

inline_code.docx

…

inline_code.native

…

inline_formatting_writer.native

…

inline_formatting.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

inline_formatting.native

[Docx Reader] Refactor/update smushInlines

2020-07-07 09:04:38 +03:00

inline_images_writer_test.native

Docx writer tests: Use new golden framework

2018-01-27 08:08:25 -05:00

inline_images_writer.native

…

inline_images.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

inline_images.native

…

instrText_hyperlink.docx

Docx reader: Add test for hyperlinks in instrText tag

2018-01-16 13:22:02 -05:00

instrText_hyperlink.native

Docx reader: Add test for hyperlinks in instrText tag

2018-01-16 13:22:02 -05:00

link_in_notes.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

link_in_notes.native

…

links_writer.native

…

links.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

links.native

…

lists_9994.native

Docx writer: fix regression with nested lists.

2024-07-27 21:01:00 -07:00

lists_continuing.docx

Docx writer: Add tests for list continuation.

2017-12-13 15:16:44 -05:00

lists_continuing.native

Docx writer: Add tests for list continuation.

2017-12-13 15:16:44 -05:00

lists_div_bullets.native

Docx writer: Handle bullets correctly in lists by not reusing numIds (#7822)

2022-01-11 15:48:41 -08:00

lists_level_override.docx

Docx: add test for lists with level overrides.

2018-12-10 19:24:56 -05:00

lists_level_override.native

Docx reader: Avoid spurious block quotes in list items.

2023-08-14 10:07:14 -07:00

lists_multiple_initial.native

Docx writer: better handle list items whose contents are lists (#6522)

2020-10-02 09:30:05 -07:00

lists_restarting.docx

Docx writer: Add tests for list continuation.

2017-12-13 15:16:44 -05:00

lists_restarting.native

Docx writer: Add tests for list continuation.

2017-12-13 15:16:44 -05:00

lists_sublist_reset.docx

Docx reader: fix list number resumption for sublists. Closes #4324.

2019-11-03 12:54:42 -08:00

lists_sublist_reset.native

Docx reader: fix list number resumption for sublists. Closes #4324.

2019-11-03 12:54:42 -08:00

lists_writer.native

…

lists-compact.docx

[Docx Reader] Use style names, not ids, for assigning semantic meaning

2019-09-21 11:18:15 -07:00

lists-compact.native

[Docx Reader] Use style names, not ids, for assigning semantic meaning

2019-09-21 11:18:15 -07:00

lists.docx

[Docx Reader] Update tests

2019-09-21 11:37:21 -07:00

lists.native

Docx reader: support task lists.

2024-06-04 15:17:43 -07:00

mendeley_citations_minus.native

Add mendeley citation tests.

2022-02-04 10:14:21 -08:00

mendeley_citations_plus.native

Use latest dev citeproc.

2025-10-24 23:11:26 +02:00

mendeley_citations.docx

Add mendeley citation tests.

2022-02-04 10:14:21 -08:00

metadata_after_normal.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

metadata_after_normal.native

…

metadata.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

metadata.native

…

nested_anchors_in_header.docx

…

nested_anchors_in_header.native

Docx parser: implement PAGEREF fields

2021-10-18 19:15:40 -07:00

nested_instrText.docx

Docx reader: fix handling of nested fields

2021-10-18 19:15:40 -07:00

nested_instrText.native

Docx reader: fix handling of nested fields

2021-10-18 19:15:40 -07:00

nested_sdt.docx

Docx reader: Handle nested sdt tags.

2018-02-28 16:32:20 -05:00

nested_sdt.native

Docx reader: Handle nested sdt tags.

2018-02-28 16:32:20 -05:00

nested_smart_tags.docx

Docx reader: add tests for nested smart tags.

2018-03-13 22:16:54 -04:00

nested_smart_tags.native

Docx reader: add tests for nested smart tags.

2018-03-13 22:16:54 -04:00

normalize.docx

Fix invalid XML in test/docx/normalize.docx.

2024-09-30 14:32:19 -07:00

normalize.native

…

notes.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

notes.native

…

numbered_header.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

numbered_header.native

…

overlapping_targets.docx

Docx reader: tests for overlapping targets (anchor spans).

2017-12-31 09:36:42 -05:00

overlapping_targets.native

Docx reader: tests for overlapping targets (anchor spans).

2017-12-31 09:36:42 -05:00

pageref.docx

Docx parser: implement PAGEREF fields

2021-10-18 19:15:40 -07:00

pageref.native

Docx parser: implement PAGEREF fields

2021-10-18 19:15:40 -07:00

paragraph_insertion_deletion_accept.native

Docx reader: Add tests for paragraph insertion/deletion.

2018-01-02 11:32:48 -05:00

paragraph_insertion_deletion_all.native

Docx reader: Add tests for paragraph insertion/deletion.

2018-01-02 11:32:48 -05:00

paragraph_insertion_deletion_reject.native

Docx reader: Add tests for paragraph insertion/deletion.

2018-01-02 11:32:48 -05:00

paragraph_insertion_deletion.docx

Docx reader: Add tests for paragraph insertion/deletion.

2018-01-02 11:32:48 -05:00

raw-blocks.native

Docx writer: keep raw openxml strings verbatim.

2020-12-13 14:09:59 +01:00

raw-bookmarks.native

Docx writer: keep raw openxml strings verbatim.

2020-12-13 14:09:59 +01:00

relative_indentation_blockquotes.docx

Docx reader: don't let first line indents trigger block quotes.

2021-11-02 14:04:38 -07:00

relative_indentation_blockquotes.native

Docx reader: don't let first line indents trigger block quotes.

2021-11-02 14:04:38 -07:00

sdt_elements.docx

Docx reader: add tests for structured document tags unwrapping.

2017-12-27 10:03:00 -05:00

sdt_elements.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

sdt_in_footnote.docx

Docx reader: Add test for reading sdts in footnotes.

2019-02-12 17:26:37 -05:00

sdt_in_footnote.native

Docx reader: Add test for reading sdts in footnotes.

2019-02-12 17:26:37 -05:00

special_punctuation.docx

…

special_punctuation.native

…

table_captions_no_field.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_captions_no_field.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

table_captions_with_field.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_captions_with_field.native

Docx reader: Handle REF link instruction (#11296)

2025-11-30 13:49:58 +01:00

table_gridbefore.docx

readers/docx: Support w:gridBefore table row property (#11464)

2026-02-14 14:28:03 +01:00

table_gridbefore.native

readers/docx: Support w:gridBefore table row property (#11464)

2026-02-14 14:28:03 +01:00

table_header_rowspan.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_header_rowspan.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

table_one_header_row.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_one_header_row.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

table_one_row.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_one_row.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

table_variable_width.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_variable_width.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

table_with_list_cell.docx

Revert "Docx reader and writer: support row heads."

2025-02-19 10:02:50 -08:00

table_with_list_cell.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

tables_separated_with_rawblock.native

Docx writer: Separate tables even with RawBlocks between (#7844)

2022-01-18 14:28:28 -08:00

tables-default-widths.native

Docx reader: Read table column widths.

2021-05-28 20:15:23 +02:00

tables.docx

Remove nonfree ICC profiles from thumbnails in test docx files.

2018-04-25 17:00:21 -07:00

tables.native

Docx reader: properly calculate table column widths.

2025-09-17 14:24:33 +02:00

tabs.docx

…

tabs.native

…

task_list.docx

Docx reader: support task lists.

2024-06-04 15:17:43 -07:00

task_list.native

Docx writer: better formatting for task lists.

2024-06-04 10:03:26 -07:00

text_in_shape_format.docx

Docx reader: unwrap content of shaped textboxes...

2023-11-29 18:59:09 -08:00

text_in_shape_format.native

Docx reader: unwrap content of shaped textboxes...

2023-11-29 18:59:09 -08:00

textbox_image_duplicate_encoding.docx

Docx reader: Recognize media inside textboxes (#11515)

2026-03-12 22:26:17 +01:00

textbox_image_duplicate_encoding.native

Docx reader: Recognize media inside textboxes (#11515)

2026-03-12 22:26:17 +01:00

textbox_image.docx

Docx reader: Recognize media inside textboxes (#11515)

2026-03-12 22:26:17 +01:00

textbox_image.native

Docx reader: Recognize media inside textboxes (#11515)

2026-03-12 22:26:17 +01:00

track_changes_deletion_accept.native

…

track_changes_deletion_all.native

…

track_changes_deletion_reject.native

…

track_changes_deletion.docx

…

track_changes_insertion_accept.native

…

track_changes_insertion_all.native

…

track_changes_insertion_reject.native

…

track_changes_insertion.docx

…

track_changes_move_accept.native

…

track_changes_move_all.native

…

track_changes_move_reject.native

…

track_changes_move.docx

…

track_changes_scrubbed_metadata.docx

DOCX reader: Allow empty dates in comments and tracked changes (#6726)

2020-10-06 21:03:00 -07:00

track_changes_scrubbed_metadata.native

DOCX reader: Allow empty dates in comments and tracked changes (#6726)

2020-10-06 21:03:00 -07:00

trailing_spaces_in_formatting.docx

…

trailing_spaces_in_formatting.native

…

trim_last_inline.docx

Docx reader: add tests for trimming last inline.

2019-02-18 15:49:00 -05:00

trim_last_inline.native

Docx reader: add tests for trimming last inline.

2019-02-18 15:49:00 -05:00

unicode.docx

…

unicode.native

…

unused_anchors.docx

Docx reader: tests for removing unused anchors.

2017-12-30 22:43:33 -05:00

unused_anchors.native

Docx Reader: Combine adjacent anchors.

2017-12-31 09:29:51 -05:00

verbatim_subsuper.docx

…

verbatim_subsuper.native

…

zotero_citations_minus.native

Add zotero citation test with docx-citations.

2022-02-03 21:06:48 -08:00

zotero_citations_plus.native

Use latest dev citeproc.

2025-10-24 23:11:26 +02:00

zotero_citations.docx

Add zotero citation test with docx-citations.

2022-02-03 21:06:48 -08:00