mirrors/docling
1
0
Fork 0
mirror of https://github.com/DS4SD/docling.git synced 2025-07-26 20:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source 
Signed-off-by: Michael Honaker <Michael.Honaker@ibm.com>
This commit is contained in:
Michael Honaker 2025-06-25 12:12:07 -04:00
parent 1f47908bc7
commit bca8dd34b9
3 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/data/groundtruth/docling_v2/inline_and_formatting.md.md vendored
View File

@ -16,15 +16,9 @@ Create your feature branch: `git checkout -b feature/AmazingFeature` .
*# Whole heading is italic* *# Whole heading is italic*
&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
- **First** : Lorem ipsum. - **First** : Lorem ipsum.
- **Second** : Dolor `sit` amet. - **Second** : Dolor `sit` amet.
| Bold Heading | Italic Heading |
|----------------|------------------|
| data a | data b |
Some *`formatted_code`* Some *`formatted_code`*
## ##
@ -33,4 +27,8 @@ Some *`formatted_code`*
[$$E=mc^2$$](https://en.wikipedia.org/wiki/Albert_Einstein) [$$E=mc^2$$](https://en.wikipedia.org/wiki/Albert_Einstein)
origin/main ## Table Heading
| Bold Heading | Italic Heading |
|----------------|------------------|
| data a | data b |

84
tests/data/groundtruth/docling_v2/inline_and_formatting.md.yaml vendored
View File

@ -6,13 +6,13 @@ body:
- $ref: '#/groups/1' - $ref: '#/groups/1'
- $ref: '#/groups/2' - $ref: '#/groups/2'
- $ref: '#/texts/32' - $ref: '#/texts/32'
- $ref: '#/texts/33'
- $ref: '#/groups/8' - $ref: '#/groups/8'
- $ref: '#/tables/0'
- $ref: '#/groups/11' - $ref: '#/groups/11'
- $ref: '#/texts/44' - $ref: '#/texts/43'
- $ref: '#/texts/47'
- $ref: '#/texts/48' - $ref: '#/texts/48'
- $ref: '#/texts/49' - $ref: '#/groups/13'
- $ref: '#/tables/0'
content_layer: body content_layer: body
label: unspecified label: unspecified
name: _root_ name: _root_
@ -112,8 +112,8 @@ groups:
$ref: '#/texts/28' $ref: '#/texts/28'
self_ref: '#/groups/7' self_ref: '#/groups/7'
- children: - children:
- $ref: '#/texts/34' - $ref: '#/texts/33'
- $ref: '#/texts/37' - $ref: '#/texts/36'
content_layer: body content_layer: body
label: list label: list
name: list name: list
@ -121,28 +121,28 @@ groups:
$ref: '#/body' $ref: '#/body'
self_ref: '#/groups/8' self_ref: '#/groups/8'
- children: - children:
- $ref: '#/texts/34'
- $ref: '#/texts/35' - $ref: '#/texts/35'
- $ref: '#/texts/36'
content_layer: body content_layer: body
label: inline label: inline
name: group name: group
parent: parent:
$ref: '#/texts/34' $ref: '#/texts/33'
self_ref: '#/groups/9' self_ref: '#/groups/9'
- children: - children:
- $ref: '#/texts/37'
- $ref: '#/texts/38' - $ref: '#/texts/38'
- $ref: '#/texts/39' - $ref: '#/texts/39'
- $ref: '#/texts/40' - $ref: '#/texts/40'
- $ref: '#/texts/41'
content_layer: body content_layer: body
label: inline label: inline
name: group name: group
parent: parent:
$ref: '#/texts/37' $ref: '#/texts/36'
self_ref: '#/groups/10' self_ref: '#/groups/10'
- children: - children:
- $ref: '#/texts/41'
- $ref: '#/texts/42' - $ref: '#/texts/42'
- $ref: '#/texts/43'
content_layer: body content_layer: body
label: inline label: inline
name: group name: group
@ -150,19 +150,26 @@ groups:
$ref: '#/body' $ref: '#/body'
self_ref: '#/groups/11' self_ref: '#/groups/11'
- children: - children:
- $ref: '#/texts/44'
- $ref: '#/texts/45' - $ref: '#/texts/45'
- $ref: '#/texts/46' - $ref: '#/texts/46'
- $ref: '#/texts/47'
content_layer: body content_layer: body
label: inline label: inline
name: group name: group
parent: parent:
$ref: '#/texts/44' $ref: '#/texts/43'
self_ref: '#/groups/12' self_ref: '#/groups/12'
- children: []
content_layer: body
label: inline
name: group
parent:
$ref: '#/body'
self_ref: '#/groups/13'
key_value_items: [] key_value_items: []
name: inline_and_formatting name: inline_and_formatting
origin: origin:
binary_hash: 1036526097556828366 binary_hash: 14550011543526094526
filename: inline_and_formatting.md filename: inline_and_formatting.md
mimetype: text/markdown mimetype: text/markdown
pages: {} pages: {}
@ -715,16 +722,6 @@ texts:
self_ref: '#/texts/32' self_ref: '#/texts/32'
text: Whole heading is italic text: Whole heading is italic
word_items_ids: [] word_items_ids: []
- children: []
content_layer: body
label: text
orig: <<<<<<< HEAD
parent:
$ref: '#/body'
prov: []
self_ref: '#/texts/33'
text: <<<<<<< HEAD
word_items_ids: []
- children: - children:
- $ref: '#/groups/9' - $ref: '#/groups/9'
content_layer: body content_layer: body
@ -735,7 +732,7 @@ texts:
parent: parent:
$ref: '#/groups/8' $ref: '#/groups/8'
prov: [] prov: []
self_ref: '#/texts/34' self_ref: '#/texts/33'
text: '' text: ''
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -751,7 +748,7 @@ texts:
parent: parent:
$ref: '#/groups/9' $ref: '#/groups/9'
prov: [] prov: []
self_ref: '#/texts/35' self_ref: '#/texts/34'
text: First text: First
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -761,7 +758,7 @@ texts:
parent: parent:
$ref: '#/groups/9' $ref: '#/groups/9'
prov: [] prov: []
self_ref: '#/texts/36' self_ref: '#/texts/35'
text: ': Lorem ipsum.' text: ': Lorem ipsum.'
word_items_ids: [] word_items_ids: []
- children: - children:
@ -774,7 +771,7 @@ texts:
parent: parent:
$ref: '#/groups/8' $ref: '#/groups/8'
prov: [] prov: []
self_ref: '#/texts/37' self_ref: '#/texts/36'
text: '' text: ''
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -790,7 +787,7 @@ texts:
parent: parent:
$ref: '#/groups/10' $ref: '#/groups/10'
prov: [] prov: []
self_ref: '#/texts/38' self_ref: '#/texts/37'
text: Second text: Second
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -800,7 +797,7 @@ texts:
parent: parent:
$ref: '#/groups/10' $ref: '#/groups/10'
prov: [] prov: []
self_ref: '#/texts/39' self_ref: '#/texts/38'
text: ': Dolor' text: ': Dolor'
word_items_ids: [] word_items_ids: []
- captions: [] - captions: []
@ -814,7 +811,7 @@ texts:
$ref: '#/groups/10' $ref: '#/groups/10'
prov: [] prov: []
references: [] references: []
self_ref: '#/texts/40' self_ref: '#/texts/39'
text: sit text: sit
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -824,7 +821,7 @@ texts:
parent: parent:
$ref: '#/groups/10' $ref: '#/groups/10'
prov: [] prov: []
self_ref: '#/texts/41' self_ref: '#/texts/40'
text: amet. text: amet.
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -834,7 +831,7 @@ texts:
parent: parent:
$ref: '#/groups/11' $ref: '#/groups/11'
prov: [] prov: []
self_ref: '#/texts/42' self_ref: '#/texts/41'
text: Some text: Some
word_items_ids: [] word_items_ids: []
- captions: [] - captions: []
@ -854,7 +851,7 @@ texts:
$ref: '#/groups/11' $ref: '#/groups/11'
prov: [] prov: []
references: [] references: []
self_ref: '#/texts/43' self_ref: '#/texts/42'
text: formatted_code text: formatted_code
word_items_ids: [] word_items_ids: []
- children: - children:
@ -866,7 +863,7 @@ texts:
parent: parent:
$ref: '#/body' $ref: '#/body'
prov: [] prov: []
self_ref: '#/texts/44' self_ref: '#/texts/43'
text: '' text: ''
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -882,7 +879,7 @@ texts:
parent: parent:
$ref: '#/groups/12' $ref: '#/groups/12'
prov: [] prov: []
self_ref: '#/texts/45' self_ref: '#/texts/44'
text: Partially formatted text: Partially formatted
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -892,7 +889,7 @@ texts:
parent: parent:
$ref: '#/groups/12' $ref: '#/groups/12'
prov: [] prov: []
self_ref: '#/texts/46' self_ref: '#/texts/45'
text: heading to_escape text: heading to_escape
word_items_ids: [] word_items_ids: []
- captions: [] - captions: []
@ -906,7 +903,7 @@ texts:
$ref: '#/groups/12' $ref: '#/groups/12'
prov: [] prov: []
references: [] references: []
self_ref: '#/texts/47' self_ref: '#/texts/46'
text: not_to_escape text: not_to_escape
word_items_ids: [] word_items_ids: []
- children: [] - children: []
@ -917,17 +914,18 @@ texts:
parent: parent:
$ref: '#/body' $ref: '#/body'
prov: [] prov: []
self_ref: '#/texts/48' self_ref: '#/texts/47'
text: $$E=mc^2$$ text: $$E=mc^2$$
word_items_ids: [] word_items_ids: []
- children: [] - children: []
content_layer: body content_layer: body
label: text label: section_header
orig: origin/main level: 1
orig: Table Heading
parent: parent:
$ref: '#/body' $ref: '#/body'
prov: [] prov: []
self_ref: '#/texts/49' self_ref: '#/texts/48'
text: origin/main text: Table Heading
word_items_ids: [] word_items_ids: []
version: 1.4.0 version: 1.4.0

12
tests/data/md/inline_and_formatting.md vendored
View File

@ -16,17 +16,17 @@ Create your feature branch: `git checkout -b feature/AmazingFeature`.
# *Whole heading is italic* # *Whole heading is italic*
<<<<<<< HEAD
- **First**: Lorem ipsum. - **First**: Lorem ipsum.
- **Second**: Dolor `sit` amet. - **Second**: Dolor `sit` amet.
| **Bold Heading** | *Italic Heading* |
|------------------|------------------|
| data a | data b |
=======
Some *`formatted_code`* Some *`formatted_code`*
## *Partially formatted* heading to_escape `not_to_escape` ## *Partially formatted* heading to_escape `not_to_escape`
[$$E=mc^2$$](https://en.wikipedia.org/wiki/Albert_Einstein) [$$E=mc^2$$](https://en.wikipedia.org/wiki/Albert_Einstein)
>>>>>>> origin/main
## Table Heading
| **Bold Heading** | *Italic Heading* |
|------------------|------------------|
| data a | data b |