diff --git a/corpus/link-edit/internal/candidate/Open Notebook.onetoc2 b/corpus/link-edit/internal/candidate/Open Notebook.onetoc2
index 706b7e2eb20b7d88a33f1a772e96c0301474b991..45ba18c99f5934accde1640689d5e7de327b3a46 100644
Binary files a/corpus/link-edit/internal/candidate/Open Notebook.onetoc2 and b/corpus/link-edit/internal/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/link-edit/internal/candidate/links.one b/corpus/link-edit/internal/candidate/links.one
index 9cc5dedcc8cdea93cd116113909fa5aeeca20230..84df0d5240f60bfa0cbfa9f096c36f443bc3277a 100644
Binary files a/corpus/link-edit/internal/candidate/links.one and b/corpus/link-edit/internal/candidate/links.one differ
diff --git a/corpus/link-edit/internal/cold/commands.jsonl b/corpus/link-edit/internal/cold/commands.jsonl
index 99f483459bd62f15a2bf14f495f998abcfa2e1ef..984a662051e36d2500b4515cfb146959d8edcdde 100644
--- a/corpus/link-edit/internal/cold/commands.jsonl
+++ b/corpus/link-edit/internal/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-A4418B81 -ExpectedPages 2", "exit": 0, "stdout": "Read 1 sections and 2 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-AFCAA40A -ExpectedPages 2", "exit": 0, "stdout": "Read 1 sections and 2 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/link-edit/internal/cold/machine.json b/corpus/link-edit/internal/cold/machine.json
index bbf8801f4361b349e73998e36f121ac37e8aacfb..50338609cb70b105197e0e31b310783541fab241 100644
--- a/corpus/link-edit/internal/cold/machine.json
+++ b/corpus/link-edit/internal/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-a4418b81", "hostname": "ONE-M6-A4418B81"}
+{"name": "m6-afcaa40a", "hostname": "ONE-M6-AFCAA40A"}
diff --git a/corpus/link-edit/internal/cold/notebook/Open Notebook.onetoc2 b/corpus/link-edit/internal/cold/notebook/Open Notebook.onetoc2
index dfdfc3f4756aa719a5e4e6b4c8d7c39bca922112..6f76102420c18147713bc218d19661c3a29bb312 100644
Binary files a/corpus/link-edit/internal/cold/notebook/Open Notebook.onetoc2 and b/corpus/link-edit/internal/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/link-edit/internal/cold/notebook/links.one b/corpus/link-edit/internal/cold/notebook/links.one
index c2daf85762bee9b487a48667250454d1faa5a9ed..58cb030e06118b891d1f6dbe6b3c2c484ea89c64 100644
Binary files a/corpus/link-edit/internal/cold/notebook/links.one and b/corpus/link-edit/internal/cold/notebook/links.one differ
diff --git a/corpus/link-edit/internal/cold/read/environment.json b/corpus/link-edit/internal/cold/read/environment.json
index 86799bad7ebf19b99589758ceb9baa77b641c4d5..8bfa19ede8ba13a8bcc8b0b8d2ffe6992bbc6356 100644
--- a/corpus/link-edit/internal/cold/read/environment.json
+++ b/corpus/link-edit/internal/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-A4418B81",
+ "hostname": "ONE-M6-AFCAA40A",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/link-edit/internal/cold/read/hierarchy.xml b/corpus/link-edit/internal/cold/read/hierarchy.xml
index a386bc9495f54320ec819f931e8894bec190d797..8370594c9866fe0ba06ab328dcfd60e3797616d1 100644
--- a/corpus/link-edit/internal/cold/read/hierarchy.xml
+++ b/corpus/link-edit/internal/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/link-edit/internal/cold/read/page-000.xml b/corpus/link-edit/internal/cold/read/page-000.xml
index 350680605480840543665e7b1768927b126eaa20..d6a5187341e8bfd5b439efd353c14546cefd2969 100644
--- a/corpus/link-edit/internal/cold/read/page-000.xml
+++ b/corpus/link-edit/internal/cold/read/page-000.xml
@@ -1,2 +1,3 @@
-
+Link target]]>
diff --git a/corpus/link-edit/internal/cold/read/page-001.xml b/corpus/link-edit/internal/cold/read/page-001.xml
index 932908066288f0d2537155a759c57ccf92856540..01c299682d67cef5df183bdb514607e074a0ce0f 100644
--- a/corpus/link-edit/internal/cold/read/page-001.xml
+++ b/corpus/link-edit/internal/cold/read/page-001.xml
@@ -1,3 +1,2 @@
-Link target]]>
+
diff --git a/corpus/link-edit/internal/cold/run.json b/corpus/link-edit/internal/cold/run.json
index 46d54750380e3863ca25f56c1b44e8dba711073d..5a285e729c826f6251e24783fb2d67f68f39059a 100644
--- a/corpus/link-edit/internal/cold/run.json
+++ b/corpus/link-edit/internal/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/ilink",
+ "notebook": "/Users/clo/dev/one/evidence/titles/link-internal",
"expected_pages": 2,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/link-edit/internal/cold/source.json b/corpus/link-edit/internal/cold/source.json
index 439edd6ce12404fddb1b88a971314a02bc4b5d5e..9e582c5b025b250bf3fea6a5db501d77760c59e8 100644
--- a/corpus/link-edit/internal/cold/source.json
+++ b/corpus/link-edit/internal/cold/source.json
@@ -2,13 +2,13 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1604,
- "sha256": "fdee47831417ef5d21624890fe8d9f3d73a4ded56cacbbe2ebb978788786681b",
- "mtime_ns": 1789251129798178239
+ "sha256": "7cf4bd0ba068eaccb8e2d3306472ac133a08966eb9dc42cc2b4f7c3b0f44b03f",
+ "mtime_ns": 1790404368862297325
},
{
"path": "links.one",
- "bytes": 9200,
- "sha256": "16b69f8178ce8a23e37ca844b89ae736f4e2c57827205fcfc1e51501b2865d17",
- "mtime_ns": 1789251129797893821
+ "bytes": 10120,
+ "sha256": "740b61f789cd951855f67a811394b77ed1cbcb500e728d4433b1e71904ab1986",
+ "mtime_ns": 1790404368862105283
}
]
diff --git a/corpus/page-copy/candidate/Open Notebook.onetoc2 b/corpus/page-copy/candidate/Open Notebook.onetoc2
index 2e0a511b1b92e0f64c80cce4d24bafaa4926ebc2..8df257b61dd6ec1bafe1e14e67e5135018366fc5 100644
Binary files a/corpus/page-copy/candidate/Open Notebook.onetoc2 and b/corpus/page-copy/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/page-copy/candidate/copies.one b/corpus/page-copy/candidate/copies.one
index 27136800811f3d444cf209ea58b23fc9ceb5b548..040d9ca772c6ff391c46b65dcf6f0b0ba1de0cee 100644
Binary files a/corpus/page-copy/candidate/copies.one and b/corpus/page-copy/candidate/copies.one differ
diff --git a/corpus/page-copy/cold/commands.jsonl b/corpus/page-copy/cold/commands.jsonl
index e40a10bd504057a5f4e5d179dad31cf1979234ff..b6758f1b1f055e1036681f864e182c03424b0c2c 100644
--- a/corpus/page-copy/cold/commands.jsonl
+++ b/corpus/page-copy/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-33218F72 -ExpectedPages 17 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 17 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-DD3BC9D2 -ExpectedPages 17 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 17 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/page-copy/cold/machine.json b/corpus/page-copy/cold/machine.json
index ca88d7b8816422f6f811419548ca2fa34ba9c91d..60514e476fad4f968acc2815e07dda467afa8585 100644
--- a/corpus/page-copy/cold/machine.json
+++ b/corpus/page-copy/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-33218f72", "hostname": "ONE-M6-33218F72"}
+{"name": "m6-dd3bc9d2", "hostname": "ONE-M6-DD3BC9D2"}
diff --git a/corpus/page-copy/cold/notebook/Open Notebook.onetoc2 b/corpus/page-copy/cold/notebook/Open Notebook.onetoc2
index 6f08f3a38e387191947b0859f4057b56e058bca9..cd8c939066255428dae73adc33c52cb2fcffac8b 100644
Binary files a/corpus/page-copy/cold/notebook/Open Notebook.onetoc2 and b/corpus/page-copy/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/page-copy/cold/notebook/copies.one b/corpus/page-copy/cold/notebook/copies.one
index 677026c229b03b17a16d6710f12f4520b88a8d9e..df41b5bc070171702c2639b45cd592949ff98975 100644
Binary files a/corpus/page-copy/cold/notebook/copies.one and b/corpus/page-copy/cold/notebook/copies.one differ
diff --git a/corpus/page-copy/cold/read/environment.json b/corpus/page-copy/cold/read/environment.json
index 61111c96f38b218f064910d6656937eae099ee09..0bae2ed563b53a7094eaa424a7d5bb3a2f29986c 100644
--- a/corpus/page-copy/cold/read/environment.json
+++ b/corpus/page-copy/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-33218F72",
+ "hostname": "ONE-M6-DD3BC9D2",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/page-copy/cold/read/hierarchy.xml b/corpus/page-copy/cold/read/hierarchy.xml
index 461b41d26007b0c6cc8760aa9948081c52b8bd2d..96411ad5d6246d9f138c089de5bd1b5679592b0b 100644
--- a/corpus/page-copy/cold/read/hierarchy.xml
+++ b/corpus/page-copy/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-copy/cold/read/page-000.navigation.json b/corpus/page-copy/cold/read/page-000.navigation.json
index 999c7b5056164cd4b506338d91c60949c9da068e..b2cc9630cdb428ace6cdb6faa135abf85f7b4fa0 100644
--- a/corpus/page-copy/cold/read/page-000.navigation.json
+++ b/corpus/page-copy/cold/read/page-000.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Destination - Microsoft OneNote",
+ "title": "Before the file - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-000.png b/corpus/page-copy/cold/read/page-000.png
index a605a262d190860e8b3a9726cbfcfd5fbfb5b59f..4c98cff758e439869b620848c25d731a7c228633 100644
Binary files a/corpus/page-copy/cold/read/page-000.png and b/corpus/page-copy/cold/read/page-000.png differ
diff --git a/corpus/page-copy/cold/read/page-000.xml b/corpus/page-copy/cold/read/page-000.xml
index 49df7d69df513a30feb5d15d2bf291f360c4d7ce..f4a2ff0ba797c3cee44d478da8329c62c945d798 100644
--- a/corpus/page-copy/cold/read/page-000.xml
+++ b/corpus/page-copy/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-copy/cold/read/page-001.navigation.json b/corpus/page-copy/cold/read/page-001.navigation.json
index b65a0c422e83efcb89dd26be239dd1906202f810..d2b59e91271a6fdcb0b16e590b860b1146332688 100644
--- a/corpus/page-copy/cold/read/page-001.navigation.json
+++ b/corpus/page-copy/cold/read/page-001.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Before the picture - Microsoft OneNote",
+ "title": "Delete sole cell paragraph - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-001.png b/corpus/page-copy/cold/read/page-001.png
index 0885a25c4e0f1db206f23ea5bba63d1782f1be63..859366e09282c7ab06c15f7dc96b90fbecdcf198 100644
Binary files a/corpus/page-copy/cold/read/page-001.png and b/corpus/page-copy/cold/read/page-001.png differ
diff --git a/corpus/page-copy/cold/read/page-001.xml b/corpus/page-copy/cold/read/page-001.xml
index b9de3b9064ac76f8820e3271f3520c0dff320664..7dca0028bc9f9a1a5b97d4e653f28256921ea12c 100644
--- a/corpus/page-copy/cold/read/page-001.xml
+++ b/corpus/page-copy/cold/read/page-001.xml
@@ -1,4 +1,4 @@
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
-AAAAAElFTkSuQmCC
-
+Target 🦀 é Link label]]>
diff --git a/corpus/page-copy/cold/read/page-002.navigation.json b/corpus/page-copy/cold/read/page-002.navigation.json
index 666dae945adaeb59d3d5c742c7ba85778929706b..48f1601e8396f2c2f32ff0f85f3517904d41697d 100644
--- a/corpus/page-copy/cold/read/page-002.navigation.json
+++ b/corpus/page-copy/cold/read/page-002.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Indent bullet subtree - Microsoft OneNote",
+ "title": "Move numbered subtree down - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-002.png b/corpus/page-copy/cold/read/page-002.png
index d47da50b865823a76a40efece90dbfabb810ff02..61ea0db1e719869f0408504eaa6ca97c0d1e8f18 100644
Binary files a/corpus/page-copy/cold/read/page-002.png and b/corpus/page-copy/cold/read/page-002.png differ
diff --git a/corpus/page-copy/cold/read/page-002.xml b/corpus/page-copy/cold/read/page-002.xml
index 6354dc7fa36927b684bb57898b615e62ba1e5b25..8de2391fe2cd215288dc3d4ac630f8604dee92ed 100644
--- a/corpus/page-copy/cold/read/page-002.xml
+++ b/corpus/page-copy/cold/read/page-002.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-003.navigation.json b/corpus/page-copy/cold/read/page-003.navigation.json
index b8578e6a2f723044d70c505e33406a480433361c..af6bcb2175c02024ff0ca87879c85b382404985b 100644
--- a/corpus/page-copy/cold/read/page-003.navigation.json
+++ b/corpus/page-copy/cold/read/page-003.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Bullet item - Microsoft OneNote",
+ "title": "Equations below - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-003.png b/corpus/page-copy/cold/read/page-003.png
index 1a87e98aaa70d8dd720d9744a2c7953450dc376b..e215c20d5124e4f25dbc11011bcb75d16be7da4f 100644
Binary files a/corpus/page-copy/cold/read/page-003.png and b/corpus/page-copy/cold/read/page-003.png differ
diff --git a/corpus/page-copy/cold/read/page-003.xml b/corpus/page-copy/cold/read/page-003.xml
index 6142d59085d2bc8e36d735444a9579e01f2131d4..0c1184802ccd9c090d276379731887fce1cc3d2e 100644
--- a/corpus/page-copy/cold/read/page-003.xml
+++ b/corpus/page-copy/cold/read/page-003.xml
@@ -1,2 +1,3 @@
-
+x2+y2=z2]]>a+bc+d]]>Inline ]]>a1+b2]]>xi2]]>a+b]]>∫01x dx ]]>∑i=1ni ]]>x2+1]]>a+bc2]]>
diff --git a/corpus/page-copy/cold/read/page-004.navigation.json b/corpus/page-copy/cold/read/page-004.navigation.json
index d2b59e91271a6fdcb0b16e590b860b1146332688..666dae945adaeb59d3d5c742c7ba85778929706b 100644
--- a/corpus/page-copy/cold/read/page-004.navigation.json
+++ b/corpus/page-copy/cold/read/page-004.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Delete sole cell paragraph - Microsoft OneNote",
+ "title": "Indent bullet subtree - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-004.png b/corpus/page-copy/cold/read/page-004.png
index 2c489864709ee0eeb32b0101dc1d70722ca81ad2..23a983027a1943335958dc6c6634b9eab674ab77 100644
Binary files a/corpus/page-copy/cold/read/page-004.png and b/corpus/page-copy/cold/read/page-004.png differ
diff --git a/corpus/page-copy/cold/read/page-004.xml b/corpus/page-copy/cold/read/page-004.xml
index ee737109e45bbf1dc4d82e0773a0423ed635c0d2..0ebd501cdb976ad99beeeb062b70a9feebbbef91 100644
--- a/corpus/page-copy/cold/read/page-004.xml
+++ b/corpus/page-copy/cold/read/page-004.xml
@@ -1,4 +1,5 @@
-Target 🦀 é Link label]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-005.navigation.json b/corpus/page-copy/cold/read/page-005.navigation.json
index ab78af6f58f0491d903cbc8f945f3c70dbe06606..999c7b5056164cd4b506338d91c60949c9da068e 100644
--- a/corpus/page-copy/cold/read/page-005.navigation.json
+++ b/corpus/page-copy/cold/read/page-005.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Indent first subtree - Microsoft OneNote",
+ "title": "Destination - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-005.png b/corpus/page-copy/cold/read/page-005.png
index f56a82b5ad7e7c2eda2b38c788ed303a958ff14a..21d1454632f2b0813ebc8b7c4ea9f80b631291f6 100644
Binary files a/corpus/page-copy/cold/read/page-005.png and b/corpus/page-copy/cold/read/page-005.png differ
diff --git a/corpus/page-copy/cold/read/page-005.xml b/corpus/page-copy/cold/read/page-005.xml
index 1b0a3a46a89ab08addae397a1b46ccd921d412b0..0db79be190827e8ee7c13b042a49bee3470c106a 100644
--- a/corpus/page-copy/cold/read/page-005.xml
+++ b/corpus/page-copy/cold/read/page-005.xml
@@ -1,5 +1,2 @@
-Target 🦀 é Link label]]>Child]]>
+
diff --git a/corpus/page-copy/cold/read/page-006.navigation.json b/corpus/page-copy/cold/read/page-006.navigation.json
index 365ff367b3c95a498dea1ea074b6874814b85ca9..c2e498f910f1c5412d881cfd7157bb6e0f1e816a 100644
--- a/corpus/page-copy/cold/read/page-006.navigation.json
+++ b/corpus/page-copy/cold/read/page-006.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Bold \ud83e\udd80 italic e\u0301 color \u6771\u4eac - Microsoft OneNote",
+ "title": "Move cell subtree down - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-006.png b/corpus/page-copy/cold/read/page-006.png
index bac1750ff3c53958251f4f579938b3599321161e..3c5dafbe8a84de3733a1a2ade409b116c31129e2 100644
Binary files a/corpus/page-copy/cold/read/page-006.png and b/corpus/page-copy/cold/read/page-006.png differ
diff --git a/corpus/page-copy/cold/read/page-006.xml b/corpus/page-copy/cold/read/page-006.xml
index f59feb7588b8753d120af6dc3f45e8154150bf3a..76a98dc5c2756e8f8b3d6a68909dd0daacbb5d3f 100644
--- a/corpus/page-copy/cold/read/page-006.xml
+++ b/corpus/page-copy/cold/read/page-006.xml
@@ -1,20 +1,5 @@
-Bold 🦀 italic é color 東京
-End]]>Fictitious: café, 東京, مرحبا]]>
+Target 🦀 é Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-007.navigation.json b/corpus/page-copy/cold/read/page-007.navigation.json
index b2cc9630cdb428ace6cdb6faa135abf85f7b4fa0..f3ecc2514cfb245e8d524aba87942ac24e90c62e 100644
--- a/corpus/page-copy/cold/read/page-007.navigation.json
+++ b/corpus/page-copy/cold/read/page-007.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Before the file - Microsoft OneNote",
+ "title": "Delete cell subtree - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-007.png b/corpus/page-copy/cold/read/page-007.png
index 99a934c548c4888326b8f41d8c37141d08076f84..6700951faf151b8fe8636201708d3cfe827cc757 100644
Binary files a/corpus/page-copy/cold/read/page-007.png and b/corpus/page-copy/cold/read/page-007.png differ
diff --git a/corpus/page-copy/cold/read/page-007.xml b/corpus/page-copy/cold/read/page-007.xml
index 9192d32cf20c9d9ded0a6c2b0588f99e05ecad16..7b79a8860877b0c24092372de03a9417d4ffbc65 100644
--- a/corpus/page-copy/cold/read/page-007.xml
+++ b/corpus/page-copy/cold/read/page-007.xml
@@ -1,2 +1,5 @@
-
+Target 🦀 é Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-008.navigation.json b/corpus/page-copy/cold/read/page-008.navigation.json
index 2ffaf3c40700297201f6a2e70966546ef83aa74a..a4ef2b1e701a5f5af5652851cf8d82fddf764464 100644
--- a/corpus/page-copy/cold/read/page-008.navigation.json
+++ b/corpus/page-copy/cold/read/page-008.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Delete numbered subtree - Microsoft OneNote",
+ "title": "Before the table - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-008.png b/corpus/page-copy/cold/read/page-008.png
index 91bda24a040ce1679fad1b6040ec10295c2ffead..fc6ebebe6723bbfd5856e365cf44ce2093acf779 100644
Binary files a/corpus/page-copy/cold/read/page-008.png and b/corpus/page-copy/cold/read/page-008.png differ
diff --git a/corpus/page-copy/cold/read/page-008.xml b/corpus/page-copy/cold/read/page-008.xml
index 90ac110d26e3d331803da3aa3079fcb9db66e06e..955e6837aabd6827af7ef4edb9b20d0f7070197d 100644
--- a/corpus/page-copy/cold/read/page-008.xml
+++ b/corpus/page-copy/cold/read/page-008.xml
@@ -1,5 +1,2 @@
-Target 🦀 é Link label]]>Child]]>
+
diff --git a/corpus/page-copy/cold/read/page-009.navigation.json b/corpus/page-copy/cold/read/page-009.navigation.json
index af6bcb2175c02024ff0ca87879c85b382404985b..b65a0c422e83efcb89dd26be239dd1906202f810 100644
--- a/corpus/page-copy/cold/read/page-009.navigation.json
+++ b/corpus/page-copy/cold/read/page-009.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Equations below - Microsoft OneNote",
+ "title": "Before the picture - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-009.png b/corpus/page-copy/cold/read/page-009.png
index e266bbc7f9161db9138f076034cd4c313b86f3c8..ce092d4353acf4d865b1a686326466446378f743 100644
Binary files a/corpus/page-copy/cold/read/page-009.png and b/corpus/page-copy/cold/read/page-009.png differ
diff --git a/corpus/page-copy/cold/read/page-009.xml b/corpus/page-copy/cold/read/page-009.xml
index 68bf933e4a4e935aef6003424e4288f5b2a2e8b7..548c99ecc7c45f474f7803c06313277a301bd319 100644
--- a/corpus/page-copy/cold/read/page-009.xml
+++ b/corpus/page-copy/cold/read/page-009.xml
@@ -1,3 +1,4 @@
-x2+y2=z2]]>a+bc+d]]>Inline ]]>a1+b2]]>xi2]]>a+b]]>∫01x dx ]]>∑i=1ni ]]>x2+1]]>a+bc2]]>
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
+AAAAAElFTkSuQmCC
+
diff --git a/corpus/page-copy/cold/read/page-010.navigation.json b/corpus/page-copy/cold/read/page-010.navigation.json
index 48f1601e8396f2c2f32ff0f85f3517904d41697d..2ffaf3c40700297201f6a2e70966546ef83aa74a 100644
--- a/corpus/page-copy/cold/read/page-010.navigation.json
+++ b/corpus/page-copy/cold/read/page-010.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Move numbered subtree down - Microsoft OneNote",
+ "title": "Delete numbered subtree - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-010.png b/corpus/page-copy/cold/read/page-010.png
index 71beaba4366dda094b97c9cfd2cdb79d9129acad..dcf29845514a859abe299b805666bee079e710b3 100644
Binary files a/corpus/page-copy/cold/read/page-010.png and b/corpus/page-copy/cold/read/page-010.png differ
diff --git a/corpus/page-copy/cold/read/page-010.xml b/corpus/page-copy/cold/read/page-010.xml
index d04b04070c8b520ded17357b000a518f77ee923e..5569e8a0d4fd9e93e79c3ff51e0a92bbb5c665a6 100644
--- a/corpus/page-copy/cold/read/page-010.xml
+++ b/corpus/page-copy/cold/read/page-010.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-011.navigation.json b/corpus/page-copy/cold/read/page-011.navigation.json
index c1fbc1110d4cf29bc7a5645b4863263b05217e60..b8578e6a2f723044d70c505e33406a480433361c 100644
--- a/corpus/page-copy/cold/read/page-011.navigation.json
+++ b/corpus/page-copy/cold/read/page-011.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Open task - Microsoft OneNote",
+ "title": "Bullet item - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-011.png b/corpus/page-copy/cold/read/page-011.png
index 9ee0f609b9ac929e417c606961a2d6f8eec80812..8dd8214a55c351d3f75a033f9a37b841525872e8 100644
Binary files a/corpus/page-copy/cold/read/page-011.png and b/corpus/page-copy/cold/read/page-011.png differ
diff --git a/corpus/page-copy/cold/read/page-011.xml b/corpus/page-copy/cold/read/page-011.xml
index 6e950472e7284ff586d2916677d6bf1b548dfd13..65f5bdfabc0f4233619f5b7573653b06fabdd619 100644
--- a/corpus/page-copy/cold/read/page-011.xml
+++ b/corpus/page-copy/cold/read/page-011.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-copy/cold/read/page-012.navigation.json b/corpus/page-copy/cold/read/page-012.navigation.json
index c2e498f910f1c5412d881cfd7157bb6e0f1e816a..ab78af6f58f0491d903cbc8f945f3c70dbe06606 100644
--- a/corpus/page-copy/cold/read/page-012.navigation.json
+++ b/corpus/page-copy/cold/read/page-012.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Move cell subtree down - Microsoft OneNote",
+ "title": "Indent first subtree - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-012.png b/corpus/page-copy/cold/read/page-012.png
index b2fee73e41f3e5063edfde0b4ce5729f1cd2e1fd..fb3016a0f2854511478e7bf1165fbcbf2946989a 100644
Binary files a/corpus/page-copy/cold/read/page-012.png and b/corpus/page-copy/cold/read/page-012.png differ
diff --git a/corpus/page-copy/cold/read/page-012.xml b/corpus/page-copy/cold/read/page-012.xml
index 5c63c3d3e573ddd3c98d77c6d989534945615ca9..0ae977408a7fff48187158afbfb6a5beaff389da 100644
--- a/corpus/page-copy/cold/read/page-012.xml
+++ b/corpus/page-copy/cold/read/page-012.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/page-copy/cold/read/page-013.navigation.json b/corpus/page-copy/cold/read/page-013.navigation.json
index f3ecc2514cfb245e8d524aba87942ac24e90c62e..957beaafccbcba166fba87cf91fc907f33c74e81 100644
--- a/corpus/page-copy/cold/read/page-013.navigation.json
+++ b/corpus/page-copy/cold/read/page-013.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Delete cell subtree - Microsoft OneNote",
+ "title": "Beside the drawing - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-013.png b/corpus/page-copy/cold/read/page-013.png
index 34a9d1aed316156cd1036fd21436173474513ab6..9c0ffd574cbf498de0318b31c9c0f46133f93e3a 100644
Binary files a/corpus/page-copy/cold/read/page-013.png and b/corpus/page-copy/cold/read/page-013.png differ
diff --git a/corpus/page-copy/cold/read/page-013.xml b/corpus/page-copy/cold/read/page-013.xml
index 3c369a5ea6d1986ae293922c03f5480b59d23204..49c8772ae24da550298a95698487cebeb972b248 100644
--- a/corpus/page-copy/cold/read/page-013.xml
+++ b/corpus/page-copy/cold/read/page-013.xml
@@ -1,5 +1,7 @@
-Target 🦀 é Link label]]>Child]]>
+AM8CHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBACEQZIEEUj
+RiMJSBBE/wFFI0YjBQgLZU9mZ2hkaRkUMggAgB4CIeLiQTMIAPAQAovF4kFkAxVGAEAKXAWH8gln
+jCj7wnvCe8IAh/B8h4Pke8I7wnvCQAUURgBAAAAJBAUURgAAAAASABEgZQaCZUd9r0ufE8XliyT+
+gAoAESCARDH9gE3dAQMVRgBACj9AIm9GCC70WAqACQEKTAIPUq7GcA5CJYzgBRRGAIAAAAkEBRRG
+AAAAABIAESBryQ6p9QoiSLYaYOAFf0kKCgARIIBEMf2ATd0BAxVGAEAKP0Aib0YILvRYCoA=
diff --git a/corpus/page-copy/cold/read/page-014.navigation.json b/corpus/page-copy/cold/read/page-014.navigation.json
index 957beaafccbcba166fba87cf91fc907f33c74e81..002a1c45a5ba0121a28f35c11466c61b8a2aac13 100644
--- a/corpus/page-copy/cold/read/page-014.navigation.json
+++ b/corpus/page-copy/cold/read/page-014.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Beside the drawing - Microsoft OneNote",
+ "title": "A notebook created in Rust. - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-014.png b/corpus/page-copy/cold/read/page-014.png
index bc9f5393f0c343fc46c6d976d371d56b8a203575..f92db61d8852783629f4e340f2b8c4dabc9cf941 100644
Binary files a/corpus/page-copy/cold/read/page-014.png and b/corpus/page-copy/cold/read/page-014.png differ
diff --git a/corpus/page-copy/cold/read/page-014.xml b/corpus/page-copy/cold/read/page-014.xml
index e95ed1faa233bb439d6da5264e105dbc1ab804e2..60f62ed15ba4da5634cdb038f4adc09a03215fbc 100644
--- a/corpus/page-copy/cold/read/page-014.xml
+++ b/corpus/page-copy/cold/read/page-014.xml
@@ -1,7 +1,2 @@
-AM8CHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
-URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBACEQZIEEUj
-RiMJSBBE/wFFI0YjBQgLZU9mZ2hkaRkUMggAgB4CIeLiQTMIAPAQAovF4kFkAxVGAEAKXAWH8gln
-jCj7wnvCe8IAh/B8h4Pke8I7wnvCQAUURgBAAAAJBAUURgAAAAASABEgNO2fBK2iXEeJsDGBngJF
-LQoAESCAd0ywV0PdAQMVRgBACj9AIm9GCC70WAqACQEKTAIPUq7GcA5CJYzgBRRGAIAAAAkEBRRG
-AAAAABIAESDm2ofXdOgLSJUWT/x4VvZtCgARIIB3TLBXQ90BAxVGAEAKP0Aib0YILvRYCoA=
+
diff --git a/corpus/page-copy/cold/read/page-015.navigation.json b/corpus/page-copy/cold/read/page-015.navigation.json
index 002a1c45a5ba0121a28f35c11466c61b8a2aac13..c1fbc1110d4cf29bc7a5645b4863263b05217e60 100644
--- a/corpus/page-copy/cold/read/page-015.navigation.json
+++ b/corpus/page-copy/cold/read/page-015.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "A notebook created in Rust. - Microsoft OneNote",
+ "title": "Open task - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-015.png b/corpus/page-copy/cold/read/page-015.png
index 69b55b80c0927d590660231aad9a0c7e8ff7150b..38da3cca531b8b169b823f880d8d526c5deba7db 100644
Binary files a/corpus/page-copy/cold/read/page-015.png and b/corpus/page-copy/cold/read/page-015.png differ
diff --git a/corpus/page-copy/cold/read/page-015.xml b/corpus/page-copy/cold/read/page-015.xml
index 5d7053e3ce71263bbb7775a64c41fd4113d150cb..31ab0a711c5a1d3ecf35dd30e6de40dfb7efabb3 100644
--- a/corpus/page-copy/cold/read/page-015.xml
+++ b/corpus/page-copy/cold/read/page-015.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-copy/cold/read/page-016.navigation.json b/corpus/page-copy/cold/read/page-016.navigation.json
index a4ef2b1e701a5f5af5652851cf8d82fddf764464..365ff367b3c95a498dea1ea074b6874814b85ca9 100644
--- a/corpus/page-copy/cold/read/page-016.navigation.json
+++ b/corpus/page-copy/cold/read/page-016.navigation.json
@@ -6,7 +6,7 @@
"h": 600,
"error": null,
"win": {
- "title": "Before the table - Microsoft OneNote",
+ "title": "Bold \ud83e\udd80 italic e\u0301 color \u6771\u4eac - Microsoft OneNote",
"class": "Framework::CFrame",
"dialog": false
}
diff --git a/corpus/page-copy/cold/read/page-016.png b/corpus/page-copy/cold/read/page-016.png
index 01d4090ee402d3cf14100273333c46b7a7ca5c88..07f3411e4c73b57fa2ab5b215d3e7a17e433cdda 100644
Binary files a/corpus/page-copy/cold/read/page-016.png and b/corpus/page-copy/cold/read/page-016.png differ
diff --git a/corpus/page-copy/cold/read/page-016.xml b/corpus/page-copy/cold/read/page-016.xml
index e1edcf257bd581a0cda25c3d15bf276998d6ad44..43b01dc531d759a01ab0163411532580b97a00d6 100644
--- a/corpus/page-copy/cold/read/page-016.xml
+++ b/corpus/page-copy/cold/read/page-016.xml
@@ -1,2 +1,20 @@
-
+Bold 🦀 italic é color 東京
+End]]>Fictitious: café, 東京, مرحبا]]>
diff --git a/corpus/page-copy/cold/read/payloads.json b/corpus/page-copy/cold/read/payloads.json
index ae289407ebe7e1ff6123a19f938136bca64544f6..9069b3e58ab7c0715c24aa20cb3d70db920a65d7 100644
--- a/corpus/page-copy/cold/read/payloads.json
+++ b/corpus/page-copy/cold/read/payloads.json
@@ -2,9 +2,9 @@
{
"sha256": "b20a14e044e33eac39b4665e7d79813b8a3672dbbd27ed9d2e4ac866c13ec4b6",
"name": "notes 🦀.txt",
- "object": "{9E89195D-B7EC-0AC4-34FD-F47D633F0533}{1}{B0}",
+ "object": "{82855B32-C890-0FF0-3238-816FD0683ADC}{12}{B0}",
"kind": "InsertedFile",
- "page": "{62E12C49-D5FE-0850-17D5-B4DC95B736E9}{1}{B0}",
+ "page": "{0C0ECE53-81B9-0DE0-2721-D119E26F7632}{1}{B0}",
"bytes": 28
}
]
\ No newline at end of file
diff --git a/corpus/page-copy/cold/run.json b/corpus/page-copy/cold/run.json
index d7f1a4d003fadf4aea3e154c9553c35ce6a33bb3..a733729af3e3fa7b36595a45431b834be10bbec8 100644
--- a/corpus/page-copy/cold/run.json
+++ b/corpus/page-copy/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/copy",
+ "notebook": "/Users/clo/dev/one/evidence/titles/page-copy",
"expected_pages": 17,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/page-copy/cold/source.json b/corpus/page-copy/cold/source.json
index d2a8ee9c0a4a977ae4ee6d04eb6d840cb771f300..ccc18c6d7797f735139ddd61804287d4a08add4a 100644
--- a/corpus/page-copy/cold/source.json
+++ b/corpus/page-copy/cold/source.json
@@ -2,19 +2,19 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1604,
- "sha256": "acb0747c250f7bebed1e90b18d5dbbf8c32731f9287571b1e732681921fd323a",
- "mtime_ns": 1789287183577857848
+ "sha256": "61afe63a5058198015858383382d2776cecfae45b6afea1a81c7d379f8b78ca8",
+ "mtime_ns": 1790404431194548185
},
{
"path": "copies.one",
- "bytes": 185400,
- "sha256": "dcd7c226d86477adc1ad2f8da8a408ffa2b993b372517ab8d464e5746a971aac",
- "mtime_ns": 1789287183575141938
+ "bytes": 163632,
+ "sha256": "75253d18459607aee385ceb73499d3780903e39fe436132666e842fd100b8d40",
+ "mtime_ns": 1790404431191555148
},
{
"path": "expected-count.txt",
"bytes": 2,
"sha256": "4523540f1504cd17100c4835e85b7eefd49911580f8efff0599a8f283be6b9e3",
- "mtime_ns": 1789287183577930514
+ "mtime_ns": 1790404431194611352
}
]
diff --git a/corpus/page-lifecycle/creation/README.md b/corpus/page-lifecycle/creation/README.md
index fa19f5425ee7f7d144d312df11408a4f36baec8b..9d4db668ff675e1b53ab38657793a82b7756b96f 100644
--- a/corpus/page-lifecycle/creation/README.md
+++ b/corpus/page-lifecycle/creation/README.md
@@ -14,7 +14,8 @@ The retained `provenance.json` records the native capture inputs and clone remov
After building workspace examples, run `python -m unittest discover -s tools
-p test_page_creation.py -v`. It compares native XML content and character formats,
ordered identities, and complete active object graphs across each cold reopen.
-These thirteen-page comparisons need no graph normalization.
+Only `followup/cold` differs: OneNote refreshes the section's cached copies of the
+two renamed titles, which the Rust title edit leaves stale.
Export fresh Rust candidates by setting each variable to a new output directory:
diff --git a/corpus/page-lifecycle/creation/candidate/Lifecycle.one b/corpus/page-lifecycle/creation/candidate/Lifecycle.one
index 3dac230dfcad0e261e9327e945c79ed84af025b7..21fade1a0c7cbe6003d1778b0c03a2828572db5c 100644
Binary files a/corpus/page-lifecycle/creation/candidate/Lifecycle.one and b/corpus/page-lifecycle/creation/candidate/Lifecycle.one differ
diff --git a/corpus/page-lifecycle/creation/cold/notebook/Lifecycle.one b/corpus/page-lifecycle/creation/cold/notebook/Lifecycle.one
index 776a303621a5dc0fe041cfb0f6bcfb29784f5212..4aec8e2bc8464f893e674feae39701b31f338684 100644
Binary files a/corpus/page-lifecycle/creation/cold/notebook/Lifecycle.one and b/corpus/page-lifecycle/creation/cold/notebook/Lifecycle.one differ
diff --git a/corpus/page-lifecycle/creation/cold/read/hierarchy.xml b/corpus/page-lifecycle/creation/cold/read/hierarchy.xml
index 5f5f4541a71288ce6f039105b1bef2b6cc92bbce..bc48fd92326ec22b8f740a84cb7fe62f7fd104c0 100644
--- a/corpus/page-lifecycle/creation/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/creation/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-000.xml b/corpus/page-lifecycle/creation/cold/read/page-000.xml
index b74db02740bf5f6664bec471f6ceb4edfa69e947..b492c8a81b79b0ce3d4a4d3cfc692cd98e63b734 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-000.xml
@@ -1,4 +1,2 @@
-Body child 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-001.xml b/corpus/page-lifecycle/creation/cold/read/page-001.xml
index 62991791c86033a1286a58fba2ca36558e3150e6..4fb79677980bbccff281765d47bf76b098233918 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-001.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-002.xml b/corpus/page-lifecycle/creation/cold/read/page-002.xml
index a4888c4c3a60c26e6a1e7527a818fa76c0000738..e8483dc59eb4c97402427ab02c6dc117dfe4faf5 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-002.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-002.xml
@@ -1,2 +1,4 @@
-
+Body child 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-003.xml b/corpus/page-lifecycle/creation/cold/read/page-003.xml
index 0a4fa38b36604ea31858926fc28563e3d48fce5e..463cb64b35cfb733b9eee1a3c638189b97379093 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-003.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-003.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-004.xml b/corpus/page-lifecycle/creation/cold/read/page-004.xml
index 36b3f48ded7416caa1a1a3493c5ce738d378dd59..de4aeb0430fcc69595c3f2930ad39da7a8cbc6c8 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-004.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-004.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-005.xml b/corpus/page-lifecycle/creation/cold/read/page-005.xml
index 2841ac8de01c2941a57d6a5781785ce87c58f233..34d5f049a21055a989fe1565a3b597bff488cbe0 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-005.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-005.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-006.xml b/corpus/page-lifecycle/creation/cold/read/page-006.xml
index 9e25e11773ae0c3c673cf196ba3c8d353f9cf201..844a2450dfd933478a6b137b674de2fb86e6a30b 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-006.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-006.xml
@@ -1,4 +1,4 @@
-Body grandchild 🦀 éBody parent 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-007.xml b/corpus/page-lifecycle/creation/cold/read/page-007.xml
index d4d158edf3e7f04a47d7e6fe30985c6e43b4eba8..8658d51408df8406262094c4b8323bfb8d3a34eb 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-007.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-007.xml
@@ -1,4 +1,4 @@
-Body parent 🦀 éBody grandchild 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-008.xml b/corpus/page-lifecycle/creation/cold/read/page-008.xml
index 8f25f7fb29c1de845d267ae0a7432186062da69a..c49d59bb7e3ffae13e462c53547d1154902f74f2 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-008.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-008.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/cold/read/page-009.xml b/corpus/page-lifecycle/creation/cold/read/page-009.xml
index 9bb9dde27336654424657d5c9e644849d564507d..df7fdefc0b368fd984624230350c235f8129c47b 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-009.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-009.xml
@@ -1,4 +1,4 @@
-Body duplicate 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-010.xml b/corpus/page-lifecycle/creation/cold/read/page-010.xml
index 265b775930e7d1769f636d1662b677a553696018..d8d4814e93eb9ce21e6730264e8311b6a85a6a1c 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-010.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-010.xml
@@ -1,4 +1,4 @@
-Body automatic 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-011.xml b/corpus/page-lifecycle/creation/cold/read/page-011.xml
index 7c03f6ae8fca64df7719f2b108cb98ceb5ba8e83..f036410c986d346af08729b51dc87120adbde37f 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-011.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-011.xml
@@ -1,2 +1,4 @@
-
+Body trailing 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/cold/read/page-012.xml b/corpus/page-lifecycle/creation/cold/read/page-012.xml
index 9890c342b59f523cac95cb9193722bad8b6ca62e..08ec67c593b4d218691ff08ff848acc7695a2357 100644
--- a/corpus/page-lifecycle/creation/cold/read/page-012.xml
+++ b/corpus/page-lifecycle/creation/cold/read/page-012.xml
@@ -1,4 +1,2 @@
-Body trailing 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/followup/Lifecycle.one b/corpus/page-lifecycle/creation/followup/Lifecycle.one
index b6f78fe9a2da590e540d55a842742eb36fe7d173..7ae80a1404a39096e4cb367ca26393c1b0a13ed0 100644
Binary files a/corpus/page-lifecycle/creation/followup/Lifecycle.one and b/corpus/page-lifecycle/creation/followup/Lifecycle.one differ
diff --git a/corpus/page-lifecycle/creation/followup/cold/notebook/Lifecycle.one b/corpus/page-lifecycle/creation/followup/cold/notebook/Lifecycle.one
index 206670d8221019c61e7133b8626a14c837a5d3f1..ad994356d76a70f11cfda7793c23fe86ee52bd11 100644
Binary files a/corpus/page-lifecycle/creation/followup/cold/notebook/Lifecycle.one and b/corpus/page-lifecycle/creation/followup/cold/notebook/Lifecycle.one differ
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/hierarchy.xml b/corpus/page-lifecycle/creation/followup/cold/read/hierarchy.xml
index f7d9ebde7686be747df76426cc89501e37dcee14..d165c5ccbf6b95acadc5a27f054773c746887ca7 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-000.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-000.xml
index 4742bf7a49b14bfeaec07003c7b4f461063d324a..dbbfed83ec7c7a62f275b14c57ddfaef8600e788 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-000.xml
@@ -1,4 +1,4 @@
-Body child 🦀 éBody duplicate 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-001.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-001.xml
index a2161a614bca5619a0c11e013b97c1610daeb6c0..a161e6aeef2339667be87384a2c756ee94c53fc5 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-001.xml
@@ -1,2 +1,4 @@
-
+Body automatic 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-002.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-002.xml
index 8ae4e38d376aafaf3afe54f4fc83bcb156f694ef..e2530a2c17599cf93dee7fdf5b4081acc1f5b7c3 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-002.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-002.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-003.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-003.xml
index 8068f394f7b8bfa45dc97905c4c1f3e69ce07354..17b766ec3e072f56bdf8e38c71e5e5432bae908e 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-003.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-003.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-004.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-004.xml
index 9fa30270c14770a10545f36ef6b13e509c2bb1e0..b5ac4f9604e56acbfe35508d09f7c3b5e3258d34 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-004.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-004.xml
@@ -1,2 +1,4 @@
-
+Body trailing 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-005.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-005.xml
index 0edd9bcab1194c3d9d1e8e688c7975b2beebd093..eb2ed443a5c71207c5343cac2033fbfd60404b12 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-005.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-005.xml
@@ -1,2 +1,4 @@
-
+Body child 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-006.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-006.xml
index 4b64cee072f1fd557c142d26e335f3d8307cd2f1..55781eb83ad2a8e894ed9dd7a384f2cf333979d5 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-006.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-006.xml
@@ -1,4 +1,2 @@
-Body parent 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-007.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-007.xml
index d4fad8b51dc23795d32144dea512a0308d6bb8f1..3925ae6eefe15d93fcc7d1542616454903e4bbc3 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-007.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-007.xml
@@ -1,4 +1,2 @@
-Body grandchild 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-008.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-008.xml
index d26253e67ff7df8de34f3f04b9c19fd71b09ee97..0deaac98434c9ba695544964057d6b59f23b409d 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-008.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-008.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-009.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-009.xml
index 5457a4e122714c0a67224ed80bc9ec1a7aba3b4f..a21030ff8508327c1cb760bf8bf7d926f2005430 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-009.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-009.xml
@@ -1,4 +1,2 @@
-Body duplicate 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-010.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-010.xml
index e756008ceb91813adc6f64b434c7f1a84ac5bf4a..2fadaf2837df7783d6d9e5cd6092d1e8700ccbd1 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-010.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-010.xml
@@ -1,4 +1,4 @@
-Body automatic 🦀 éBody parent 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-011.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-011.xml
index 42ea81a0966b70ee621212a3552ae3ae90be0989..212962b145c8efc8c21b0056de839ffbbb9f8a13 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-011.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-011.xml
@@ -1,2 +1,4 @@
-
+Body grandchild 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/followup/cold/read/page-012.xml b/corpus/page-lifecycle/creation/followup/cold/read/page-012.xml
index 9abc381b9155abd5962d1a4f8c41d4d78862067d..e7557b4fc7eb0e6f0039001de64d1da47c3899fe 100644
--- a/corpus/page-lifecycle/creation/followup/cold/read/page-012.xml
+++ b/corpus/page-lifecycle/creation/followup/cold/read/page-012.xml
@@ -1,4 +1,2 @@
-Body trailing 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/hierarchy.xml b/corpus/page-lifecycle/creation/native/cold/read/hierarchy.xml
index 4836e778e6af3fff3797afe9cad4ffcee75bb427..7dbaf0b8561d3f783dc5c695f882f24afac2267a 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-000.xml b/corpus/page-lifecycle/creation/native/cold/read/page-000.xml
index 30e03f8c5d7c32095c10ab54d530f2834febf2c7..a59bdaeadd50460309f0efe84c48b2eabe8dbfc4 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-001.xml b/corpus/page-lifecycle/creation/native/cold/read/page-001.xml
index 686a57f9a0006bf55f61dffc6ef0b48bd1ff2c31..7065539456b28671fcdddd6b92f4e3017f4c94f1 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-001.xml
@@ -1,4 +1,4 @@
-Body grandchild 🦀 éBody automatic 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-002.xml b/corpus/page-lifecycle/creation/native/cold/read/page-002.xml
index bf6f1f3285ced61f86352de7d9720ce3902b66a5..6dabe06117d34b3760d7cf6bed72b48559cd1941 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-002.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-002.xml
@@ -1,4 +1,4 @@
-Body parent 🦀 éBody duplicate 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-003.xml b/corpus/page-lifecycle/creation/native/cold/read/page-003.xml
index b4a0399dc12d1b401c358ef95898a6f7e7e9dd02..2faec065df993d24970b491a8816448e362b31e3 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-003.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-003.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-004.xml b/corpus/page-lifecycle/creation/native/cold/read/page-004.xml
index bdde6f6c2dafbe40a1af2fdc132ae2ad526a51b0..2f1ec7b325e0fd25d376390b43916f3b1b62811a 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-004.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-004.xml
@@ -1,4 +1,4 @@
-Body child 🦀 éBody trailing 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-005.xml b/corpus/page-lifecycle/creation/native/cold/read/page-005.xml
index 556edf47723978c3db8c7ed78d6d841ad73fdde9..47934eb482a03b9b33aafa9478e89de3de572e97 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-005.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-005.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-006.xml b/corpus/page-lifecycle/creation/native/cold/read/page-006.xml
index a7314ac9046523033e145cb67980fbb75e4b4cd1..a770819567fac575f2e548e83e41afbfb994c641 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-006.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-006.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-007.xml b/corpus/page-lifecycle/creation/native/cold/read/page-007.xml
index 1af4f16e7bd0db14f4ba7f8d1679d336822795b3..e8de592fcdf1952dc895d413de4026a36e01a74c 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-007.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-007.xml
@@ -1,2 +1,4 @@
-
+Body child 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-008.xml b/corpus/page-lifecycle/creation/native/cold/read/page-008.xml
index 7464cc7dc7fea87e99960b6ad14fb2cceff20be4..6a4e27b31a7424a5203ef85f6c058c2cdc16b649 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-008.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-008.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-009.xml b/corpus/page-lifecycle/creation/native/cold/read/page-009.xml
index c8d4a0a8ed5b1ad9a362afce806bc09ed4008621..8da13b7591c392e2f14f678e8fe26a9dca2beb32 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-009.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-009.xml
@@ -1,2 +1,4 @@
-
+Body grandchild 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-010.xml b/corpus/page-lifecycle/creation/native/cold/read/page-010.xml
index 2ac049eeed39fea44ae2da23e392b7591f1b06b7..1ad1dd2b9ff61ba067cdce0cdad172272bbcf521 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-010.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-010.xml
@@ -1,4 +1,4 @@
-Body trailing 🦀 éBody parent 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-011.xml b/corpus/page-lifecycle/creation/native/cold/read/page-011.xml
index 43386377e0063d58ee24dd56f0f58a8a856daccd..aa7367aba295cf4e5c403856dbb77e8050129d6d 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-011.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-011.xml
@@ -1,4 +1,2 @@
-Body duplicate 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/cold/read/page-012.xml b/corpus/page-lifecycle/creation/native/cold/read/page-012.xml
index d8b4366fe460f248ae133fd9ec8fd8e3e7c70568..f23f4521cb5a6e1ccaeeda7e4747ab4d8d4eca7a 100644
--- a/corpus/page-lifecycle/creation/native/cold/read/page-012.xml
+++ b/corpus/page-lifecycle/creation/native/cold/read/page-012.xml
@@ -1,4 +1,2 @@
-Body automatic 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/notebook/Lifecycle.one b/corpus/page-lifecycle/creation/native/notebook/Lifecycle.one
index b60dfff4780a6d8dd3826fc2a515033d2e5f0cae..4da1d1ebbdd8fa95595532683b62cd746fe610c7 100644
Binary files a/corpus/page-lifecycle/creation/native/notebook/Lifecycle.one and b/corpus/page-lifecycle/creation/native/notebook/Lifecycle.one differ
diff --git a/corpus/page-lifecycle/creation/native/read/hierarchy.xml b/corpus/page-lifecycle/creation/native/read/hierarchy.xml
index 46f7de2e422eaa62f29644d33dd752fb0527c358..4552d8eb47dfa4b537ce7888ef9cb73c5c4b467a 100644
--- a/corpus/page-lifecycle/creation/native/read/hierarchy.xml
+++ b/corpus/page-lifecycle/creation/native/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-000.xml b/corpus/page-lifecycle/creation/native/read/page-000.xml
index b8cab291fd9a7f09e47daa1b311825a5035b039e..d2370cf0a49df31c9fbe7fbe5dec43934fcecfb9 100644
--- a/corpus/page-lifecycle/creation/native/read/page-000.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-000.xml
@@ -1,4 +1,4 @@
-Body trailing 🦀 éBody automatic 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-001.xml b/corpus/page-lifecycle/creation/native/read/page-001.xml
index 3015c50816186e839b87dc7dc7d59d73f27fc535..78125d32d765915cb5aa74a60f02b07a9c50659d 100644
--- a/corpus/page-lifecycle/creation/native/read/page-001.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-001.xml
@@ -1,2 +1,4 @@
-
+Body duplicate 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-002.xml b/corpus/page-lifecycle/creation/native/read/page-002.xml
index d7f2c174e35a8ae7f7eb175293702d85748e8bf5..ffa4360d97156d819bf97f6d42dbbf96ff726907 100644
--- a/corpus/page-lifecycle/creation/native/read/page-002.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-002.xml
@@ -1,4 +1,2 @@
-Body duplicate 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-003.xml b/corpus/page-lifecycle/creation/native/read/page-003.xml
index e9d43bf99f32856357e6bbd970d6bcc248cd6111..ed196f7333f0c1c6f656c310f0f261540685cd62 100644
--- a/corpus/page-lifecycle/creation/native/read/page-003.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-003.xml
@@ -1,4 +1,2 @@
-Body automatic 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-004.xml b/corpus/page-lifecycle/creation/native/read/page-004.xml
index 8ed9596a931a9c3ce235802b6c4b981ca388cb89..187129655d4ff01f40b971f5687b8503b4073177 100644
--- a/corpus/page-lifecycle/creation/native/read/page-004.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-004.xml
@@ -1,2 +1,4 @@
-
+Body trailing 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-005.xml b/corpus/page-lifecycle/creation/native/read/page-005.xml
index 3b4a678ee36c1430ad8c7de33bb226d2b7ec9b0f..ed2d0dd32565a97d2f68b141b5bf3f91cde13356 100644
--- a/corpus/page-lifecycle/creation/native/read/page-005.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-005.xml
@@ -1,2 +1,4 @@
-
+Body child 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-006.xml b/corpus/page-lifecycle/creation/native/read/page-006.xml
index 4693795ee03c300bd507cb4737d8c9550f6d24bf..8780287b59993770300fb4b424df6f9b173cea4d 100644
--- a/corpus/page-lifecycle/creation/native/read/page-006.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-006.xml
@@ -1,4 +1,2 @@
-Body grandchild 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-007.xml b/corpus/page-lifecycle/creation/native/read/page-007.xml
index e818ae26b54fd7bd9b60249de373bceaaa087704..c1199952f09c49e30c8391ec57144e7d47acbb89 100644
--- a/corpus/page-lifecycle/creation/native/read/page-007.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-007.xml
@@ -1,4 +1,2 @@
-Body parent 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-008.xml b/corpus/page-lifecycle/creation/native/read/page-008.xml
index b4ce7a9d9152ced7d6a6790478ac895cf31e2af5..f2b6df04d4201ae224dc2a8b16d16e6d9bb053ed 100644
--- a/corpus/page-lifecycle/creation/native/read/page-008.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-008.xml
@@ -1,2 +1,4 @@
-
+Body parent 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-009.xml b/corpus/page-lifecycle/creation/native/read/page-009.xml
index 5ef8f5a66daa4a3e9e8d60818bfff6dccb6a319f..7b05e62f652b9d353dffdf6f73685c9acc9a58af 100644
--- a/corpus/page-lifecycle/creation/native/read/page-009.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-009.xml
@@ -1,2 +1,4 @@
-
+Body grandchild 🦀 é preserved]]>
diff --git a/corpus/page-lifecycle/creation/native/read/page-010.xml b/corpus/page-lifecycle/creation/native/read/page-010.xml
index 34434e16da993550ce35f3520fcfa45a2178e281..f8a553b980acb5604158467c8b0c26cc7e1d4177 100644
--- a/corpus/page-lifecycle/creation/native/read/page-010.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-010.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-011.xml b/corpus/page-lifecycle/creation/native/read/page-011.xml
index b97f3354d80313f0e6a5c44e57a4b0a46c29f6c8..6cd4634ce2fef847c1c977a2a34cbfd8d3b09568 100644
--- a/corpus/page-lifecycle/creation/native/read/page-011.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-011.xml
@@ -1,4 +1,2 @@
-Body child 🦀 é preserved]]>
+
diff --git a/corpus/page-lifecycle/creation/native/read/page-012.xml b/corpus/page-lifecycle/creation/native/read/page-012.xml
index 5873da638217cf192a44a47a46ceb3eb70532f23..2328d804775a25e02a6ebbc1b01a4b813f19e372 100644
--- a/corpus/page-lifecycle/creation/native/read/page-012.xml
+++ b/corpus/page-lifecycle/creation/native/read/page-012.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/creation/provenance.json b/corpus/page-lifecycle/creation/provenance.json
index 09523b2d417a016d27dd110a7251ccc4491d729b..1ae1ed5c6450e59ba14211c7d5ee4fa4a680a8a9 100644
--- a/corpus/page-lifecycle/creation/provenance.json
+++ b/corpus/page-lifecycle/creation/provenance.json
@@ -1,8 +1,8 @@
{
"cold": {
- "capture": "evidence/m10/page-create-cold",
+ "capture": "evidence/titles/cold-creation",
"run": {
- "notebook": "/Users/clo/dev/one/evidence/m10/page-create-candidate",
+ "notebook": "/Users/clo/dev/one/evidence/titles/creation",
"expected_pages": 13,
"author": null,
"author_timeout_seconds": 600,
@@ -20,17 +20,17 @@
}
},
"machine": {
- "name": "m6-4b25125e",
- "hostname": "ONE-M6-4B25125E"
+ "name": "m6-5472ef31",
+ "hostname": "ONE-M6-5472EF31"
},
"teardown": {
"absent": true
}
},
"native": {
- "capture": "evidence/m10/page-create-native-edit",
+ "capture": "evidence/titles/native",
"run": {
- "notebook": "/Users/clo/dev/one/evidence/m10/page-create-cold/notebook",
+ "notebook": "/Users/clo/dev/one/evidence/titles/native-in",
"expected_pages": 13,
"author": "tools/native/created-pages.ps1",
"author_timeout_seconds": 600,
@@ -49,17 +49,17 @@
}
},
"machine": {
- "name": "m6-71dafa89",
- "hostname": "ONE-M6-71DAFA89"
+ "name": "m6-ba7e55f4",
+ "hostname": "ONE-M6-BA7E55F4"
},
"teardown": {
"absent": true
}
},
"native/cold": {
- "capture": "evidence/m10/page-create-native-edit-cold",
+ "capture": "evidence/titles/native-cold",
"run": {
- "notebook": "/Users/clo/dev/one/evidence/m10/page-create-native-edit/notebook",
+ "notebook": "/Users/clo/dev/one/evidence/titles/native/notebook",
"expected_pages": 13,
"author": null,
"author_timeout_seconds": 600,
@@ -77,17 +77,17 @@
}
},
"machine": {
- "name": "m6-eabc83c1",
- "hostname": "ONE-M6-EABC83C1"
+ "name": "m6-426eea56",
+ "hostname": "ONE-M6-426EEA56"
},
"teardown": {
"absent": true
}
},
"followup/cold": {
- "capture": "evidence/m10/page-create-rust-followup-cold",
+ "capture": "evidence/titles/followup-cold",
"run": {
- "notebook": "/Users/clo/dev/one/evidence/m10/page-create-rust-followup",
+ "notebook": "/Users/clo/dev/one/evidence/titles/followup",
"expected_pages": 13,
"author": null,
"author_timeout_seconds": 600,
@@ -105,8 +105,8 @@
}
},
"machine": {
- "name": "m6-5a91d9d1",
- "hostname": "ONE-M6-5A91D9D1"
+ "name": "m6-44be46f3",
+ "hostname": "ONE-M6-44BE46F3"
},
"teardown": {
"absent": true
diff --git a/corpus/page-lifecycle/offline-creation/candidate/pages.one b/corpus/page-lifecycle/offline-creation/candidate/pages.one
index 128dcb4b988fd6a590f0b2295ad69e66745727cd..2cd97851d34d1b3dbe3349cee86190438bf38fa4 100644
Binary files a/corpus/page-lifecycle/offline-creation/candidate/pages.one and b/corpus/page-lifecycle/offline-creation/candidate/pages.one differ
diff --git a/corpus/page-lifecycle/offline-creation/cold/notebook/pages.one b/corpus/page-lifecycle/offline-creation/cold/notebook/pages.one
index d2b161ceb75989c1955371ce4b86ad8608fe150e..9fbf9f654ed785b96333bdf0a1c5842edda739b5 100644
Binary files a/corpus/page-lifecycle/offline-creation/cold/notebook/pages.one and b/corpus/page-lifecycle/offline-creation/cold/notebook/pages.one differ
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/hierarchy.xml b/corpus/page-lifecycle/offline-creation/cold/read/hierarchy.xml
index 5853659977987a61b6cbfa87659e645a49a4ebf6..1c706763620d507a24fba0e60db8622eed51151f 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-000.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-000.xml
index 4ab89e04f2fb00acbdd2a18accaccb210afb3fee..ec6761ffda00b5544bf76ea62c57aa4fbb8c7fd6 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-001.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-001.xml
index 6b2c687bb6cd5a4847c34c13ab97ccfa8b5942bd..5db0a537d32bf665e74be1f48fca9983b12841c4 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-001.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-002.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-002.xml
index 0cb80c3d598a97b3cf49f24517a50fe2003ca836..db38cc8c49b979b8415288a444748aee86922f34 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-002.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-002.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-003.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-003.xml
index 624ae72aef85046aae879bee4ba2366afe55af26..4c48621d9b6a439e9ee44210dca913ec1167dc03 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-003.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-003.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-004.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-004.xml
index 1866dec8c32dc4c15942d5dfdab07a6e741ab2e1..9d1c7952917053cbba7dbaa69a5ffc2ef3b52996 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-004.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-004.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-005.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-005.xml
index 72e2c7cbe3e6e6756b6c083e2e3731efd353de3c..a6b05139112bb4318ed931239ac9bfcf17f2b211 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-005.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-005.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-006.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-006.xml
index 77aec796dcc1d229296a99cae0a838ff0f2ede48..a90d08186d36da8b5b0d04be751d24ce766ad7be 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-006.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-006.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-007.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-007.xml
index 93079149c7b678adb6d125cbe07702ef714eb97b..ca8ed1ae862d5999e74e841e57aae17dfdae9e2a 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-007.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-007.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-008.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-008.xml
index 692f7fc332401b10fbfbfdc37a2a8218d7a7f2d0..f28d38abadb51a0b12507bc9ad2a509022e6b3e3 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-008.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-008.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-009.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-009.xml
index 3795d7efedb3e73366f3ccd9ee86a994658a5e12..8628c0abc366410bb5f77f92c9c7ada871d515aa 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-009.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-009.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-010.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-010.xml
index befb1525c176e8b6807fbf0fc38d5af6c92deaaf..dbd5c8a14997c3f26fccb33e650e6d4d4ade78dd 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-010.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-010.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-011.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-011.xml
index 84ecfebaf488eeb483fc2710b6b56c2d8d29f33a..9e6d5d33f8045cda9351de793652ecb7bd42bb45 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-011.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-011.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/cold/read/page-012.xml b/corpus/page-lifecycle/offline-creation/cold/read/page-012.xml
index 84591ddf147a5a290d835bc4d34deb0a2a49ffe4..e71a6d17dfef9d67fc34753558a8026171cce110 100644
--- a/corpus/page-lifecycle/offline-creation/cold/read/page-012.xml
+++ b/corpus/page-lifecycle/offline-creation/cold/read/page-012.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-creation/provenance.json b/corpus/page-lifecycle/offline-creation/provenance.json
index 09bde4165d3cb3ebc9fe348505bd3f09734a3993..a847b2f8ed1f7b32276ca7e25b710fc28cc6de8c 100644
--- a/corpus/page-lifecycle/offline-creation/provenance.json
+++ b/corpus/page-lifecycle/offline-creation/provenance.json
@@ -1,6 +1,6 @@
{
"run": {
- "notebook": "/Users/clo/dev/one/evidence/m10/offline-page-candidate",
+ "notebook": "/Users/clo/dev/one/evidence/titles/offline-creation",
"expected_pages": 13,
"author": null,
"author_timeout_seconds": 600,
@@ -18,8 +18,8 @@
}
},
"machine": {
- "name": "m6-cc15a5ee",
- "hostname": "ONE-M6-CC15A5EE"
+ "name": "m6-4d84f1a7",
+ "hostname": "ONE-M6-4D84F1A7"
},
"teardown": {
"absent": true
diff --git a/corpus/page-lifecycle/offline-edits/provenance.json b/corpus/page-lifecycle/offline-edits/provenance.json
index ae245465bbd18b4b6b21b86cbe05f39631e8dd27..6edd1246a572f0a42fa29cb1768acbd898e8c186 100644
--- a/corpus/page-lifecycle/offline-edits/provenance.json
+++ b/corpus/page-lifecycle/offline-edits/provenance.json
@@ -633,7 +633,7 @@
},
"twelve-clients": {
"run": {
- "notebook": "/private/tmp/m33/page-clients2/candidate",
+ "notebook": "/Users/clo/dev/one/evidence/titles/twelve-clients",
"expected_pages": 37,
"author": null,
"author_timeout_seconds": 600,
@@ -651,18 +651,24 @@
}
},
"machine": {
- "name": "m6-16c2e4d4",
- "hostname": "ONE-M6-16C2E4D4"
+ "name": "m6-8eabb42e",
+ "hostname": "ONE-M6-8EABB42E"
},
"teardown": {
"absent": true
},
"source": [
+ {
+ "path": "manifest.json",
+ "bytes": 292907,
+ "sha256": "fea1d64b22da84d023d4c9014175f8e92a13acba099c7a1a3f8eae30d6c6407f",
+ "mtime_ns": 1790404395466294564
+ },
{
"path": "pages.one",
- "bytes": 155344,
- "sha256": "623ade8b5ee6fc837ae63d5293791039ecd17da9cb8bc5e243ea20cadf37958c",
- "mtime_ns": 1789124063040528117
+ "bytes": 152360,
+ "sha256": "302b6d2d31bc8f539a2217aed3391973678576b0aea1ce82c6e21760d6402e14",
+ "mtime_ns": 1790404395457867619
}
]
},
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/manifest.json b/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/manifest.json
index 6848c514d3c0d4f1149f35c3bf02604813bc5116..bb0ea213a31d55bef19d3ad52a9598255b83a13d 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/manifest.json
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/manifest.json
@@ -1,151 +1,151 @@
{
"expected_order": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
2
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
2
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
2
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
2
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
2
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
2
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
2
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
2
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
2
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
2
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
2
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
2
]
],
@@ -158,819 +158,885 @@
"edits": [
{
"guid": [
- 86,
- 0,
- 111,
- 192,
+ 155,
+ 49,
+ 40,
+ 55,
+ 110,
+ 61,
+ 248,
+ 78,
+ 186,
+ 245,
+ 33,
+ 60,
+ 24,
138,
- 101,
- 192,
- 76,
- 185,
- 152,
- 225,
- 226,
- 79,
- 192,
- 46,
- 40
+ 51,
+ 39
],
"level": 1,
"position": {
- "Before": "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1"
+ "Before": "{74492C4A-164B-40E9-B297-4D3B4685347D},1"
},
- "space": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1"
+ "space": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1"
},
{
"guid": [
- 133,
- 52,
+ 124,
+ 69,
+ 164,
+ 134,
+ 185,
+ 207,
+ 146,
67,
- 104,
- 247,
- 13,
+ 144,
+ 255,
+ 194,
+ 10,
+ 29,
+ 94,
+ 178,
+ 200
+ ],
+ "level": 2,
+ "position": "Keep",
+ "space": "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1"
+ }
+ ],
+ "observed": [
+ [
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
+ 1
+ ],
+ [
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
+ 1
+ ],
+ [
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
+ 1
+ ],
+ [
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
+ 1
+ ],
+ [
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
+ 1
+ ],
+ [
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
+ 1
+ ],
+ [
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
+ 1
+ ],
+ [
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
+ 1
+ ],
+ [
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
+ 1
+ ],
+ [
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
+ 1
+ ],
+ [
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
+ 1
+ ],
+ [
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
+ 1
+ ],
+ [
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
+ 1
+ ],
+ [
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
+ 1
+ ],
+ [
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
+ 1
+ ],
+ [
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
+ 1
+ ],
+ [
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
+ 1
+ ],
+ [
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
+ 1
+ ],
+ [
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
+ 1
+ ],
+ [
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
+ 1
+ ],
+ [
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
+ 1
+ ],
+ [
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
+ 1
+ ],
+ [
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
+ 1
+ ],
+ [
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
+ 1
+ ],
+ [
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
+ 1
+ ],
+ [
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
+ 1
+ ],
+ [
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
+ 1
+ ],
+ [
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
+ 1
+ ],
+ [
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
+ 1
+ ],
+ [
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
+ 1
+ ],
+ [
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
+ 1
+ ],
+ [
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
+ 1
+ ],
+ [
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
+ 1
+ ],
+ [
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
+ 1
+ ],
+ [
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
+ 1
+ ],
+ [
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
+ 1
+ ],
+ [
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
+ 1
+ ]
+ ]
+ }
+ },
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
+ },
+ {
+ "id": 2,
+ "operation": {
+ "Page": {
+ "after": {
+ "created": 134348779890000000,
+ "definitions": {
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 61,
+ 83,
+ 255,
+ 218,
+ 139,
+ 96,
+ 53,
+ 71,
+ 186,
+ 29,
+ 35,
+ 84,
+ 232,
+ 203,
+ 138,
+ 105
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Outline": {
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},2",
+ "indents": [],
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 36.0,
+ "y": 36.0
+ },
+ "min_width": null,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},1",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 16,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 11.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Actor 0 🦀 é"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},3",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": null,
+ "tags": []
+ }
+ ],
+ "title": false,
+ "unsupported": []
+ }
+ },
+ {
+ "Title": {
+ "date": null,
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ },
+ "author": "Author",
+ "before": {
+ "created": 134348779890000000,
+ "definitions": {
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 61,
+ 83,
+ 255,
+ 218,
+ 139,
+ 96,
+ 53,
+ 71,
+ 186,
+ 29,
+ 35,
+ 84,
+ 232,
+ 203,
+ 138,
+ 105
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Title": {
+ "date": null,
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ }
+ }
+ },
+ "space": "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1"
+ }
+ ],
+ [
+ {
+ "id": 1,
+ "operation": {
+ "Pages": {
+ "edits": [
+ {
+ "guid": [
+ 17,
+ 26,
+ 44,
+ 166,
+ 129,
+ 151,
120,
- 79,
- 190,
- 78,
- 126,
- 126,
- 12,
- 116,
+ 77,
+ 170,
+ 191,
+ 124,
+ 194,
+ 153,
+ 11,
230,
- 238
- ],
- "level": 2,
- "position": "Keep",
- "space": "{C837A033-F055-4455-B45F-17D82016921C},1"
- }
- ],
- "observed": [
- [
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
- 1
- ],
- [
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
- 1
- ],
- [
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
- 1
- ],
- [
- "{C837A033-F055-4455-B45F-17D82016921C},1",
- 1
- ],
- [
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
- 1
- ],
- [
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
- 1
- ],
- [
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
- 1
- ],
- [
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
- 1
- ],
- [
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
- 1
- ],
- [
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
- 1
- ],
- [
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
- 1
- ],
- [
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
- 1
- ],
- [
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
- 1
- ],
- [
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
- 1
- ],
- [
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
- 1
- ],
- [
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
- 1
- ],
- [
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
- 1
- ],
- [
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
- 1
- ],
- [
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
- 1
- ],
- [
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
- 1
- ],
- [
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
- 1
- ],
- [
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
- 1
- ],
- [
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
- 1
- ],
- [
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
- 1
- ],
- [
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
- 1
- ],
- [
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
- 1
- ],
- [
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
- 1
- ],
- [
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
- 1
- ],
- [
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
- 1
- ],
- [
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
- 1
- ],
- [
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
- 1
- ],
- [
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
- 1
- ],
- [
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
- 1
- ],
- [
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
- 1
- ],
- [
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
- 1
- ],
- [
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
- 1
- ],
- [
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
- 1
- ]
- ]
- }
- },
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
- },
- {
- "id": 2,
- "operation": {
- "Page": {
- "after": {
- "created": 134335976560000000,
- "definitions": {
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Outline": {
- "id": "{3517C5BC-B40B-45E6-8324-BAB9403F7F3B},0",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 36.0,
- "y": 36.0
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{D76D17C9-C3D7-49A2-A78E-305604ABA8AF},0",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 16,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 11.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Actor 0 🦀 é"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{1A80E3C3-180F-42AB-B946-1A365F043826},0",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": null,
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- },
- {
- "Title": {
- "date": null,
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- },
- "author": "Author",
- "before": {
- "created": 134335976560000000,
- "definitions": {
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Title": {
- "date": null,
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- }
- }
- },
- "space": "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1"
- }
- ],
- [
- {
- "id": 1,
- "operation": {
- "Pages": {
- "edits": [
- {
- "guid": [
- 183,
- 11,
- 130,
- 190,
- 141,
- 83,
- 119,
- 77,
- 133,
- 112,
- 123,
- 250,
- 37,
- 199,
- 26,
- 252
+ 226
],
"level": 1,
"position": {
- "Before": "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1"
+ "Before": "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1"
},
- "space": "{57E835EA-2799-4118-B55C-7BB1E51C6941},1"
+ "space": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1"
},
{
"guid": [
- 252,
- 97,
- 42,
- 186,
- 167,
- 236,
- 97,
+ 6,
+ 151,
+ 55,
+ 70,
+ 228,
+ 106,
+ 247,
+ 64,
+ 149,
+ 253,
+ 46,
+ 250,
+ 242,
+ 9,
65,
- 143,
- 137,
- 54,
- 20,
- 165,
- 72,
- 170,
- 170
+ 14
],
"level": 2,
"position": "Keep",
- "space": "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1"
+ "space": "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},18": {
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},18": {
"format": {
"alignment": null,
"bold": null,
@@ -987,6 +1053,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1001,6 +1068,24 @@
}
}
},
+ "identity": [
+ 249,
+ 165,
+ 255,
+ 49,
+ 184,
+ 193,
+ 45,
+ 65,
+ 162,
+ 214,
+ 122,
+ 204,
+ 60,
+ 193,
+ 111,
+ 208
+ ],
"margin_origin": [
0.0,
0.0
@@ -1008,7 +1093,7 @@
"objects": [
{
"Outline": {
- "id": "{0817794A-7E1B-41EF-A811-A0F65EE1CE99},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},5",
"indents": [],
"layout": {
"max_height": null,
@@ -1025,7 +1110,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{BB519837-B3F7-4C9B-A428-3D9696CA0070},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},4",
"tags": [],
"text": {
"spans": [
@@ -1047,6 +1132,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1077,6 +1163,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1085,9 +1172,13 @@
"superscript": null,
"underline": null
},
- "id": "{88AA1A5C-2020-4249-BF25-62D5B4957CC6},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},6",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -1100,7 +1191,7 @@
{
"Title": {
"date": null,
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},13",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -1111,24 +1202,29 @@
},
"outlines": [
{
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},14",
- "indents": [],
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},16",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},16",
"tags": [],
"text": {
"spans": [
@@ -1150,6 +1246,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1180,6 +1277,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1188,15 +1286,19 @@
"superscript": null,
"underline": null
},
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},15",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{57E835EA-2799-4118-B55C-7BB1E51C6941},18",
+ "style": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -1207,9 +1309,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},18": {
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},18": {
"format": {
"alignment": null,
"bold": null,
@@ -1226,6 +1328,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1240,6 +1343,24 @@
}
}
},
+ "identity": [
+ 249,
+ 165,
+ 255,
+ 49,
+ 184,
+ 193,
+ 45,
+ 65,
+ 162,
+ 214,
+ 122,
+ 204,
+ 60,
+ 193,
+ 111,
+ 208
+ ],
"margin_origin": [
0.0,
0.0
@@ -1248,7 +1369,7 @@
{
"Title": {
"date": null,
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},13",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -1259,24 +1380,29 @@
},
"outlines": [
{
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},14",
- "indents": [],
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},16",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},16",
"tags": [],
"text": {
"spans": [
@@ -1298,6 +1424,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1328,6 +1455,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1336,15 +1464,19 @@
"superscript": null,
"underline": null
},
- "id": "{57E835EA-2799-4118-B55C-7BB1E51C6941},15",
+ "id": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{57E835EA-2799-4118-B55C-7BB1E51C6941},18",
+ "style": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -1355,7 +1487,7 @@
}
}
},
- "space": "{57E835EA-2799-4118-B55C-7BB1E51C6941},1"
+ "space": "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1"
}
],
[
@@ -1366,215 +1498,215 @@
"edits": [
{
"guid": [
- 172,
- 90,
- 29,
- 103,
- 245,
- 250,
- 220,
- 74,
178,
- 30,
- 220,
- 119,
- 124,
- 185,
- 174,
- 198
+ 65,
+ 17,
+ 57,
+ 15,
+ 50,
+ 208,
+ 79,
+ 129,
+ 89,
+ 215,
+ 81,
+ 45,
+ 182,
+ 161,
+ 182
],
"level": 1,
"position": {
- "Before": "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1"
+ "Before": "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1"
},
- "space": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1"
+ "space": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1"
},
{
"guid": [
- 43,
- 65,
+ 92,
+ 129,
+ 87,
+ 179,
+ 42,
+ 26,
+ 81,
+ 77,
+ 175,
11,
- 224,
- 49,
- 201,
- 193,
- 78,
- 183,
- 88,
- 16,
- 59,
- 113,
- 75,
- 60,
- 236
+ 45,
+ 117,
+ 57,
+ 12,
+ 114,
+ 224
],
"level": 2,
"position": "Keep",
- "space": "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1"
+ "space": "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},18": {
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},18": {
"format": {
"alignment": null,
"bold": null,
@@ -1591,6 +1723,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1605,6 +1738,24 @@
}
}
},
+ "identity": [
+ 15,
+ 122,
+ 179,
+ 90,
+ 2,
+ 87,
+ 142,
+ 76,
+ 168,
+ 198,
+ 121,
+ 237,
+ 110,
+ 209,
+ 230,
+ 159
+ ],
"margin_origin": [
0.0,
0.0
@@ -1612,7 +1763,7 @@
"objects": [
{
"Outline": {
- "id": "{5C473AF1-9E02-4E9A-BFC8-9E9CBBB289E1},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},8",
"indents": [],
"layout": {
"max_height": null,
@@ -1629,7 +1780,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{B412B53F-86FF-4462-8750-FB4D73532A63},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},7",
"tags": [],
"text": {
"spans": [
@@ -1651,6 +1802,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1681,6 +1833,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1689,9 +1842,13 @@
"superscript": null,
"underline": null
},
- "id": "{ADE09A18-DF3F-4995-BF31-D453831561D7},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},9",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -1704,7 +1861,7 @@
{
"Title": {
"date": null,
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},13",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -1715,24 +1872,29 @@
},
"outlines": [
{
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},14",
- "indents": [],
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},16",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},16",
"tags": [],
"text": {
"spans": [
@@ -1754,6 +1916,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1784,6 +1947,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1792,15 +1956,19 @@
"superscript": null,
"underline": null
},
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},15",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},18",
+ "style": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -1811,9 +1979,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},18": {
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},18": {
"format": {
"alignment": null,
"bold": null,
@@ -1830,6 +1998,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1844,6 +2013,24 @@
}
}
},
+ "identity": [
+ 15,
+ 122,
+ 179,
+ 90,
+ 2,
+ 87,
+ 142,
+ 76,
+ 168,
+ 198,
+ 121,
+ 237,
+ 110,
+ 209,
+ 230,
+ 159
+ ],
"margin_origin": [
0.0,
0.0
@@ -1852,7 +2039,7 @@
{
"Title": {
"date": null,
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},13",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -1863,24 +2050,29 @@
},
"outlines": [
{
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},14",
- "indents": [],
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},16",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},16",
"tags": [],
"text": {
"spans": [
@@ -1902,6 +2094,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1932,6 +2125,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -1940,15 +2134,19 @@
"superscript": null,
"underline": null
},
- "id": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},15",
+ "id": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},18",
+ "style": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -1959,7 +2157,7 @@
}
}
},
- "space": "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1"
+ "space": "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1"
}
],
[
@@ -1970,215 +2168,215 @@
"edits": [
{
"guid": [
- 220,
- 22,
+ 202,
+ 70,
+ 93,
+ 136,
+ 36,
+ 165,
109,
- 148,
- 199,
- 94,
- 248,
- 76,
- 168,
- 183,
- 186,
- 119,
- 172,
- 76,
- 100,
- 21
+ 65,
+ 139,
+ 122,
+ 213,
+ 126,
+ 228,
+ 97,
+ 103,
+ 255
],
"level": 1,
"position": {
- "Before": "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1"
+ "Before": "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1"
},
- "space": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1"
+ "space": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1"
},
{
"guid": [
- 177,
- 33,
- 19,
- 250,
- 24,
- 200,
- 209,
- 74,
- 175,
- 22,
- 210,
- 214,
- 251,
- 44,
+ 233,
+ 86,
+ 59,
+ 11,
+ 202,
+ 9,
+ 167,
+ 68,
+ 172,
+ 213,
+ 140,
+ 32,
+ 40,
+ 205,
125,
- 123
+ 172
],
"level": 2,
"position": "Keep",
- "space": "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1"
+ "space": "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},18": {
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},18": {
"format": {
"alignment": null,
"bold": null,
@@ -2195,6 +2393,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2209,6 +2408,24 @@
}
}
},
+ "identity": [
+ 248,
+ 110,
+ 150,
+ 62,
+ 180,
+ 183,
+ 63,
+ 72,
+ 178,
+ 65,
+ 143,
+ 33,
+ 223,
+ 49,
+ 138,
+ 179
+ ],
"margin_origin": [
0.0,
0.0
@@ -2216,7 +2433,7 @@
"objects": [
{
"Outline": {
- "id": "{930570FE-0B42-4598-A6B7-74E90CE526D4},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},11",
"indents": [],
"layout": {
"max_height": null,
@@ -2233,7 +2450,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{917ABDDE-781F-45C9-90B5-A63A0FBCAEE4},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},10",
"tags": [],
"text": {
"spans": [
@@ -2255,6 +2472,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2285,6 +2503,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2293,9 +2512,13 @@
"superscript": null,
"underline": null
},
- "id": "{A4C1F94C-C7D9-4C9A-8F97-D7437FF3F499},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},12",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -2308,7 +2531,7 @@
{
"Title": {
"date": null,
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},13",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -2319,24 +2542,29 @@
},
"outlines": [
{
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},14",
- "indents": [],
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},16",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},16",
"tags": [],
"text": {
"spans": [
@@ -2358,6 +2586,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2388,6 +2617,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2396,15 +2626,19 @@
"superscript": null,
"underline": null
},
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},15",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},18",
+ "style": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -2415,9 +2649,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},18": {
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},18": {
"format": {
"alignment": null,
"bold": null,
@@ -2434,6 +2668,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2448,6 +2683,24 @@
}
}
},
+ "identity": [
+ 248,
+ 110,
+ 150,
+ 62,
+ 180,
+ 183,
+ 63,
+ 72,
+ 178,
+ 65,
+ 143,
+ 33,
+ 223,
+ 49,
+ 138,
+ 179
+ ],
"margin_origin": [
0.0,
0.0
@@ -2456,7 +2709,7 @@
{
"Title": {
"date": null,
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},13",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -2467,24 +2720,29 @@
},
"outlines": [
{
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},14",
- "indents": [],
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},16",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},16",
"tags": [],
"text": {
"spans": [
@@ -2506,6 +2764,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2536,6 +2795,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2544,15 +2804,19 @@
"superscript": null,
"underline": null
},
- "id": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},15",
+ "id": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},18",
+ "style": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -2563,7 +2827,7 @@
}
}
},
- "space": "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1"
+ "space": "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1"
}
],
[
@@ -2574,215 +2838,215 @@
"edits": [
{
"guid": [
- 240,
- 213,
- 212,
- 204,
- 25,
- 156,
- 182,
- 67,
- 143,
- 206,
- 96,
- 209,
- 2,
- 198,
- 208,
- 94
+ 164,
+ 233,
+ 248,
+ 53,
+ 50,
+ 163,
+ 52,
+ 65,
+ 145,
+ 221,
+ 232,
+ 231,
+ 172,
+ 110,
+ 51,
+ 85
],
"level": 1,
"position": {
- "Before": "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1"
+ "Before": "{AE89305A-73F4-46B5-B41D-18884685D896},1"
},
- "space": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1"
+ "space": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1"
},
{
"guid": [
- 82,
- 173,
- 19,
- 143,
- 3,
- 17,
- 177,
- 66,
- 183,
- 218,
- 131,
+ 127,
+ 137,
+ 251,
+ 136,
+ 118,
72,
- 199,
- 191,
+ 18,
+ 67,
+ 156,
233,
- 214
+ 237,
+ 236,
+ 165,
+ 97,
+ 49,
+ 92
],
"level": 2,
"position": "Keep",
- "space": "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1"
+ "space": "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},18": {
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},18": {
"format": {
"alignment": null,
"bold": null,
@@ -2799,6 +3063,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2813,6 +3078,24 @@
}
}
},
+ "identity": [
+ 55,
+ 38,
+ 29,
+ 85,
+ 167,
+ 42,
+ 35,
+ 73,
+ 178,
+ 221,
+ 49,
+ 194,
+ 225,
+ 72,
+ 159,
+ 210
+ ],
"margin_origin": [
0.0,
0.0
@@ -2820,7 +3103,7 @@
"objects": [
{
"Outline": {
- "id": "{6A6E0E73-D2A2-4C82-B0B4-E8A3695B4D5A},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},14",
"indents": [],
"layout": {
"max_height": null,
@@ -2837,7 +3120,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{A11F6C01-70A2-44C7-90E9-91C455D075E7},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},13",
"tags": [],
"text": {
"spans": [
@@ -2859,6 +3142,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2889,6 +3173,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2897,9 +3182,13 @@
"superscript": null,
"underline": null
},
- "id": "{1B1F5EFD-3EE8-4031-BEB2-C3D27A332144},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -2912,7 +3201,7 @@
{
"Title": {
"date": null,
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},13",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -2923,24 +3212,29 @@
},
"outlines": [
{
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},14",
- "indents": [],
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},16",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},16",
"tags": [],
"text": {
"spans": [
@@ -2962,6 +3256,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -2992,6 +3287,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3000,15 +3296,19 @@
"superscript": null,
"underline": null
},
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},15",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},18",
+ "style": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -3019,9 +3319,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},18": {
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},18": {
"format": {
"alignment": null,
"bold": null,
@@ -3038,6 +3338,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3052,6 +3353,24 @@
}
}
},
+ "identity": [
+ 55,
+ 38,
+ 29,
+ 85,
+ 167,
+ 42,
+ 35,
+ 73,
+ 178,
+ 221,
+ 49,
+ 194,
+ 225,
+ 72,
+ 159,
+ 210
+ ],
"margin_origin": [
0.0,
0.0
@@ -3060,7 +3379,7 @@
{
"Title": {
"date": null,
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},13",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -3071,24 +3390,29 @@
},
"outlines": [
{
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},14",
- "indents": [],
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},16",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},16",
"tags": [],
"text": {
"spans": [
@@ -3110,6 +3434,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3140,6 +3465,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3148,15 +3474,19 @@
"superscript": null,
"underline": null
},
- "id": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},15",
+ "id": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},18",
+ "style": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -3167,7 +3497,7 @@
}
}
},
- "space": "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1"
+ "space": "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1"
}
],
[
@@ -3178,215 +3508,215 @@
"edits": [
{
"guid": [
- 170,
- 199,
- 91,
- 6,
- 149,
+ 2,
108,
- 28,
- 78,
- 169,
+ 104,
+ 0,
+ 158,
+ 109,
+ 176,
+ 79,
+ 171,
+ 232,
+ 110,
+ 168,
+ 146,
+ 200,
241,
- 201,
- 191,
- 131,
- 111,
- 13,
- 167
+ 35
],
"level": 1,
"position": {
- "Before": "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1"
+ "Before": "{42010094-E377-4A97-9395-AD45808D0552},1"
},
- "space": "{7E9041BD-301B-4B5B-9456-1C92050E4914},1"
+ "space": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1"
},
{
"guid": [
- 18,
- 19,
- 211,
- 10,
- 209,
- 7,
+ 98,
195,
- 66,
- 172,
- 223,
- 64,
- 131,
- 73,
- 37,
- 59,
- 187
+ 206,
+ 208,
+ 54,
+ 190,
+ 72,
+ 65,
+ 153,
+ 87,
+ 208,
+ 13,
+ 10,
+ 87,
+ 170,
+ 34
],
"level": 2,
"position": "Keep",
- "space": "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1"
+ "space": "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},18": {
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},18": {
"format": {
"alignment": null,
"bold": null,
@@ -3403,6 +3733,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3417,6 +3748,24 @@
}
}
},
+ "identity": [
+ 94,
+ 187,
+ 106,
+ 15,
+ 33,
+ 160,
+ 29,
+ 78,
+ 177,
+ 135,
+ 122,
+ 114,
+ 231,
+ 64,
+ 0,
+ 220
+ ],
"margin_origin": [
0.0,
0.0
@@ -3424,7 +3773,7 @@
"objects": [
{
"Outline": {
- "id": "{9D60419E-FC09-4547-8A45-5083DF888B11},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},17",
"indents": [],
"layout": {
"max_height": null,
@@ -3441,7 +3790,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{A30B6C43-D76B-4629-B1C4-AC8F2FF6CBEE},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},16",
"tags": [],
"text": {
"spans": [
@@ -3463,6 +3812,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3493,6 +3843,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3501,9 +3852,13 @@
"superscript": null,
"underline": null
},
- "id": "{AD6C0452-3D66-42DF-8865-A679E80B3F05},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},18",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -3516,7 +3871,7 @@
{
"Title": {
"date": null,
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},13",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -3527,24 +3882,29 @@
},
"outlines": [
{
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},14",
- "indents": [],
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},16",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},16",
"tags": [],
"text": {
"spans": [
@@ -3566,6 +3926,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3596,6 +3957,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3604,15 +3966,19 @@
"superscript": null,
"underline": null
},
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},15",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{7E9041BD-301B-4B5B-9456-1C92050E4914},18",
+ "style": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -3623,9 +3989,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},18": {
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},18": {
"format": {
"alignment": null,
"bold": null,
@@ -3642,6 +4008,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3656,6 +4023,24 @@
}
}
},
+ "identity": [
+ 94,
+ 187,
+ 106,
+ 15,
+ 33,
+ 160,
+ 29,
+ 78,
+ 177,
+ 135,
+ 122,
+ 114,
+ 231,
+ 64,
+ 0,
+ 220
+ ],
"margin_origin": [
0.0,
0.0
@@ -3664,7 +4049,7 @@
{
"Title": {
"date": null,
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},13",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -3675,24 +4060,29 @@
},
"outlines": [
{
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},14",
- "indents": [],
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},16",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},16",
"tags": [],
"text": {
"spans": [
@@ -3714,6 +4104,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3744,6 +4135,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -3752,15 +4144,19 @@
"superscript": null,
"underline": null
},
- "id": "{7E9041BD-301B-4B5B-9456-1C92050E4914},15",
+ "id": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{7E9041BD-301B-4B5B-9456-1C92050E4914},18",
+ "style": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -3771,7 +4167,7 @@
}
}
},
- "space": "{7E9041BD-301B-4B5B-9456-1C92050E4914},1"
+ "space": "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1"
}
],
[
@@ -3780,217 +4176,217 @@
"operation": {
"Pages": {
"edits": [
+ {
+ "guid": [
+ 83,
+ 35,
+ 225,
+ 13,
+ 184,
+ 191,
+ 39,
+ 73,
+ 187,
+ 161,
+ 191,
+ 106,
+ 185,
+ 164,
+ 169,
+ 110
+ ],
+ "level": 1,
+ "position": {
+ "Before": "{439B80E0-9D4C-4A2F-9163-4E301491364D},1"
+ },
+ "space": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1"
+ },
{
"guid": [
235,
- 237,
- 5,
- 138,
- 5,
- 243,
- 246,
- 64,
- 171,
+ 25,
+ 178,
+ 87,
+ 182,
+ 233,
+ 248,
74,
- 60,
- 18,
- 85,
- 228,
- 190,
- 225
- ],
- "level": 1,
- "position": {
- "Before": "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1"
- },
- "space": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1"
- },
- {
- "guid": [
- 154,
- 175,
- 180,
- 52,
- 102,
- 86,
- 241,
- 66,
- 129,
- 168,
- 227,
- 222,
- 69,
- 213,
- 66,
- 187
+ 163,
+ 238,
+ 127,
+ 45,
+ 119,
+ 155,
+ 249,
+ 77
],
"level": 2,
"position": "Keep",
- "space": "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1"
+ "space": "{A459C474-E6EB-4BE5-9193-271799B2860B},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},18": {
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},18": {
"format": {
"alignment": null,
"bold": null,
@@ -4007,6 +4403,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4021,6 +4418,24 @@
}
}
},
+ "identity": [
+ 60,
+ 151,
+ 59,
+ 176,
+ 188,
+ 80,
+ 154,
+ 75,
+ 153,
+ 20,
+ 177,
+ 213,
+ 192,
+ 207,
+ 97,
+ 151
+ ],
"margin_origin": [
0.0,
0.0
@@ -4028,7 +4443,7 @@
"objects": [
{
"Outline": {
- "id": "{69602664-892F-4537-9BFE-860DAD71A595},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},20",
"indents": [],
"layout": {
"max_height": null,
@@ -4045,7 +4460,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{C533D56B-11C4-4867-B1E2-3E7520E7939A},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},19",
"tags": [],
"text": {
"spans": [
@@ -4067,6 +4482,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4097,6 +4513,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4105,9 +4522,13 @@
"superscript": null,
"underline": null
},
- "id": "{FB8451BB-46B9-44F1-972F-A543F55F06B5},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},21",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -4120,7 +4541,7 @@
{
"Title": {
"date": null,
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},13",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -4131,172 +4552,29 @@
},
"outlines": [
{
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},18",
- "tags": []
- }
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- },
- "author": "Author",
- "before": {
- "created": 134335976560000000,
- "definitions": {
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Title": {
- "date": null,
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},14",
- "indents": [],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},16",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},16",
"tags": [],
"text": {
"spans": [
@@ -4318,6 +4596,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4348,6 +4627,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4356,471 +4636,19 @@
"superscript": null,
"underline": null
},
- "id": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},15",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},15",
"level": 1,
"lists": [],
- "parent": null,
- "style": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- }
- }
- },
- "space": "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1"
- }
- ],
- [
- {
- "id": 1,
- "operation": {
- "Pages": {
- "edits": [
- {
- "guid": [
- 133,
- 13,
- 22,
- 96,
- 19,
- 247,
- 50,
- 69,
- 147,
- 11,
- 146,
- 207,
- 6,
- 153,
- 24,
- 94
- ],
- "level": 1,
- "position": {
- "Before": "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1"
- },
- "space": "{7F6702B3-C977-436F-82AF-403E2BE950E7},1"
- },
- {
- "guid": [
- 159,
- 110,
- 141,
- 39,
- 253,
- 156,
- 37,
- 64,
- 172,
- 95,
- 144,
- 82,
- 194,
- 61,
- 40,
- 198
- ],
- "level": 2,
- "position": "Keep",
- "space": "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1"
- }
- ],
- "observed": [
- [
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
- 1
- ],
- [
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
- 1
- ],
- [
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
- 1
- ],
- [
- "{C837A033-F055-4455-B45F-17D82016921C},1",
- 1
- ],
- [
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
- 1
- ],
- [
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
- 1
- ],
- [
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
- 1
- ],
- [
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
- 1
- ],
- [
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
- 1
- ],
- [
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
- 1
- ],
- [
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
- 1
- ],
- [
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
- 1
- ],
- [
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
- 1
- ],
- [
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
- 1
- ],
- [
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
- 1
- ],
- [
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
- 1
- ],
- [
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
- 1
- ],
- [
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
- 1
- ],
- [
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
- 1
- ],
- [
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
- 1
- ],
- [
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
- 1
- ],
- [
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
- 1
- ],
- [
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
- 1
- ],
- [
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
- 1
- ],
- [
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
- 1
- ],
- [
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
- 1
- ],
- [
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
- 1
- ],
- [
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
- 1
- ],
- [
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
- 1
- ],
- [
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
- 1
- ],
- [
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
- 1
- ],
- [
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
- 1
- ],
- [
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
- 1
- ],
- [
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
- 1
- ],
- [
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
- 1
- ],
- [
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
- 1
- ],
- [
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
- 1
- ]
- ]
- }
- },
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
- },
- {
- "id": 2,
- "operation": {
- "Page": {
- "after": {
- "created": 134335976560000000,
- "definitions": {
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Outline": {
- "id": "{F5ABCB2B-29D3-411E-A836-02A85749FF09},0",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 36.0,
- "y": 36.0
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{3500B3EC-E613-4C17-8520-F7B22DB266FD},0",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 16,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 11.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Actor 7 🦀 é"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{DFF3BBDE-C14D-4D31-8E0D-CBCED9BB1195},0",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": null,
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- },
- {
- "Title": {
- "date": null,
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
+ "media": {
+ "recordings": [],
+ "time_ms": null
},
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},15",
- "level": 1,
- "lists": [],
"parent": null,
- "style": "{7F6702B3-C977-436F-82AF-403E2BE950E7},18",
+ "style": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -4831,9 +4659,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779890000000,
"definitions": {
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},18": {
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},18": {
"format": {
"alignment": null,
"bold": null,
@@ -4850,6 +4678,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4864,6 +4693,24 @@
}
}
},
+ "identity": [
+ 60,
+ 151,
+ 59,
+ 176,
+ 188,
+ 80,
+ 154,
+ 75,
+ 153,
+ 20,
+ 177,
+ 213,
+ 192,
+ 207,
+ 97,
+ 151
+ ],
"margin_origin": [
0.0,
0.0
@@ -4872,7 +4719,7 @@
{
"Title": {
"date": null,
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},13",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -4883,24 +4730,29 @@
},
"outlines": [
{
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},14",
- "indents": [],
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},16",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},16",
"tags": [],
"text": {
"spans": [
@@ -4922,6 +4774,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4952,6 +4805,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -4960,15 +4814,19 @@
"superscript": null,
"underline": null
},
- "id": "{7F6702B3-C977-436F-82AF-403E2BE950E7},15",
+ "id": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{7F6702B3-C977-436F-82AF-403E2BE950E7},18",
+ "style": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -4979,7 +4837,7 @@
}
}
},
- "space": "{7F6702B3-C977-436F-82AF-403E2BE950E7},1"
+ "space": "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1"
}
],
[
@@ -4990,819 +4848,215 @@
"edits": [
{
"guid": [
- 60,
- 96,
- 70,
- 223,
+ 73,
+ 224,
+ 214,
+ 216,
+ 142,
197,
- 137,
- 63,
- 78,
- 170,
- 199,
81,
- 158,
- 99,
- 18,
- 163,
- 133
+ 64,
+ 131,
+ 8,
+ 236,
+ 81,
+ 238,
+ 204,
+ 152,
+ 204
],
"level": 1,
"position": {
- "Before": "{754FA957-C432-4502-A5CF-EE44449462C0},1"
+ "Before": "{4ED14CEE-8560-4125-B488-9945C116741E},1"
},
- "space": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1"
+ "space": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1"
},
{
"guid": [
- 218,
+ 187,
+ 19,
+ 240,
+ 247,
+ 140,
+ 21,
+ 1,
+ 78,
181,
- 208,
- 213,
- 72,
- 152,
- 253,
- 76,
- 176,
- 213,
- 138,
- 85,
- 141,
- 127,
- 170,
- 160
- ],
- "level": 2,
- "position": "Keep",
- "space": "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1"
- }
- ],
- "observed": [
- [
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
- 1
- ],
- [
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
- 1
- ],
- [
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
- 1
- ],
- [
- "{C837A033-F055-4455-B45F-17D82016921C},1",
- 1
- ],
- [
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
- 1
- ],
- [
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
- 1
- ],
- [
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
- 1
- ],
- [
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
- 1
- ],
- [
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
- 1
- ],
- [
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
- 1
- ],
- [
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
- 1
- ],
- [
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
- 1
- ],
- [
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
- 1
- ],
- [
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
- 1
- ],
- [
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
- 1
- ],
- [
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
- 1
- ],
- [
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
- 1
- ],
- [
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
- 1
- ],
- [
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
- 1
- ],
- [
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
- 1
- ],
- [
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
- 1
- ],
- [
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
- 1
- ],
- [
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
- 1
- ],
- [
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
- 1
- ],
- [
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
- 1
- ],
- [
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
- 1
- ],
- [
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
- 1
- ],
- [
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
- 1
- ],
- [
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
- 1
- ],
- [
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
- 1
- ],
- [
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
- 1
- ],
- [
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
- 1
- ],
- [
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
- 1
- ],
- [
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
- 1
- ],
- [
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
- 1
- ],
- [
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
- 1
- ],
- [
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
- 1
- ]
- ]
- }
- },
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
- },
- {
- "id": 2,
- "operation": {
- "Page": {
- "after": {
- "created": 134335976560000000,
- "definitions": {
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Outline": {
- "id": "{5A041F4B-D387-4A35-8723-9F16A833AC7E},0",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 36.0,
- "y": 36.0
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{8A12422A-9108-4831-9889-D95B1B47F85A},0",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 16,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 11.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Actor 8 🦀 é"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{8906C7DF-89B1-40E4-9D47-6C794C39F974},0",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": null,
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- },
- {
- "Title": {
- "date": null,
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- },
- "author": "Author",
- "before": {
- "created": 134335976560000000,
- "definitions": {
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Title": {
- "date": null,
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- }
- }
- },
- "space": "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1"
- }
- ],
- [
- {
- "id": 1,
- "operation": {
- "Pages": {
- "edits": [
- {
- "guid": [
- 99,
- 82,
- 79,
- 67,
- 136,
- 178,
- 110,
- 79,
- 138,
- 9,
- 172,
- 171,
- 67,
- 243,
- 71,
- 142
- ],
- "level": 1,
- "position": {
- "Before": "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1"
- },
- "space": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1"
- },
- {
- "guid": [
- 198,
+ 106,
58,
- 35,
- 75,
- 157,
- 18,
- 195,
- 77,
- 154,
- 80,
- 148,
- 1,
- 210,
- 118,
- 195,
- 115
+ 144,
+ 123,
+ 115,
+ 155,
+ 206
],
"level": 2,
"position": "Keep",
- "space": "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1"
+ "space": "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779900000000,
"definitions": {
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},18": {
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},18": {
"format": {
"alignment": null,
"bold": null,
@@ -5819,6 +5073,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -5833,6 +5088,24 @@
}
}
},
+ "identity": [
+ 228,
+ 143,
+ 255,
+ 196,
+ 67,
+ 76,
+ 31,
+ 70,
+ 152,
+ 221,
+ 235,
+ 31,
+ 242,
+ 168,
+ 99,
+ 178
+ ],
"margin_origin": [
0.0,
0.0
@@ -5840,7 +5113,7 @@
"objects": [
{
"Outline": {
- "id": "{69906E37-5C35-4F2F-B74F-B5D45950739B},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},23",
"indents": [],
"layout": {
"max_height": null,
@@ -5857,7 +5130,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{3A6E4FCA-F6C5-4418-ADF4-9E92782F26CD},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},22",
"tags": [],
"text": {
"spans": [
@@ -5879,6 +5152,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -5889,7 +5163,7 @@
}
}
],
- "text": "Actor 9 🦀 é"
+ "text": "Actor 7 🦀 é"
}
}
},
@@ -5909,6 +5183,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -5917,9 +5192,13 @@
"superscript": null,
"underline": null
},
- "id": "{FFE94E14-C2A1-4CB1-BBDB-0D72059C0A9D},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},24",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -5932,7 +5211,7 @@
{
"Title": {
"date": null,
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},13",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -5943,24 +5222,29 @@
},
"outlines": [
{
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},14",
- "indents": [],
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},16",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},16",
"tags": [],
"text": {
"spans": [
@@ -5982,6 +5266,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -6012,6 +5297,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -6020,15 +5306,19 @@
"superscript": null,
"underline": null
},
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},15",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},18",
+ "style": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -6039,9 +5329,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779900000000,
"definitions": {
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},18": {
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},18": {
"format": {
"alignment": null,
"bold": null,
@@ -6058,6 +5348,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -6072,6 +5363,24 @@
}
}
},
+ "identity": [
+ 228,
+ 143,
+ 255,
+ 196,
+ 67,
+ 76,
+ 31,
+ 70,
+ 152,
+ 221,
+ 235,
+ 31,
+ 242,
+ 168,
+ 99,
+ 178
+ ],
"margin_origin": [
0.0,
0.0
@@ -6080,7 +5389,7 @@
{
"Title": {
"date": null,
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},13",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -6091,24 +5400,29 @@
},
"outlines": [
{
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},14",
- "indents": [],
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},16",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},16",
"tags": [],
"text": {
"spans": [
@@ -6130,6 +5444,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -6160,6 +5475,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -6168,15 +5484,19 @@
"superscript": null,
"underline": null
},
- "id": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},15",
+ "id": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},18",
+ "style": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -6187,7 +5507,7 @@
}
}
},
- "space": "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1"
+ "space": "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1"
}
],
[
@@ -6198,819 +5518,2225 @@
"edits": [
{
"guid": [
- 99,
- 113,
- 79,
- 243,
- 201,
- 17,
- 203,
- 78,
- 185,
- 122,
- 45,
- 83,
- 216,
- 140,
- 115,
- 52
- ],
- "level": 1,
- "position": {
- "Before": "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1"
- },
- "space": "{189EA744-BE13-467A-95BA-2667A134C0B0},1"
- },
- {
- "guid": [
- 240,
+ 171,
+ 123,
160,
- 93,
- 114,
- 5,
- 25,
- 128,
- 75,
- 161,
- 252,
- 39,
+ 66,
+ 159,
123,
- 203,
- 137,
- 98,
- 106
- ],
- "level": 2,
- "position": "Keep",
- "space": "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1"
- }
- ],
- "observed": [
- [
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
- 1
- ],
- [
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
- 1
- ],
- [
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
- 1
- ],
- [
- "{C837A033-F055-4455-B45F-17D82016921C},1",
- 1
- ],
- [
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
- 1
- ],
- [
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
- 1
- ],
- [
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
- 1
- ],
- [
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
- 1
- ],
- [
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
- 1
- ],
- [
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
- 1
- ],
- [
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
- 1
- ],
- [
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
- 1
- ],
- [
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
- 1
- ],
- [
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
- 1
- ],
- [
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
- 1
- ],
- [
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
- 1
- ],
- [
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
- 1
- ],
- [
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
- 1
- ],
- [
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
- 1
- ],
- [
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
- 1
- ],
- [
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
- 1
- ],
- [
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
- 1
- ],
- [
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
- 1
- ],
- [
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
- 1
- ],
- [
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
- 1
- ],
- [
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
- 1
- ],
- [
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
- 1
- ],
- [
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
- 1
- ],
- [
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
- 1
- ],
- [
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
- 1
- ],
- [
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
- 1
- ],
- [
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
- 1
- ],
- [
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
- 1
- ],
- [
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
- 1
- ],
- [
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
- 1
- ],
- [
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
- 1
- ],
- [
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
- 1
- ]
- ]
- }
- },
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
- },
- {
- "id": 2,
- "operation": {
- "Page": {
- "after": {
- "created": 134335976560000000,
- "definitions": {
- "{189EA744-BE13-467A-95BA-2667A134C0B0},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Outline": {
- "id": "{A05DF797-7FAA-4593-A1F4-7E35812A5257},0",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 36.0,
- "y": 36.0
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{D134F5D0-A81E-4663-9AE8-5FF66C8882F1},0",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 17,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 11.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Actor 10 🦀 é"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{D783BABC-D1D5-45A9-86F8-1169830488FC},0",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": null,
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- },
- {
- "Title": {
- "date": null,
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{189EA744-BE13-467A-95BA-2667A134C0B0},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- },
- "author": "Author",
- "before": {
- "created": 134335976560000000,
- "definitions": {
- "{189EA744-BE13-467A-95BA-2667A134C0B0},18": {
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "kind": {
- "name": "PageTitle",
- "type": "Style"
- }
- }
- },
- "margin_origin": [
- 0.0,
- 0.0
- ],
- "objects": [
- {
- "Title": {
- "date": null,
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},13",
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": 0.0,
- "y": 0.0
- },
- "outlines": [
- {
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},14",
- "indents": [],
- "layout": {
- "max_height": null,
- "max_width": null,
- "reserved_width": null,
- "width_set_by_user": null,
- "x": null,
- "y": null
- },
- "min_width": null,
- "paragraphs": [
- {
- "collapsed": false,
- "content": {
- "Text": {
- "date_field": null,
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},16",
- "tags": [],
- "text": {
- "spans": [
- {
- "end": 10,
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": "Calibri",
- "font_size": 17.0,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": 1033,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- }
- }
- ],
- "text": "Same title"
- }
- }
- },
- "format": {
- "alignment": null,
- "bold": null,
- "color": null,
- "embedded_object": null,
- "font": null,
- "font_size": null,
- "hidden": null,
- "highlight": null,
- "hyperlink": null,
- "hyperlink_label": null,
- "italic": null,
- "language": null,
- "line_spacing": null,
- "list_spacing": null,
- "math": null,
- "rtl": null,
- "space_after": null,
- "space_before": null,
- "strike": null,
- "subscript": null,
- "superscript": null,
- "underline": null
- },
- "id": "{189EA744-BE13-467A-95BA-2667A134C0B0},15",
- "level": 1,
- "lists": [],
- "parent": null,
- "style": "{189EA744-BE13-467A-95BA-2667A134C0B0},18",
- "tags": []
- }
- ],
- "title": false,
- "unsupported": []
- }
- ]
- }
- }
- ],
- "title": "Same title"
- }
- }
- },
- "space": "{189EA744-BE13-467A-95BA-2667A134C0B0},1"
- }
- ],
- [
- {
- "id": 1,
- "operation": {
- "Pages": {
- "edits": [
- {
- "guid": [
- 137,
- 150,
- 22,
- 112,
- 113,
- 130,
- 213,
- 65,
- 143,
- 6,
- 73,
- 88,
- 176,
- 192,
23,
- 119
+ 73,
+ 161,
+ 60,
+ 51,
+ 152,
+ 144,
+ 104,
+ 92,
+ 228
],
"level": 1,
"position": {
- "Before": "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1"
+ "Before": "{9B755368-1D49-4D7E-8D33-6DC536F57848},1"
},
- "space": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1"
+ "space": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1"
},
{
"guid": [
- 65,
- 77,
+ 243,
+ 76,
116,
- 151,
+ 146,
+ 38,
+ 89,
+ 244,
+ 65,
+ 170,
+ 135,
+ 180,
+ 163,
+ 152,
+ 15,
+ 148,
+ 54
+ ],
+ "level": 2,
+ "position": "Keep",
+ "space": "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1"
+ }
+ ],
+ "observed": [
+ [
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
+ 1
+ ],
+ [
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
+ 1
+ ],
+ [
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
+ 1
+ ],
+ [
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
+ 1
+ ],
+ [
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
+ 1
+ ],
+ [
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
+ 1
+ ],
+ [
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
+ 1
+ ],
+ [
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
+ 1
+ ],
+ [
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
+ 1
+ ],
+ [
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
+ 1
+ ],
+ [
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
+ 1
+ ],
+ [
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
+ 1
+ ],
+ [
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
+ 1
+ ],
+ [
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
+ 1
+ ],
+ [
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
+ 1
+ ],
+ [
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
+ 1
+ ],
+ [
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
+ 1
+ ],
+ [
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
+ 1
+ ],
+ [
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
+ 1
+ ],
+ [
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
+ 1
+ ],
+ [
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
+ 1
+ ],
+ [
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
+ 1
+ ],
+ [
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
+ 1
+ ],
+ [
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
+ 1
+ ],
+ [
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
+ 1
+ ],
+ [
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
+ 1
+ ],
+ [
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
+ 1
+ ],
+ [
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
+ 1
+ ],
+ [
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
+ 1
+ ],
+ [
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
+ 1
+ ],
+ [
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
+ 1
+ ],
+ [
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
+ 1
+ ],
+ [
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
+ 1
+ ],
+ [
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
+ 1
+ ],
+ [
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
+ 1
+ ],
+ [
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
+ 1
+ ],
+ [
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
+ 1
+ ]
+ ]
+ }
+ },
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
+ },
+ {
+ "id": 2,
+ "operation": {
+ "Page": {
+ "after": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 175,
+ 234,
+ 69,
+ 208,
+ 233,
+ 172,
+ 79,
+ 75,
+ 151,
+ 155,
+ 227,
+ 72,
+ 164,
+ 173,
+ 230,
+ 147
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Outline": {
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},26",
+ "indents": [],
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 36.0,
+ "y": 36.0
+ },
+ "min_width": null,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},25",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 16,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 11.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Actor 8 🦀 é"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},27",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": null,
+ "tags": []
+ }
+ ],
+ "title": false,
+ "unsupported": []
+ }
+ },
+ {
+ "Title": {
+ "date": null,
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ },
+ "author": "Author",
+ "before": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 175,
+ 234,
+ 69,
+ 208,
+ 233,
+ 172,
+ 79,
+ 75,
+ 151,
+ 155,
+ 227,
+ 72,
+ 164,
+ 173,
+ 230,
+ 147
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Title": {
+ "date": null,
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ }
+ }
+ },
+ "space": "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1"
+ }
+ ],
+ [
+ {
+ "id": 1,
+ "operation": {
+ "Pages": {
+ "edits": [
+ {
+ "guid": [
+ 9,
+ 243,
+ 107,
+ 19,
20,
- 16,
+ 192,
+ 128,
+ 78,
+ 179,
+ 30,
+ 140,
+ 253,
+ 10,
+ 214,
+ 221,
+ 155
+ ],
+ "level": 1,
+ "position": {
+ "Before": "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1"
+ },
+ "space": "{C6E54364-6CD0-4764-8180-873030B9EA53},1"
+ },
+ {
+ "guid": [
+ 9,
+ 192,
+ 29,
+ 108,
+ 238,
+ 78,
+ 236,
+ 72,
+ 128,
+ 200,
+ 112,
+ 224,
+ 246,
115,
- 66,
- 138,
- 169,
- 25,
- 24,
- 111,
- 125,
+ 92,
+ 133
+ ],
+ "level": 2,
+ "position": "Keep",
+ "space": "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1"
+ }
+ ],
+ "observed": [
+ [
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
+ 1
+ ],
+ [
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
+ 1
+ ],
+ [
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
+ 1
+ ],
+ [
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
+ 1
+ ],
+ [
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
+ 1
+ ],
+ [
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
+ 1
+ ],
+ [
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
+ 1
+ ],
+ [
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
+ 1
+ ],
+ [
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
+ 1
+ ],
+ [
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
+ 1
+ ],
+ [
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
+ 1
+ ],
+ [
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
+ 1
+ ],
+ [
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
+ 1
+ ],
+ [
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
+ 1
+ ],
+ [
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
+ 1
+ ],
+ [
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
+ 1
+ ],
+ [
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
+ 1
+ ],
+ [
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
+ 1
+ ],
+ [
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
+ 1
+ ],
+ [
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
+ 1
+ ],
+ [
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
+ 1
+ ],
+ [
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
+ 1
+ ],
+ [
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
+ 1
+ ],
+ [
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
+ 1
+ ],
+ [
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
+ 1
+ ],
+ [
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
+ 1
+ ],
+ [
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
+ 1
+ ],
+ [
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
+ 1
+ ],
+ [
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
+ 1
+ ],
+ [
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
+ 1
+ ],
+ [
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
+ 1
+ ],
+ [
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
+ 1
+ ],
+ [
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
+ 1
+ ],
+ [
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
+ 1
+ ],
+ [
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
+ 1
+ ],
+ [
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
+ 1
+ ],
+ [
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
+ 1
+ ]
+ ]
+ }
+ },
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
+ },
+ {
+ "id": 2,
+ "operation": {
+ "Page": {
+ "after": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 100,
+ 67,
+ 229,
+ 198,
+ 208,
+ 108,
+ 100,
+ 71,
+ 129,
+ 128,
+ 135,
+ 48,
+ 48,
+ 185,
+ 234,
+ 83
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Outline": {
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},29",
+ "indents": [],
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 36.0,
+ "y": 36.0
+ },
+ "min_width": null,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},28",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 16,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 11.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Actor 9 🦀 é"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},30",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": null,
+ "tags": []
+ }
+ ],
+ "title": false,
+ "unsupported": []
+ }
+ },
+ {
+ "Title": {
+ "date": null,
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{C6E54364-6CD0-4764-8180-873030B9EA53},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ },
+ "author": "Author",
+ "before": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 100,
+ 67,
+ 229,
+ 198,
+ 208,
+ 108,
+ 100,
+ 71,
+ 129,
+ 128,
+ 135,
+ 48,
+ 48,
+ 185,
+ 234,
+ 83
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Title": {
+ "date": null,
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{C6E54364-6CD0-4764-8180-873030B9EA53},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{C6E54364-6CD0-4764-8180-873030B9EA53},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ }
+ }
+ },
+ "space": "{C6E54364-6CD0-4764-8180-873030B9EA53},1"
+ }
+ ],
+ [
+ {
+ "id": 1,
+ "operation": {
+ "Pages": {
+ "edits": [
+ {
+ "guid": [
+ 223,
+ 187,
+ 17,
+ 5,
+ 4,
+ 237,
+ 130,
+ 69,
+ 161,
+ 20,
+ 5,
+ 179,
+ 161,
+ 87,
+ 94,
+ 148
+ ],
+ "level": 1,
+ "position": {
+ "Before": "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1"
+ },
+ "space": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1"
+ },
+ {
+ "guid": [
+ 219,
+ 20,
+ 156,
+ 115,
+ 106,
+ 105,
+ 134,
+ 64,
+ 131,
+ 56,
+ 1,
+ 213,
+ 21,
+ 147,
+ 139,
+ 107
+ ],
+ "level": 2,
+ "position": "Keep",
+ "space": "{00B10C58-6649-428D-A081-3EBBA6E88E97},1"
+ }
+ ],
+ "observed": [
+ [
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
+ 1
+ ],
+ [
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
+ 1
+ ],
+ [
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
+ 1
+ ],
+ [
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
+ 1
+ ],
+ [
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
+ 1
+ ],
+ [
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
+ 1
+ ],
+ [
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
+ 1
+ ],
+ [
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
+ 1
+ ],
+ [
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
+ 1
+ ],
+ [
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
+ 1
+ ],
+ [
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
+ 1
+ ],
+ [
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
+ 1
+ ],
+ [
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
+ 1
+ ],
+ [
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
+ 1
+ ],
+ [
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
+ 1
+ ],
+ [
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
+ 1
+ ],
+ [
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
+ 1
+ ],
+ [
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
+ 1
+ ],
+ [
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
+ 1
+ ],
+ [
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
+ 1
+ ],
+ [
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
+ 1
+ ],
+ [
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
+ 1
+ ],
+ [
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
+ 1
+ ],
+ [
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
+ 1
+ ],
+ [
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
+ 1
+ ],
+ [
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
+ 1
+ ],
+ [
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
+ 1
+ ],
+ [
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
+ 1
+ ],
+ [
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
+ 1
+ ],
+ [
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
+ 1
+ ],
+ [
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
+ 1
+ ],
+ [
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
+ 1
+ ],
+ [
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
+ 1
+ ],
+ [
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
+ 1
+ ],
+ [
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
+ 1
+ ],
+ [
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
+ 1
+ ],
+ [
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
+ 1
+ ]
+ ]
+ }
+ },
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
+ },
+ {
+ "id": 2,
+ "operation": {
+ "Page": {
+ "after": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 141,
+ 116,
+ 241,
+ 137,
+ 73,
+ 103,
+ 208,
+ 74,
+ 186,
+ 246,
+ 7,
+ 233,
+ 249,
+ 192,
+ 88,
+ 229
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Outline": {
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},32",
+ "indents": [],
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 36.0,
+ "y": 36.0
+ },
+ "min_width": null,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},31",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 17,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 11.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Actor 10 🦀 é"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},33",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": null,
+ "tags": []
+ }
+ ],
+ "title": false,
+ "unsupported": []
+ }
+ },
+ {
+ "Title": {
+ "date": null,
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ },
+ "author": "Author",
+ "before": {
+ "created": 134348779900000000,
+ "definitions": {
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},18": {
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "kind": {
+ "name": "PageTitle",
+ "type": "Style"
+ }
+ }
+ },
+ "identity": [
+ 141,
+ 116,
+ 241,
+ 137,
+ 73,
+ 103,
+ 208,
+ 74,
+ 186,
+ 246,
+ 7,
+ 233,
+ 249,
+ 192,
+ 88,
+ 229
+ ],
+ "margin_origin": [
+ 0.0,
+ 0.0
+ ],
+ "objects": [
+ {
+ "Title": {
+ "date": null,
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},13",
+ "layout": {
+ "max_height": null,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": 0.0,
+ "y": 0.0
+ },
+ "outlines": [
+ {
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
+ "layout": {
+ "max_height": 21.600000381469727,
+ "max_width": null,
+ "reserved_width": null,
+ "width_set_by_user": null,
+ "x": null,
+ "y": null
+ },
+ "min_width": 162.0,
+ "paragraphs": [
+ {
+ "collapsed": false,
+ "content": {
+ "Text": {
+ "date_field": null,
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},16",
+ "tags": [],
+ "text": {
+ "spans": [
+ {
+ "end": 10,
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": "Calibri",
+ "font_size": 17.0,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": 1033,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ }
+ }
+ ],
+ "text": "Same title"
+ }
+ }
+ },
+ "format": {
+ "alignment": null,
+ "bold": null,
+ "color": null,
+ "embedded_object": null,
+ "font": null,
+ "font_size": null,
+ "hidden": null,
+ "highlight": null,
+ "hyperlink": null,
+ "hyperlink_label": null,
+ "italic": null,
+ "language": null,
+ "line_spacing": null,
+ "list_spacing": null,
+ "math": null,
+ "math_object": null,
+ "rtl": null,
+ "space_after": null,
+ "space_before": null,
+ "strike": null,
+ "subscript": null,
+ "superscript": null,
+ "underline": null
+ },
+ "id": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},15",
+ "level": 1,
+ "lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
+ "parent": null,
+ "style": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},18",
+ "tags": []
+ }
+ ],
+ "title": true,
+ "unsupported": []
+ }
+ ]
+ }
+ }
+ ],
+ "title": "Same title"
+ }
+ }
+ },
+ "space": "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1"
+ }
+ ],
+ [
+ {
+ "id": 1,
+ "operation": {
+ "Pages": {
+ "edits": [
+ {
+ "guid": [
+ 69,
+ 87,
+ 190,
154,
- 123
+ 161,
+ 45,
+ 245,
+ 76,
+ 131,
+ 158,
+ 203,
+ 234,
+ 216,
+ 244,
+ 254,
+ 235
+ ],
+ "level": 1,
+ "position": {
+ "Before": "{58E99482-710A-4938-8CFB-88A1C9B946C9},1"
+ },
+ "space": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1"
+ },
+ {
+ "guid": [
+ 35,
+ 252,
+ 68,
+ 95,
+ 80,
+ 200,
+ 215,
+ 77,
+ 190,
+ 11,
+ 114,
+ 173,
+ 3,
+ 70,
+ 77,
+ 30
],
"level": 2,
"position": "Keep",
- "space": "{2B736B19-2D9C-4E76-A732-478D533D717A},1"
+ "space": "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1"
}
],
"observed": [
[
- "{869D5929-6E5E-4EDB-9639-4C56977DD447},1",
+ "{0B37E922-551A-48F8-BCAC-4AB3503B4D28},1",
1
],
[
- "{B0B53F94-0105-4C59-B65B-9473F49BFF41},1",
+ "{74492C4A-164B-40E9-B297-4D3B4685347D},1",
1
],
[
- "{0E98EE82-B78F-4872-8BD9-5D9B23A817C5},1",
+ "{DAFF533D-608B-4735-BA1D-2354E8CB8A69},1",
1
],
[
- "{C837A033-F055-4455-B45F-17D82016921C},1",
+ "{8B766F11-2A4F-4D95-8473-D3CA68129E11},1",
1
],
[
- "{89D86121-BF5C-418B-BB92-CBFFA8EF545F},1",
+ "{28E0CC5F-68BC-4A86-9ED7-114FFD3BAE9A},1",
1
],
[
- "{57E835EA-2799-4118-B55C-7BB1E51C6941},1",
+ "{31FFA5F9-C1B8-412D-A2D6-7ACC3CC16FD0},1",
1
],
[
- "{F7EECCCF-B6B4-44F2-A543-36837EC18B8A},1",
+ "{AFCD09F6-1085-4582-BDB2-4B91E15D2088},1",
1
],
[
- "{361A0F09-EA63-4F2D-9620-C061D4E4707E},1",
+ "{A94D5882-C902-4CAE-B38E-2ED56EEF177F},1",
1
],
[
- "{EB3940F1-F255-42BE-8C31-DD09E86DBAAF},1",
+ "{5AB37A0F-5702-4C8E-A8C6-79ED6ED1E69F},1",
1
],
[
- "{C2870D07-8ADC-44BB-9F12-15D6C3708689},1",
+ "{F212795E-0E4B-4844-A8A6-ABD7F7025124},1",
1
],
[
- "{1E0C6331-32C9-4EF9-8087-150A8669FA91},1",
+ "{1786F2CA-0A43-4081-8B55-B207EEE0331C},1",
1
],
[
- "{ED9769DD-99D6-4BE2-B980-580DA9C4DFCE},1",
+ "{3E966EF8-B7B4-483F-B241-8F21DF318AB3},1",
1
],
[
- "{17C30054-7129-4A10-9D00-4D5545E4F4BA},1",
+ "{0D361C76-92FD-4B76-901B-809C2C3C3CE6},1",
1
],
[
- "{4C5FBA5B-E348-4750-ACE4-E9694D527BFF},1",
+ "{AE89305A-73F4-46B5-B41D-18884685D896},1",
1
],
[
- "{BD0EF658-4D0F-42A7-B546-B4F4A77D246B},1",
+ "{551D2637-2AA7-4923-B2DD-31C2E1489FD2},1",
1
],
[
- "{6FEA70FA-1451-4A27-8A8E-C4CC3B713CF6},1",
+ "{CBF82C86-3A8B-457F-92A4-1AC7BF436CE9},1",
1
],
[
- "{68A1E0E1-7A39-4AB6-AD71-4D8A18878D79},1",
+ "{42010094-E377-4A97-9395-AD45808D0552},1",
1
],
[
- "{7E9041BD-301B-4B5B-9456-1C92050E4914},1",
+ "{0F6ABB5E-A021-4E1D-B187-7A72E74000DC},1",
1
],
[
- "{EFA77BAE-8A98-4176-B536-B615D1D2ED2B},1",
+ "{F9DA3139-5856-4B11-95C0-356683E3ACFE},1",
1
],
[
- "{87AC0239-51A5-47C6-BAF4-926CCF56385C},1",
+ "{439B80E0-9D4C-4A2F-9163-4E301491364D},1",
1
],
[
- "{C50BF7FC-F848-4B91-B8C8-743D0AA5F195},1",
+ "{B03B973C-50BC-4B9A-9914-B1D5C0CF6197},1",
1
],
[
- "{FD8D07D0-C447-4516-A7DB-F8522B77D4A7},1",
+ "{A459C474-E6EB-4BE5-9193-271799B2860B},1",
1
],
[
- "{D2E1FE57-F45D-49C3-B388-95222ACA3886},1",
+ "{4ED14CEE-8560-4125-B488-9945C116741E},1",
1
],
[
- "{7F6702B3-C977-436F-82AF-403E2BE950E7},1",
+ "{C4FF8FE4-4C43-461F-98DD-EB1FF2A863B2},1",
1
],
[
- "{688C4EA1-80F5-4D85-B9BB-F8633FF3C0CA},1",
+ "{932BE37F-05AA-4EFB-85D8-A33445E738B3},1",
1
],
[
- "{754FA957-C432-4502-A5CF-EE44449462C0},1",
+ "{9B755368-1D49-4D7E-8D33-6DC536F57848},1",
1
],
[
- "{D2197C55-D962-4DF0-8B14-26F88C06D6FA},1",
+ "{D045EAAF-ACE9-4B4F-979B-E348A4ADE693},1",
1
],
[
- "{87B83BA8-A906-4F71-A6CA-3E8133A75D34},1",
+ "{5CA4C59F-B400-4BC6-8B90-30ECAC35CB43},1",
1
],
[
- "{F2D6AEBB-98EA-4F10-991F-5243E74AF450},1",
+ "{D63FB383-FB37-44F9-AEBB-E868E903A2BB},1",
1
],
[
- "{406687D7-F9E9-491B-85DA-166DE6CD5A60},1",
+ "{C6E54364-6CD0-4764-8180-873030B9EA53},1",
1
],
[
- "{1F73BF36-9FC2-495D-844D-B370D5C47DE7},1",
+ "{DEEC391B-F2D1-4EB1-BEB1-57598DFBB982},1",
1
],
[
- "{E9BD343F-4A66-4DE2-81F9-3789CCA22818},1",
+ "{9E7616ED-DE19-4625-8EA0-0C5DEB18B690},1",
1
],
[
- "{189EA744-BE13-467A-95BA-2667A134C0B0},1",
+ "{89F1748D-6749-4AD0-BAF6-07E9F9C058E5},1",
1
],
[
- "{017F5881-F818-4C7C-B9F9-6BCB4085F1D0},1",
+ "{00B10C58-6649-428D-A081-3EBBA6E88E97},1",
1
],
[
- "{CD0D17F4-25D8-4076-9AF7-47D9CDEFCF0A},1",
+ "{58E99482-710A-4938-8CFB-88A1C9B946C9},1",
1
],
[
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1",
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1",
1
],
[
- "{2B736B19-2D9C-4E76-A732-478D533D717A},1",
+ "{15A45C01-A9E8-42E2-A267-C7FCE728815E},1",
1
]
]
}
},
- "space": "{90FCDB0C-36AE-422F-B4FE-67676826FE36},1"
+ "space": "{A5A2AFBE-1DF1-4190-AAC7-1AD29C9564F2},1"
},
{
"id": 2,
"operation": {
"Page": {
"after": {
- "created": 134335976560000000,
+ "created": 134348779900000000,
"definitions": {
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},18": {
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},18": {
"format": {
"alignment": null,
"bold": null,
@@ -7027,6 +7753,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7041,6 +7768,24 @@
}
}
},
+ "identity": [
+ 213,
+ 201,
+ 33,
+ 247,
+ 106,
+ 154,
+ 95,
+ 64,
+ 148,
+ 201,
+ 155,
+ 133,
+ 167,
+ 238,
+ 185,
+ 128
+ ],
"margin_origin": [
0.0,
0.0
@@ -7048,7 +7793,7 @@
"objects": [
{
"Outline": {
- "id": "{00E55A56-1362-4A11-ACD3-2117BCCE619E},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},35",
"indents": [],
"layout": {
"max_height": null,
@@ -7065,7 +7810,7 @@
"content": {
"Text": {
"date_field": null,
- "id": "{AD3FBA83-B057-48DF-9731-DEBD6F95BDBE},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},34",
"tags": [],
"text": {
"spans": [
@@ -7087,6 +7832,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7117,6 +7863,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7125,9 +7872,13 @@
"superscript": null,
"underline": null
},
- "id": "{77E85A17-9EF5-4C79-B11B-48A5CE7FE0FD},0",
+ "id": "{91379CE6-91DA-48BA-B306-77E4CEB068B6},36",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
"style": null,
"tags": []
@@ -7140,7 +7891,7 @@
{
"Title": {
"date": null,
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},13",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -7151,24 +7902,29 @@
},
"outlines": [
{
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},14",
- "indents": [],
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},16",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},16",
"tags": [],
"text": {
"spans": [
@@ -7190,6 +7946,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7220,6 +7977,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7228,15 +7986,19 @@
"superscript": null,
"underline": null
},
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},15",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},18",
+ "style": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -7247,9 +8009,9 @@
},
"author": "Author",
"before": {
- "created": 134335976560000000,
+ "created": 134348779900000000,
"definitions": {
- "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},18": {
+ "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},18": {
"format": {
"alignment": null,
"bold": null,
@@ -7266,6 +8028,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7280,6 +8043,24 @@
}
}
},
+ "identity": [
+ 213,
+ 201,
+ 33,
+ 247,
+ 106,
+ 154,
+ 95,
+ 64,
+ 148,
+ 201,
+ 155,
+ 133,
+ 167,
+ 238,
+ 185,
+ 128
+ ],
"margin_origin": [
0.0,
0.0
@@ -7288,7 +8069,7 @@
{
"Title": {
"date": null,
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},13",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},13",
"layout": {
"max_height": null,
"max_width": null,
@@ -7299,24 +8080,29 @@
},
"outlines": [
{
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},14",
- "indents": [],
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},14",
+ "indents": [
+ 18.0,
+ 0.0,
+ 27.0,
+ 27.0
+ ],
"layout": {
- "max_height": null,
+ "max_height": 21.600000381469727,
"max_width": null,
"reserved_width": null,
"width_set_by_user": null,
"x": null,
"y": null
},
- "min_width": null,
+ "min_width": 162.0,
"paragraphs": [
{
"collapsed": false,
"content": {
"Text": {
"date_field": null,
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},16",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},16",
"tags": [],
"text": {
"spans": [
@@ -7338,6 +8124,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7368,6 +8155,7 @@
"line_spacing": null,
"list_spacing": null,
"math": null,
+ "math_object": null,
"rtl": null,
"space_after": null,
"space_before": null,
@@ -7376,15 +8164,19 @@
"superscript": null,
"underline": null
},
- "id": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},15",
+ "id": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},15",
"level": 1,
"lists": [],
+ "media": {
+ "recordings": [],
+ "time_ms": null
+ },
"parent": null,
- "style": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},18",
+ "style": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},18",
"tags": []
}
],
- "title": false,
+ "title": true,
"unsupported": []
}
]
@@ -7395,7 +8187,7 @@
}
}
},
- "space": "{CCBB5969-BCE8-498B-BE1A-98FD3A44DB1A},1"
+ "space": "{F721C9D5-9A6A-405F-94C9-9B85A7EEB980},1"
}
]
],
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/pages.one b/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/pages.one
index 2eeab58e5d1fbb41822281555635300f75e4b5b6..9b6e76a7773ef0b59eabeb8d17fa2ef308f35bee 100644
Binary files a/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/pages.one and b/corpus/page-lifecycle/offline-edits/twelve-clients/candidate/pages.one differ
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/commands.jsonl b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/commands.jsonl
index 39cb578ade0cf61be05f9d640e0e5b37c168fc0a..06597f625d9483210f4de67a9889ac55b9b53817 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/commands.jsonl
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-16C2E4D4 -ExpectedPages 37", "exit": 0, "stdout": "Read 1 sections and 37 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-8EABB42E -ExpectedPages 37", "exit": 0, "stdout": "Read 1 sections and 37 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/machine.json b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/machine.json
index f3647d86a305f6004b3249b3cb1cea0accb16037..ff2ebdbb2963c8cd6b155add9ecdefbc44e6be26 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/machine.json
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-16c2e4d4", "hostname": "ONE-M6-16C2E4D4"}
+{"name": "m6-8eabb42e", "hostname": "ONE-M6-8EABB42E"}
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/Open Notebook.onetoc2 b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/Open Notebook.onetoc2
index 3d74ced3a87a8c55ef5f637d4a211d3c0717d838..6837468ab622401a4e663df3a90ef55780cc8947 100644
Binary files a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/Open Notebook.onetoc2 and b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/pages.one b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/pages.one
index 629137c244ba6e9c8c0f461e46d2551adae3d066..b8133cd8158dd671b7dc8674bbdea6497ec50570 100644
Binary files a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/pages.one and b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/notebook/pages.one differ
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/environment.json b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/environment.json
index 747e291e640b73db771af0151c2ebe1ecb3627e6..5bc3099f6417b20ac85d015222d5e04f2b86638d 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/environment.json
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-16C2E4D4",
+ "hostname": "ONE-M6-8EABB42E",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/hierarchy.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/hierarchy.xml
index 569bd9d2624ab7dc4f36e751f769b5ed2b492d19..d4e5408b7110781675badce1132255454692e856 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-000.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-000.xml
index ddc49e628e7e1f06935c6038502eecf01489308e..f956d2bc0d8ebcb15763862cc25f573f106f5bb6 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-001.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-001.xml
index ea93ab8f4c1d76eaf9c633fbf2ab1a8a58b18e51..ae141a6149e9721d7d0177cf4b3802f63ff49262 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-001.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-002.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-002.xml
index 2d8525d02868d0f1287b344cc030bac1f5798efe..1fee8db2fc02a1a2a2d381c3b0362d8cf1ecd20a 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-002.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-002.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-003.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-003.xml
index 6a6d89afdf7796f811b0cd05a0dc0124da540dac..3e56be4f60c0ce6a16b7ac849697a55a9933ac78 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-003.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-003.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-004.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-004.xml
index 91ca1b13844bddd0066ef9b4b51502b034f3003d..10195a025ab5c617a13ea3282851f4ddbd436b7b 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-004.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-004.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-005.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-005.xml
index 54244aa786c49bd758072198f180fa18e428f132..e5d3e7c8ad10e447a5511264525a4f957c325059 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-005.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-005.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-006.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-006.xml
index 0b65c27a4cb7593a90534f1ae39f8ac2034e0e1c..c16489d9a41200f4343d3dd29345e344e694b476 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-006.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-006.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-007.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-007.xml
index ab512d7f8beab5e69ca851b04ef0c4822431cf42..16b0461fa75431284f0080b60d83b8ff3b0edffd 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-007.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-007.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-008.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-008.xml
index 8bbea50d74a13c69d55e0804031265973456d572..2e84c7ba03966e3e33df68748aed2d018c1202af 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-008.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-008.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-009.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-009.xml
index 045fcb701b9f60ea1d82b63dfbbd936c10a0d91d..3642d3fb103d90160706f2d7891acb0b0322d472 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-009.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-009.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-010.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-010.xml
index 3d16a64f844515662eb47ca89db8eaca383f37bd..8cbdb433032edcb24c9d130526f988b74de62be2 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-010.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-010.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-011.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-011.xml
index 04b3240f657876147e0982ee8a4e828930d92df9..af6b915766a5debc5a376a647184c2962f7a281a 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-011.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-011.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-012.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-012.xml
index 8b383a7af0f74c659ebf68f068b3e660c3d58d06..1ffa4533ae6c5d74bb63f0ad650f73ed8bded3c6 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-012.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-012.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-013.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-013.xml
index 8c1d476171c64a10f1465826b3e4208ed2d13d7a..1794ab1fe1dc217cde6acbae4f6892e636e97aec 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-013.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-013.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-014.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-014.xml
index 08c872d0ad481307923505f968cc3683259b630c..874b1dd3ee8a63ef23f5f160c1ac972ce7b08549 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-014.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-014.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-015.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-015.xml
index 6f61dc1a76e074e554a5c25d23137ac02d203390..8e27a1bbae8a87eb791dfc9ea1f8c48a56b5b43a 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-015.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-015.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-016.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-016.xml
index 0c0d0e6ad4ea243067b5114bc23658cb70fb9a7e..88a9f53d15a772ff208d244526aeac8d82889818 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-016.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-016.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-017.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-017.xml
index 9814cd630806eefc93ee9efa5e1d18fa17a524d9..130b32e55785dd0830853e3ff4539669798d5ec6 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-017.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-017.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-018.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-018.xml
index c5070fd54278cf962a0213a7016a096db7ddf28b..b7a0fe083e4db08e3fcb40e78a7eb7817ea0b0c4 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-018.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-018.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-019.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-019.xml
index e8fa05da717a35ae9070c0754343dcbcb6cd760d..a3d371ef5fdbf0a79a5025f5c4fc210fbc739c65 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-019.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-019.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-020.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-020.xml
index b31abf3925f0c62ba09ce2c11b22f566ec63a0dd..c49d76ebbade837cb66354116df116cab56e629d 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-020.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-020.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-021.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-021.xml
index a21a4dd734a31553b4c6a69ccd8542ed6f80f834..0d7e61b61d337a91ea28d2ae80a5c4f6a314540d 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-021.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-021.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-022.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-022.xml
index e44c331c3277c2a6cf462b78082895a1ae6265c3..c9c53e96b57d4e0e4a6c3b74c6b77928ea8ab840 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-022.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-022.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-023.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-023.xml
index 7c314f860d8a9b791be5c9d6421d67b5751f3674..8855f6c8d97e2f7583817ea668dec1c72ab15c0f 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-023.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-023.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-024.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-024.xml
index c6e2f5e91f62380a0aa8245e28fce80bf5523fa6..22f7a7e07f0828a62b346324ff4b70367f549a64 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-024.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-024.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-025.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-025.xml
index 2463cde990f11f382f3e5cf07b844396ebe3f1d9..6cfa6fa1617e39520c4cb9f73739821535eb4e26 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-025.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-025.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-026.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-026.xml
index da1e7da17cd18a1e94fbb4fd3175f186c1d12eea..7b18e8a03e744926baa8c5b57241ee81fe4d75e7 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-026.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-026.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-027.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-027.xml
index 126f6719eb016d3e246dd0e921b97e7e94634d4f..d8ca847ff3f4580943079fdf3dc79a74651e07ca 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-027.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-027.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-028.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-028.xml
index c258afb97ddcaccf28f6faca8c9aec7c2c80925b..98a35d0a50b28c89796e47d3ea1503c5ba9cd7d1 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-028.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-028.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-029.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-029.xml
index 8a4e8bae89e5afdbcc79408532e77f0d30e65726..49840d7d61f3d52fc5d3ebdc7b64bf0306fa6f0b 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-029.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-029.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-030.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-030.xml
index f8f903f4ce64e3b1ca3bd9cf6e3afba2d34b6f73..ab1b309913b242d127e7996a05427c62445bc275 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-030.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-030.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-031.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-031.xml
index 2b25bc0ee284254da60a0fa8afb549b0d17705b7..ce5ac8195e502cbf22f8c365ba31a1d86ff1df15 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-031.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-031.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-032.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-032.xml
index 365f61997ffcc80c2cf7f2766f40d546333596c8..9164405b9103bed6b032fedd045b32b499617165 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-032.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-032.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-033.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-033.xml
index a666cdc6381ff2f08d9e4a612fb678d27ed8e31b..ec6b60bf7eee61dc27edb850e7aecbb351b90de4 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-033.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-033.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-034.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-034.xml
index 34923dd48e15d94c96eb55cefbd03f4d70737607..1d4e3f7a637e4a08a0fde419c8e90d54fcd1cc52 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-034.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-034.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-035.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-035.xml
index 0220fa4fc4bac580f38180ac4ac58a5c419533a5..2ef2198577a1eef93cf20880f3a141bc1925a145 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-035.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-035.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-036.xml b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-036.xml
index 1ebc46fdbeb645acc7f5e0c820039c95253bbd48..77deb2d431d3caa80ec2da3888f947fdc4e20a1a 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-036.xml
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/read/page-036.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/run.json b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/run.json
index 6c89101554490de6bed888dd5cc6762ec72d1559..02a7b4ecd7bea33ed69ef4d827f4f0c8cb99ddc2 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/run.json
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m33/page-clients2/candidate",
+ "notebook": "/Users/clo/dev/one/evidence/titles/twelve-clients",
"expected_pages": 37,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/source.json b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/source.json
index 5a7b7bdc33c9835a75ee62c9515d3481b0c6c5ae..c910569548551aae0de5ef213251a15706e376a9 100644
--- a/corpus/page-lifecycle/offline-edits/twelve-clients/cold/source.json
+++ b/corpus/page-lifecycle/offline-edits/twelve-clients/cold/source.json
@@ -1,8 +1,14 @@
[
+ {
+ "path": "manifest.json",
+ "bytes": 292907,
+ "sha256": "fea1d64b22da84d023d4c9014175f8e92a13acba099c7a1a3f8eae30d6c6407f",
+ "mtime_ns": 1790404395466294564
+ },
{
"path": "pages.one",
- "bytes": 155344,
- "sha256": "623ade8b5ee6fc837ae63d5293791039ecd17da9cb8bc5e243ea20cadf37958c",
- "mtime_ns": 1789124063040528117
+ "bytes": 152360,
+ "sha256": "302b6d2d31bc8f539a2217aed3391973678576b0aea1ce82c6e21760d6402e14",
+ "mtime_ns": 1790404395457867619
}
]
diff --git a/corpus/page-lifecycle/page-edits/stress/candidate/movement.one b/corpus/page-lifecycle/page-edits/stress/candidate/movement.one
index 82d300255880a5020cd967ddc023fd5663f478f3..e8be6da6e52065366b844a75b9b7373413803a5c 100644
Binary files a/corpus/page-lifecycle/page-edits/stress/candidate/movement.one and b/corpus/page-lifecycle/page-edits/stress/candidate/movement.one differ
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/notebook/Open Notebook.onetoc2 b/corpus/page-lifecycle/page-edits/stress/cold/notebook/Open Notebook.onetoc2
index bbec2b3cf53ddd4da36fa14c81cf6cee27fe9049..85153be06a16ae46c46a7c7fda7ca11450703c9c 100644
Binary files a/corpus/page-lifecycle/page-edits/stress/cold/notebook/Open Notebook.onetoc2 and b/corpus/page-lifecycle/page-edits/stress/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/notebook/movement.one b/corpus/page-lifecycle/page-edits/stress/cold/notebook/movement.one
index b6a432349a6a27d35eeda9597df192403f6dad04..f14e4c4ab2f0ea704501a5455fc12b4aa001168c 100644
Binary files a/corpus/page-lifecycle/page-edits/stress/cold/notebook/movement.one and b/corpus/page-lifecycle/page-edits/stress/cold/notebook/movement.one differ
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/read/environment.json b/corpus/page-lifecycle/page-edits/stress/cold/read/environment.json
index c3ab70aea40dd3fb0ebc12be67640dc0feb2f474..5c7ed34e589a221ce9c7dacf9b6fe49f586fdb95 100644
--- a/corpus/page-lifecycle/page-edits/stress/cold/read/environment.json
+++ b/corpus/page-lifecycle/page-edits/stress/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-40A088EC",
+ "hostname": "ONE-M6-02A94B20",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/read/hierarchy.xml b/corpus/page-lifecycle/page-edits/stress/cold/read/hierarchy.xml
index ad6751baa8f875d81ab183864481c190c503b806..64973a37a20b9459d706489d5330f4d6dd40fef1 100644
--- a/corpus/page-lifecycle/page-edits/stress/cold/read/hierarchy.xml
+++ b/corpus/page-lifecycle/page-edits/stress/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/read/page-000.xml b/corpus/page-lifecycle/page-edits/stress/cold/read/page-000.xml
index 53ec8f0dc30ef0c4c5b6ee1aa373b10177b51339..c3571e8919eaa3402e2b419914972f30b41d9dab 100644
--- a/corpus/page-lifecycle/page-edits/stress/cold/read/page-000.xml
+++ b/corpus/page-lifecycle/page-edits/stress/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/page-edits/stress/cold/read/page-001.xml b/corpus/page-lifecycle/page-edits/stress/cold/read/page-001.xml
index a01e9753e0c69fe00274d33b324c0a6b17163904..73a489faf30552b7354e9c95d7ccb0d82f4bcc02 100644
--- a/corpus/page-lifecycle/page-edits/stress/cold/read/page-001.xml
+++ b/corpus/page-lifecycle/page-edits/stress/cold/read/page-001.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/page-lifecycle/page-edits/stress/provenance.json b/corpus/page-lifecycle/page-edits/stress/provenance.json
index 201ee7ff57e0ba45a9524507a119cd26d1f247c3..6cd56bfea3b4fa0ebb29bbe72c32bd9062f6def1 100644
--- a/corpus/page-lifecycle/page-edits/stress/provenance.json
+++ b/corpus/page-lifecycle/page-edits/stress/provenance.json
@@ -1,10 +1,10 @@
{
"generator": "crates/onestore/tests/page_movement.rs::repeated_nesting_retains_series_history_across_revision_checkpoints",
"edits": 520,
- "capture": "evidence/m10/page-edit-stress-cold-01",
+ "capture": "evidence/titles/cold-stress",
"machine": {
- "name": "m6-40a088ec",
- "hostname": "ONE-M6-40A088EC"
+ "name": "m6-02a94b20",
+ "hostname": "ONE-M6-02A94B20"
},
"teardown": {
"absent": true
@@ -12,9 +12,9 @@
"source": [
{
"path": "movement.one",
- "bytes": 2635536,
- "sha256": "77dbec39ca25558b596b477d57117416f23ee133519f5179d7ebf1a33b38c248",
- "mtime_ns": 1788936082839470214
+ "bytes": 959216,
+ "sha256": "e2948ff3d01839a2c6a7908633739e97c4ebbe28e584c105bb1166669508758f",
+ "mtime_ns": 1790404366792422729
}
]
}
diff --git a/corpus/paragraph-edit/README.md b/corpus/paragraph-edit/README.md
index c37d217f2c67e340b184f342ea562b514b76feb0..13ebe199e69cb9b6431fcd8a29d23a249168f47b 100644
--- a/corpus/paragraph-edit/README.md
+++ b/corpus/paragraph-edit/README.md
@@ -28,7 +28,8 @@ when regenerating the corpus.
`rust-split` retains twelve `ParagraphSplit` outputs, their cold native captures,
and a second native session typing into four empty boundary paragraphs. The
-hyperlink case stays unchanged because this operation rejects fields. The Rust
+hyperlink case has no output: the operation rejected fields when this row was
+captured, and the writer now splits before a link as OneNote does. The Rust
test `export_native_paragraph_splits` generates candidate notebooks; its output
directory comes from `ONESTORE_PARAGRAPH_OUTPUT`. Native character/style comparisons
use both the keyboard-generated controls and the Rust-written notebooks. Empty
diff --git a/corpus/picture-edit/inserted/candidate/Open Notebook.onetoc2 b/corpus/picture-edit/inserted/candidate/Open Notebook.onetoc2
index 79f8f955db3b58cd2ae471c00ae2b66c95f81f62..d2fa7bd93a13d2c6527c96fb7ab415970dec9e22 100644
Binary files a/corpus/picture-edit/inserted/candidate/Open Notebook.onetoc2 and b/corpus/picture-edit/inserted/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/picture-edit/inserted/candidate/pictures.one b/corpus/picture-edit/inserted/candidate/pictures.one
index af4169c68f7c76ead1f32f25685131438a9fc7a1..514ff7e2e0d9de555074590b90cf2cc6683d0d82 100644
Binary files a/corpus/picture-edit/inserted/candidate/pictures.one and b/corpus/picture-edit/inserted/candidate/pictures.one differ
diff --git a/corpus/picture-edit/inserted/cold/commands.jsonl b/corpus/picture-edit/inserted/cold/commands.jsonl
index f077978e124b796017ac989959a7b5e48d27684c..3f288baca3dd068b8e3f376ffc70b3dd1447c929 100644
--- a/corpus/picture-edit/inserted/cold/commands.jsonl
+++ b/corpus/picture-edit/inserted/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-A5A8705B -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-424D1706 -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/picture-edit/inserted/cold/machine.json b/corpus/picture-edit/inserted/cold/machine.json
index 80a47e2a0dd156babc8d6e6c895da3a3144fd28a..3477c66572b21da7d3586f5a6df5e54ff402d5a8 100644
--- a/corpus/picture-edit/inserted/cold/machine.json
+++ b/corpus/picture-edit/inserted/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-a5a8705b", "hostname": "ONE-M6-A5A8705B"}
+{"name": "m6-424d1706", "hostname": "ONE-M6-424D1706"}
diff --git a/corpus/picture-edit/inserted/cold/notebook/Open Notebook.onetoc2 b/corpus/picture-edit/inserted/cold/notebook/Open Notebook.onetoc2
index 836282818b6fe532b91bf32edf78fba4fe160b7a..ae76ec5425f6faf5125d05880e345f96a56b592e 100644
Binary files a/corpus/picture-edit/inserted/cold/notebook/Open Notebook.onetoc2 and b/corpus/picture-edit/inserted/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/picture-edit/inserted/cold/notebook/pictures.one b/corpus/picture-edit/inserted/cold/notebook/pictures.one
index 0dd87dcf4b41be4ca1b5b4b921d9462358aae3b1..6b396de0de3228128bd0d0c2c133c91c71b2b712 100644
Binary files a/corpus/picture-edit/inserted/cold/notebook/pictures.one and b/corpus/picture-edit/inserted/cold/notebook/pictures.one differ
diff --git a/corpus/picture-edit/inserted/cold/read/environment.json b/corpus/picture-edit/inserted/cold/read/environment.json
index f1032fa5ff0c8dddcee05b60f81366ec2671b1f9..ee895b3836477f946d2c238f156ceea0ebf39f6b 100644
--- a/corpus/picture-edit/inserted/cold/read/environment.json
+++ b/corpus/picture-edit/inserted/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-A5A8705B",
+ "hostname": "ONE-M6-424D1706",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/picture-edit/inserted/cold/read/hierarchy.xml b/corpus/picture-edit/inserted/cold/read/hierarchy.xml
index dce86fad6744777127a6c19a6146cadb358f799f..35cd4ee6227ccc2c3c6878c3adfc1d64b719d385 100644
--- a/corpus/picture-edit/inserted/cold/read/hierarchy.xml
+++ b/corpus/picture-edit/inserted/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/picture-edit/inserted/cold/read/page-000.xml b/corpus/picture-edit/inserted/cold/read/page-000.xml
index aa8840aa5f2fb3e14fe2cb7223dc8638d73f1a92..b2dc6e6e2d92ee748769d63567460efe89f7d3d5 100644
--- a/corpus/picture-edit/inserted/cold/read/page-000.xml
+++ b/corpus/picture-edit/inserted/cold/read/page-000.xml
@@ -1,4 +1,4 @@
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
AAAAAElFTkSuQmCC
-
+
diff --git a/corpus/picture-edit/inserted/cold/run.json b/corpus/picture-edit/inserted/cold/run.json
index 6e98c47fb0e8f3f15888fbc77851de46e6db6301..b1dce8446b05ce05cfde663279dd19c7dfb9c382 100644
--- a/corpus/picture-edit/inserted/cold/run.json
+++ b/corpus/picture-edit/inserted/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/pictures",
+ "notebook": "/Users/clo/dev/one/evidence/titles/picture-inserted",
"expected_pages": 1,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/picture-edit/inserted/cold/source.json b/corpus/picture-edit/inserted/cold/source.json
index 006d1122e0e6b26381b4b3c32834b6beb5866625..353bb8d4addd1e4959107513b93b3f4001dde9d5 100644
--- a/corpus/picture-edit/inserted/cold/source.json
+++ b/corpus/picture-edit/inserted/cold/source.json
@@ -2,13 +2,13 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1604,
- "sha256": "0eddd691b52d26bac222cf7e52add3c9909446647b452fb193f03d49e273426a",
- "mtime_ns": 1789243635388246438
+ "sha256": "52e4f16e4fc2b25971d0b1e2504679373b413d65a5127833f874335115ace5c9",
+ "mtime_ns": 1790404370185679445
},
{
"path": "pictures.one",
- "bytes": 7064,
- "sha256": "3076880e02cf74eb85400852c133060ab8ed50383c6b9df8a07bde8389891a70",
- "mtime_ns": 1789243635387879438
+ "bytes": 7776,
+ "sha256": "c468fdcd8d55b5161c9e8f104d846c4191c40efb4bdc9a6aa134f8d824627436",
+ "mtime_ns": 1790404370185326028
}
]
diff --git a/corpus/picture-edit/page-level/candidate/Open Notebook.onetoc2 b/corpus/picture-edit/page-level/candidate/Open Notebook.onetoc2
index 52d19e53c867b3228411ceec37a5747fb72aea4d..f835d6eeef52041810b4410edaf30afa8b938afb 100644
Binary files a/corpus/picture-edit/page-level/candidate/Open Notebook.onetoc2 and b/corpus/picture-edit/page-level/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/picture-edit/page-level/candidate/pictures.one b/corpus/picture-edit/page-level/candidate/pictures.one
index b656ae835d49ab68c65a0aa4629b82385df4ffd0..ee5d78bdb1f02d15ae14006ccc5b12578596e0fb 100644
Binary files a/corpus/picture-edit/page-level/candidate/pictures.one and b/corpus/picture-edit/page-level/candidate/pictures.one differ
diff --git a/corpus/picture-edit/page-level/cold/commands.jsonl b/corpus/picture-edit/page-level/cold/commands.jsonl
index 73b9bd3014f117c57e27064b4131c0747326f7c2..e4f08d1e983a4c36af815280a0a1690e89deb0da 100644
--- a/corpus/picture-edit/page-level/cold/commands.jsonl
+++ b/corpus/picture-edit/page-level/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-3E57E5E3 -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-F9B47642 -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/picture-edit/page-level/cold/machine.json b/corpus/picture-edit/page-level/cold/machine.json
index c8cb9f4c9ef121e59a02fbd224d6cdbf81a47347..bc15f36cb00684ed88357b1e70ef02ca92ce6993 100644
--- a/corpus/picture-edit/page-level/cold/machine.json
+++ b/corpus/picture-edit/page-level/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-3e57e5e3", "hostname": "ONE-M6-3E57E5E3"}
+{"name": "m6-f9b47642", "hostname": "ONE-M6-F9B47642"}
diff --git a/corpus/picture-edit/page-level/cold/notebook/Open Notebook.onetoc2 b/corpus/picture-edit/page-level/cold/notebook/Open Notebook.onetoc2
index b9e7f4815ce3a65ccfb1f0e432e3d5ae94af1a2b..1d99242e53fc73f4346cb95c5a0318d77eceea0f 100644
Binary files a/corpus/picture-edit/page-level/cold/notebook/Open Notebook.onetoc2 and b/corpus/picture-edit/page-level/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/picture-edit/page-level/cold/notebook/pictures.one b/corpus/picture-edit/page-level/cold/notebook/pictures.one
index c608c2f7e561582e3f90bc3facd1ed5518724bc2..0f5c761164c4a277e4c14a3553b94182d477023f 100644
Binary files a/corpus/picture-edit/page-level/cold/notebook/pictures.one and b/corpus/picture-edit/page-level/cold/notebook/pictures.one differ
diff --git a/corpus/picture-edit/page-level/cold/read/environment.json b/corpus/picture-edit/page-level/cold/read/environment.json
index 1ffd2b6d1693fdcc135f535dbe81348c8567f201..b5460391fb228773e62acf6e69815b57a07cb927 100644
--- a/corpus/picture-edit/page-level/cold/read/environment.json
+++ b/corpus/picture-edit/page-level/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-3E57E5E3",
+ "hostname": "ONE-M6-F9B47642",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/picture-edit/page-level/cold/read/hierarchy.xml b/corpus/picture-edit/page-level/cold/read/hierarchy.xml
index cad5c63cbd32f13ff9454a9f0ce2fd2377b0f149..44863319a02f300f4bc1bcd6ca04ab40a393c812 100644
--- a/corpus/picture-edit/page-level/cold/read/hierarchy.xml
+++ b/corpus/picture-edit/page-level/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/picture-edit/page-level/cold/read/page-000.xml b/corpus/picture-edit/page-level/cold/read/page-000.xml
index 6f9dbd9dc67dad811b4f892a4fe7f8853d43762e..f18463802a98f983a390afbe8a93a55e4c8258af 100644
--- a/corpus/picture-edit/page-level/cold/read/page-000.xml
+++ b/corpus/picture-edit/page-level/cold/read/page-000.xml
@@ -1,4 +1,4 @@
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
+iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2w
AAAAAElFTkSuQmCC
diff --git a/corpus/picture-edit/page-level/cold/run.json b/corpus/picture-edit/page-level/cold/run.json
index 8efa63abedb2bef67a9d90bff430c1a013d862e2..bdd0bc14e5430ec94438337d08ddd4f239c372ac 100644
--- a/corpus/picture-edit/page-level/cold/run.json
+++ b/corpus/picture-edit/page-level/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/pagelevel",
+ "notebook": "/Users/clo/dev/one/evidence/titles/picture-page-level",
"expected_pages": 1,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/picture-edit/page-level/cold/source.json b/corpus/picture-edit/page-level/cold/source.json
index 8791fc92eea165f04e91d51b94af79d1b470412c..25b8c54676e9de2a663ee9e23fc0179ec2bc9be0 100644
--- a/corpus/picture-edit/page-level/cold/source.json
+++ b/corpus/picture-edit/page-level/cold/source.json
@@ -2,13 +2,13 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1604,
- "sha256": "3df6c788afbfe6ecda97d63cdbb3f42b269d61107e78dd0b3babaf55ae567389",
- "mtime_ns": 1789249104766253246
+ "sha256": "8d7fed8f27dfd76533e619068e37c1ee0de5187faebb129c5047c01a814f4c9f",
+ "mtime_ns": 1790404370294442700
},
{
"path": "pictures.one",
- "bytes": 5656,
- "sha256": "b6c0a2e604c038a2d0fa93a6096c3fecfa08f370f268ad010d7419ee87dd1f02",
- "mtime_ns": 1789249104766006120
+ "bytes": 6560,
+ "sha256": "80dd6cc455bbbffe37d9cb7ad30d69a4a6a65b550a5de3d87a514bc0f99c5f41",
+ "mtime_ns": 1790404370294185825
}
]
diff --git a/corpus/table-edit/README.md b/corpus/table-edit/README.md
index e3d23c4df2c2041d42362d04e84651ee6e6b46af..24f1e88e56ac8043ec15f6b143fd8f39a5785ec6 100644
--- a/corpus/table-edit/README.md
+++ b/corpus/table-edit/README.md
@@ -23,8 +23,8 @@ two-row table with locked 72 pt column and visible borders. `nested/cold` is
its cold read with both tables.
Native rows and cells are plain containers; the writer creates them with the
-modification time, the indent array copied from a sibling cell, and the flags
-every native cell carries, rebuilds each table's row and cell order to the
+modification time, the indent array copied from a sibling cell (OneNote's
+default without one), and the flags every native cell carries, rebuilds each table's row and cell order to the
model's, and writes the column count, widths, locks and border flag. New
tables start as an empty paragraph whose content the structure pass replaces.
An emptied cell keeps a replacement paragraph, as the tree writer provides.
diff --git a/corpus/table-edit/created/candidate/Open Notebook.onetoc2 b/corpus/table-edit/created/candidate/Open Notebook.onetoc2
index 784f65349498d29d5f5fe5433dd751c740326029..b68a0b3659bea1846b344c7c4dec9ee57166d570 100644
Binary files a/corpus/table-edit/created/candidate/Open Notebook.onetoc2 and b/corpus/table-edit/created/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/table-edit/created/candidate/tables.one b/corpus/table-edit/created/candidate/tables.one
index 75d44cc0da8f1738e0438647e48a8b09cb844710..2e2c3a0af67d1b0ef828305ec71e9558fdf0d973 100644
Binary files a/corpus/table-edit/created/candidate/tables.one and b/corpus/table-edit/created/candidate/tables.one differ
diff --git a/corpus/table-edit/created/cold/commands.jsonl b/corpus/table-edit/created/cold/commands.jsonl
index 613db96ba12c5a91daa79bc91aa59630b63ba5bc..1a2863cbd741045e0fa438faaa43c2a5997709d0 100644
--- a/corpus/table-edit/created/cold/commands.jsonl
+++ b/corpus/table-edit/created/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-838F23A9 -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-D27A9E1E -ExpectedPages 1", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/table-edit/created/cold/machine.json b/corpus/table-edit/created/cold/machine.json
index 0a5fbe5a162b6b7a317dc04cb9656215268b42fa..79b5f764561a5fa1d4da2bd7a7e631847b8937f0 100644
--- a/corpus/table-edit/created/cold/machine.json
+++ b/corpus/table-edit/created/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-838f23a9", "hostname": "ONE-M6-838F23A9"}
+{"name": "m6-d27a9e1e", "hostname": "ONE-M6-D27A9E1E"}
diff --git a/corpus/table-edit/created/cold/notebook/Open Notebook.onetoc2 b/corpus/table-edit/created/cold/notebook/Open Notebook.onetoc2
index 72c04c527a22a5243a61e843e00244604e967e55..07b727ab19e9054269c8379543e640160a8c9164 100644
Binary files a/corpus/table-edit/created/cold/notebook/Open Notebook.onetoc2 and b/corpus/table-edit/created/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/table-edit/created/cold/notebook/tables.one b/corpus/table-edit/created/cold/notebook/tables.one
index 7a1d5ea5e66d9b0e24563be6a4d23df29a2a3069..18ff04a48d6bdff111a55431fe9259c1797438b8 100644
Binary files a/corpus/table-edit/created/cold/notebook/tables.one and b/corpus/table-edit/created/cold/notebook/tables.one differ
diff --git a/corpus/table-edit/created/cold/read/environment.json b/corpus/table-edit/created/cold/read/environment.json
index 9c1eae28f4b03184eee090aa1d307e526b682b83..026a304222b4408435320afcbe4b734fca196ba3 100644
--- a/corpus/table-edit/created/cold/read/environment.json
+++ b/corpus/table-edit/created/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-838F23A9",
+ "hostname": "ONE-M6-D27A9E1E",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/table-edit/created/cold/read/hierarchy.xml b/corpus/table-edit/created/cold/read/hierarchy.xml
index 89b9442957cc33dc9cd148141f94c3deeff7c163..f24b18c4be66f268c0dfea7cbdcc50ec088fdfa4 100644
--- a/corpus/table-edit/created/cold/read/hierarchy.xml
+++ b/corpus/table-edit/created/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/table-edit/created/cold/read/page-000.xml b/corpus/table-edit/created/cold/read/page-000.xml
index 18e6e85052b8d934f3546717ebb4a168ee13528d..d2188df6d5559236cbe46692c47ec46eb1b971ca 100644
--- a/corpus/table-edit/created/cold/read/page-000.xml
+++ b/corpus/table-edit/created/cold/read/page-000.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/table-edit/created/cold/run.json b/corpus/table-edit/created/cold/run.json
index e5de875f30992feac8b4454db76cd812a676a4de..450d58ab4b80229c43c1e19ca7967d21f92a1727 100644
--- a/corpus/table-edit/created/cold/run.json
+++ b/corpus/table-edit/created/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/tables",
+ "notebook": "/Users/clo/dev/one/evidence/titles/table-created",
"expected_pages": 1,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/table-edit/created/cold/source.json b/corpus/table-edit/created/cold/source.json
index a2b298152ccd8c0d8d5c33b61065d236fe51e883..c3650f9767ba3ec651dde085f14464da8977690d 100644
--- a/corpus/table-edit/created/cold/source.json
+++ b/corpus/table-edit/created/cold/source.json
@@ -2,13 +2,13 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1604,
- "sha256": "b39b2e142e0adce0de37ad336f40c3e9c2ba92ce6927c9d109139e74c1fb4a6e",
- "mtime_ns": 1789239342755220465
+ "sha256": "8e64e22a5381e45d42536c1d75cf266a70970828d0258c15571adc6f4d75391f",
+ "mtime_ns": 1790404369445796875
},
{
"path": "tables.one",
- "bytes": 11016,
- "sha256": "e1c014220e05352a01c98752031b32c17512407295aa812ff8e9c776e48eef6e",
- "mtime_ns": 1789239342754903465
+ "bytes": 10936,
+ "sha256": "d66db22225eaf0064e53f14e6dcfdbefd822c292d839be6296bc442153c278e3",
+ "mtime_ns": 1790404369445435251
}
]
diff --git a/corpus/table-edit/nested/candidate/Open Notebook.onetoc2 b/corpus/table-edit/nested/candidate/Open Notebook.onetoc2
index ac6404565fb5d7dc4eecd7d50f52a80fe56ea39d..9737dc9bc660b8cd3255933b7fd0547a24002f06 100644
Binary files a/corpus/table-edit/nested/candidate/Open Notebook.onetoc2 and b/corpus/table-edit/nested/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/table-edit/nested/candidate/synthetic.one b/corpus/table-edit/nested/candidate/synthetic.one
index 266fcc28db50f2d19f54b1f2b89daa011b440cdb..a7d788077abaa2ed30afd330eaa3159b843cf1e1 100644
Binary files a/corpus/table-edit/nested/candidate/synthetic.one and b/corpus/table-edit/nested/candidate/synthetic.one differ
diff --git a/corpus/table-edit/nested/cold/commands.jsonl b/corpus/table-edit/nested/cold/commands.jsonl
index ca3daf4c4d9f68f3eb732da5aa3784363c6c7bc6..334800aae601b2ef191827b47e916d9ca0b92f9c 100644
--- a/corpus/table-edit/nested/cold/commands.jsonl
+++ b/corpus/table-edit/nested/cold/commands.jsonl
@@ -1,3 +1,3 @@
{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
-{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-8E63A852 -ExpectedPages 12", "exit": 0, "stdout": "Read 1 sections and 12 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-B7496B80 -ExpectedPages 12", "exit": 0, "stdout": "Read 1 sections and 12 pages.\r\n", "stderr": "", "error": null}
{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/table-edit/nested/cold/machine.json b/corpus/table-edit/nested/cold/machine.json
index af2731f4d9ddcf0999ea29a58d48135326fae541..38b94824a21f8ae2963c58fdc7a9f882f1b854a9 100644
--- a/corpus/table-edit/nested/cold/machine.json
+++ b/corpus/table-edit/nested/cold/machine.json
@@ -1 +1 @@
-{"name": "m6-8e63a852", "hostname": "ONE-M6-8E63A852"}
+{"name": "m6-b7496b80", "hostname": "ONE-M6-B7496B80"}
diff --git a/corpus/table-edit/nested/cold/notebook/Open Notebook.onetoc2 b/corpus/table-edit/nested/cold/notebook/Open Notebook.onetoc2
index dd056869ac900f0254b6015f73f69cec7ce64d2d..3f6ae3effafe9aa1185eaa6345112411039b3309 100644
Binary files a/corpus/table-edit/nested/cold/notebook/Open Notebook.onetoc2 and b/corpus/table-edit/nested/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/table-edit/nested/cold/notebook/synthetic.one b/corpus/table-edit/nested/cold/notebook/synthetic.one
index b1ade032e1a1d530a0dbf143c386c72784717362..034d2d6aaa1e8d01833c8875ff744f450ef8953a 100644
Binary files a/corpus/table-edit/nested/cold/notebook/synthetic.one and b/corpus/table-edit/nested/cold/notebook/synthetic.one differ
diff --git a/corpus/table-edit/nested/cold/read/environment.json b/corpus/table-edit/nested/cold/read/environment.json
index 97826260818ae575e97f3e893c184ac96d2da42d..2ede7f94b2accbf19f99088b5ea5128cf3072361 100644
--- a/corpus/table-edit/nested/cold/read/environment.json
+++ b/corpus/table-edit/nested/cold/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-8E63A852",
+ "hostname": "ONE-M6-B7496B80",
"cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/table-edit/nested/cold/read/hierarchy.xml b/corpus/table-edit/nested/cold/read/hierarchy.xml
index 30951414a1ed8f58e0f0bfa909f5dea2302e146e..662f359d228eede674a9378822f20eb7221bfc3b 100644
--- a/corpus/table-edit/nested/cold/read/hierarchy.xml
+++ b/corpus/table-edit/nested/cold/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/table-edit/nested/cold/read/page-000.xml b/corpus/table-edit/nested/cold/read/page-000.xml
index abe8e889db0e49cfacbcfec754d6dd8fe93ef84b..dd028cbbd5c4c34aceb40af0635ef67d3d2911fb 100644
--- a/corpus/table-edit/nested/cold/read/page-000.xml
+++ b/corpus/table-edit/nested/cold/read/page-000.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-001.xml b/corpus/table-edit/nested/cold/read/page-001.xml
index 73fc668530cfe3c925ec3e9899ca78cb17d8e79c..b9c498551df8d10025b2b8956cec4ab91058c986 100644
--- a/corpus/table-edit/nested/cold/read/page-001.xml
+++ b/corpus/table-edit/nested/cold/read/page-001.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-002.xml b/corpus/table-edit/nested/cold/read/page-002.xml
index 33249a4a63862188d11be1dc660fb502d1046764..2158e242f563d07ecfa4355bba8ee31aa524e2eb 100644
--- a/corpus/table-edit/nested/cold/read/page-002.xml
+++ b/corpus/table-edit/nested/cold/read/page-002.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-003.xml b/corpus/table-edit/nested/cold/read/page-003.xml
index 803070c943bb4c15bbde899ce815025e07ef30fb..e28f619582e1484f582ee52dd7758c71f296d75e 100644
--- a/corpus/table-edit/nested/cold/read/page-003.xml
+++ b/corpus/table-edit/nested/cold/read/page-003.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-004.xml b/corpus/table-edit/nested/cold/read/page-004.xml
index 1abeded6ec7686112d3fbf0321ee6a4523ed75e4..0b2245609db31a3585cd3f81c04c2be504235556 100644
--- a/corpus/table-edit/nested/cold/read/page-004.xml
+++ b/corpus/table-edit/nested/cold/read/page-004.xml
@@ -1,5 +1,4 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>
diff --git a/corpus/table-edit/nested/cold/read/page-005.xml b/corpus/table-edit/nested/cold/read/page-005.xml
index ab5eb2ff035e76901c4cb67a0a0c7c6650232807..ff80f20afb2e930a0a778b3de04a1301a91dc4ae 100644
--- a/corpus/table-edit/nested/cold/read/page-005.xml
+++ b/corpus/table-edit/nested/cold/read/page-005.xml
@@ -1,5 +1,20 @@
-Target 🦀 é Link label]]>Child]]>
+Bold 🦀 italic é color 東京
+End]]>Fictitious: café, 東京, مرحبا]]>
diff --git a/corpus/table-edit/nested/cold/read/page-006.xml b/corpus/table-edit/nested/cold/read/page-006.xml
index f7e7c61fc66b3a05392b7a669554659eac7d9de7..23c451c6b2ae030d7a8dc557e8761467c3cc98a3 100644
--- a/corpus/table-edit/nested/cold/read/page-006.xml
+++ b/corpus/table-edit/nested/cold/read/page-006.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-007.xml b/corpus/table-edit/nested/cold/read/page-007.xml
index 5dce83b05f4dbb9134aa1f99de1655186742b0b5..534982d994f32141b7a251b970ca60e77a4efb1b 100644
--- a/corpus/table-edit/nested/cold/read/page-007.xml
+++ b/corpus/table-edit/nested/cold/read/page-007.xml
@@ -1,5 +1,4 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>
diff --git a/corpus/table-edit/nested/cold/read/page-008.xml b/corpus/table-edit/nested/cold/read/page-008.xml
index 5404646b65f0848851705698b95df7575d6e1307..5f805e79876ab800c9861fec79096d1185881f8a 100644
--- a/corpus/table-edit/nested/cold/read/page-008.xml
+++ b/corpus/table-edit/nested/cold/read/page-008.xml
@@ -1,4 +1,5 @@
-Target 🦀 é Link label]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-009.xml b/corpus/table-edit/nested/cold/read/page-009.xml
index 6f2d0a40c64f6c9f9d6708983f8a22623c0a07af..922348b64a8a60ad0cf253d22d93ecba7851da4f 100644
--- a/corpus/table-edit/nested/cold/read/page-009.xml
+++ b/corpus/table-edit/nested/cold/read/page-009.xml
@@ -1,5 +1,5 @@
-Target 🦀 é Link label]]>Child]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-010.xml b/corpus/table-edit/nested/cold/read/page-010.xml
index 0ab9708e41484ef59f437b8d7c3809e8eba84602..0a9d3c7b3ae8662e886e3e12b3163926092f5eb1 100644
--- a/corpus/table-edit/nested/cold/read/page-010.xml
+++ b/corpus/table-edit/nested/cold/read/page-010.xml
@@ -1,20 +1,5 @@
-Bold 🦀 italic é color 東京
-End]]>Fictitious: café, 東京, مرحبا]]>
+Target 🦀 é Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/read/page-011.xml b/corpus/table-edit/nested/cold/read/page-011.xml
index edc9181409326c6c543bce336887d83568b3c897..57d8a4b96a32c11be2775864a5d47f6faae9f287 100644
--- a/corpus/table-edit/nested/cold/read/page-011.xml
+++ b/corpus/table-edit/nested/cold/read/page-011.xml
@@ -1,4 +1,5 @@
-Target 🦀 é Link label]]>
+href="https://example.invalid/tree">Link label]]>Child]]>
diff --git a/corpus/table-edit/nested/cold/run.json b/corpus/table-edit/nested/cold/run.json
index 07af38adfa7635acd5034a97c61a9f59db1580a0..59f593d7ed1ada68dac9be40c6ce171fcbf94e18 100644
--- a/corpus/table-edit/nested/cold/run.json
+++ b/corpus/table-edit/nested/cold/run.json
@@ -1,5 +1,5 @@
{
- "notebook": "/private/tmp/m4/nested",
+ "notebook": "/Users/clo/dev/one/evidence/titles/table-nested",
"expected_pages": 12,
"author": null,
"author_timeout_seconds": 600,
diff --git a/corpus/table-edit/nested/cold/source.json b/corpus/table-edit/nested/cold/source.json
index 5e6c84c30728031d026ff42bdbfacfc80a21b384..6fe831f630abeb74801236a6cfed7136390c01c2 100644
--- a/corpus/table-edit/nested/cold/source.json
+++ b/corpus/table-edit/nested/cold/source.json
@@ -2,13 +2,13 @@
{
"path": "Open Notebook.onetoc2",
"bytes": 1612,
- "sha256": "1c7c0e30cc2c2f029f87e20bba0981f0bf8a7f2f6643ad67a24e80834f539991",
- "mtime_ns": 1789250020753460025
+ "sha256": "1290deaddfd9b3dc7c08ee83da786bc057c7e18ec6a9212b0dc8453a7254c09b",
+ "mtime_ns": 1790404369595025987
},
{
"path": "synthetic.one",
- "bytes": 91192,
- "sha256": "6f3b8737c318834e2958368ed9fd9bc2ff4c7490bbd4a29907fa76e472355b43",
- "mtime_ns": 1789250020752551397
+ "bytes": 90608,
+ "sha256": "2d0333a99c6cdf9499ebf972fb53a6cf987ceba1950738f01158e028e8b82fc1",
+ "mtime_ns": 1790404369594093530
}
]
diff --git a/crates/notebook/README.md b/crates/notebook/README.md
index 3cfd958001ea8035da22eabbb9e80527537990af..15f7670c6620391bedfb27561208998dd227ce33 100644
--- a/crates/notebook/README.md
+++ b/crates/notebook/README.md
@@ -188,6 +188,9 @@ object space, which survives the tested native compaction that replaces the file
An `Arc` can own one background worker. Supply a connection factory, poll
interval and observer; successful publications drain immediately, durable local
edits wake the worker, and `wake()` requests an immediate reachability retry.
+While nothing is queued, a remote whose `Remote::stamp` (its header and length, read
+without coordination) equals the last observed image's is not read again; publishing
+against an unchanged stamp needs no read either.
Transport failures discard the old connection and retry through the factory;
Read contention and `NotCommitted` operations with `WouldBlock` or `ResourceBusy`
reuse the connection. Contended `NotCommitted` operations use randomized backoff,
@@ -383,6 +386,7 @@ experimental Rust API with native interoperability evidence in the repository's
[Milestone 9](../../evidence/MILESTONE9.md).
```no_run
+# #[cfg(feature = "smb")] {
use notebook::smb::{Client, Credentials};
use std::time::Duration;
@@ -396,6 +400,7 @@ let snapshot = client.read("Personal/Video.one", 64 * 1024 * 1024)?;
let store = onestore::Store::parse(&snapshot)?;
let revisions = onestore::RevisionIndex::parse(&store)?;
let document = onestore::document::Document::parse(&revisions)?;
+# }
# Ok::<(), Box>(())
```
@@ -404,8 +409,9 @@ snapshot. Call from a background thread outside a Tokio runtime. Use identities
from the document and the same snapshot with `Client::commit_text` or
`Client::commit_property_bytes`; their errors retain `onestore::CommitState`.
`PreparedEdit::page` separates preparation from I/O: inspect the immutable image
-and persist the intended revision identity before `Client::commit_prepared`.
-`Client::confirm_snapshot` compares and flushes an observed image, then refreshes
+and persist the intended revision identity before `Client::commit_transaction` publishes
+its `transaction()`. `Client::stamp` reads a file's header and length without coordination,
+for polling. `Client::confirm_snapshot` checks and flushes an observed image's stamp, then refreshes
its header version metadata without adding a revision. The caller must first
establish which intents that image contains and reread before another commit.
diff --git a/crates/notebook/examples/queue_scale.rs b/crates/notebook/examples/queue_scale.rs
index 6661921661fd22825c40abdeec5d9ff25c96e93b..84e424f42352dcbe4e0941bac01577904f90a9b1 100644
--- a/crates/notebook/examples/queue_scale.rs
+++ b/crates/notebook/examples/queue_scale.rs
@@ -1,6 +1,6 @@
use notebook::{EditStatus, Remote, Replica};
use onestore::{
- CommitError, PageCreation, PreparedEdit, RevisionIndex, Store,
+ CommitError, PageCreation, PreparedEdit, RevisionIndex, Store, Transaction,
document::Document,
page::{Page, PageObject, Paragraph, text::Edit},
};
@@ -12,8 +12,8 @@ impl Remote for FileRemote {
fn read(&mut self) -> io::Result> {
onestore::read_file(&self.0)
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- edit.commit_file(&self.0)
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ transaction.commit_file(&self.0)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
onestore::confirm_file_snapshot(&self.0, snapshot)
diff --git a/crates/notebook/examples/recovery_probe.rs b/crates/notebook/examples/recovery_probe.rs
index 841d92c2aaa8a7b6dd47213c635bb2999d4f765e..0335d17dacaf0a81ac2a2ddb70d6ec8977056001 100644
--- a/crates/notebook/examples/recovery_probe.rs
+++ b/crates/notebook/examples/recovery_probe.rs
@@ -4,7 +4,7 @@ mod support {
use support::view::view;
use notebook::{EditStatus, Remote, Replica};
-use onestore::{CommitError, CommitIo, PreparedEdit};
+use onestore::{CommitError, CommitIo, Transaction};
use serde_json::json;
use std::{
env,
@@ -67,9 +67,9 @@ impl Remote for Disk {
phase("read-after");
result
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
phase("publish-before");
- let result = edit.commit(self);
+ let result = transaction.commit(self);
phase("publish-after");
result
}
diff --git a/crates/notebook/examples/smb_offline_client.rs b/crates/notebook/examples/smb_offline_client.rs
index 34a31f03ba8ffb838d69ff32bb7a093993affe4f..3867a0f2b18b07e95c4a81829d9490cb9fa43055 100644
--- a/crates/notebook/examples/smb_offline_client.rs
+++ b/crates/notebook/examples/smb_offline_client.rs
@@ -4,7 +4,7 @@ mod concurrent;
use notebook::smb::{Client, Credentials};
use notebook::{EditStatus, Error, Remote, Replica, SmbRemote};
use onestore::{
- CommitError, CommitState, ExGuid, PreparedEdit, RevisionIndex, Store, page::Paragraph,
+ CommitError, CommitState, ExGuid, RevisionIndex, Store, Transaction, page::Paragraph,
};
use serde_json::json;
use std::{
@@ -56,6 +56,8 @@ enum Pause {
struct Traced {
remote: R,
before: Option<(String, Option)>,
+ /// The last image read, which publications apply to.
+ read: Vec,
pause: Option,
documents: bool,
}
@@ -75,15 +77,21 @@ impl Remote for Traced {
json!({"event":"read", "started_us":started, "finished_us":now(), "text":observed.text, "documents":documents.as_ref().map(|view| &view.texts), "document_graph":documents.as_ref().map(|view| &view.graph)})
);
self.before = Some((observed.text, documents));
+ self.read.clone_from(&bytes);
Ok(bytes)
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- let after = view(edit.as_bytes()).map_err(|error| CommitError {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ let mut image = self.read.clone();
+ transaction.apply(&mut image).map_err(|error| CommitError {
+ state: CommitState::NotCommitted,
+ error: io::Error::other(error.to_string()),
+ })?;
+ let after = view(&image).map_err(|error| CommitError {
state: CommitState::NotCommitted,
error: io::Error::other(error.to_string()),
})?;
let documents = if self.documents {
- Some(document_view(edit.as_bytes()).map_err(|error| CommitError {
+ Some(document_view(&image).map_err(|error| CommitError {
state: CommitState::NotCommitted,
error: io::Error::other(error),
})?)
@@ -151,7 +159,7 @@ impl Remote for Traced {
}
}
let started = now();
- let result = self.remote.publish(edit);
+ let result = self.remote.publish(transaction);
let finished = now();
println!(
"{}",
@@ -399,7 +407,7 @@ fn main() -> Result<(), Box> {
let worker = cache.start_sync(Duration::from_millis(50), move || {
let client = Client::connect(&address, &share, Credentials::default(), Duration::from_secs(5))?;
println!("{}", json!({"event":"transport_connected", "at_us":now()}));
- Ok(Traced { remote: SmbRemote::new(client, &path, 256 * 1024 * 1024), before:None, pause:pause.clone(), documents })
+ Ok(Traced { remote: SmbRemote::new(client, &path, 256 * 1024 * 1024), before:None, read:Vec::new(), pause:pause.clone(), documents })
}, move |result| {
if let Err(error) = result {
println!("{}", json!({"event":"sync_error", "error":error.to_string(), "at_us":now()}));
diff --git a/crates/notebook/src/images.rs b/crates/notebook/src/images.rs
index bf1e41265409a934469dd33e26afbe7b851e3ba1..963d76933beb2618d937bd1ac61d6441cd24d439 100644
--- a/crates/notebook/src/images.rs
+++ b/crates/notebook/src/images.rs
@@ -3,6 +3,7 @@
//! instead of the section.
use crate::Result;
+use onestore::Stamp;
use rusqlite::{Connection, params};
use std::io;
@@ -91,8 +92,9 @@ pub(crate) fn working_length(connection: &Connection) -> Result {
"SELECT length(base), substr(working, 1, 8) FROM replica WHERE id=1",
[],
|row| {
- let header: Vec = row.get(1)?;
- Ok(match header.first_chunk::<8>() {
+ // SQLite's substr of an empty blob is NULL.
+ let header: Option> = row.get(1)?;
+ Ok(match header.as_deref().and_then(<[u8]>::first_chunk::<8>) {
Some(length) => u64::from_le_bytes(*length),
None => row.get::<_, i64>(0)? as u64,
})
@@ -100,6 +102,31 @@ pub(crate) fn working_length(connection: &Connection) -> Result {
)?)
}
+/// Whether no edit is queued and the working image is the base image, without reading
+/// either image.
+pub(crate) fn settled(connection: &Connection) -> Result {
+ Ok(connection.query_row(
+ "SELECT length(working) = 0 AND NOT EXISTS (SELECT 1 FROM edits) FROM replica WHERE id=1",
+ [],
+ |row| row.get(0),
+ )?)
+}
+
+/// The base image's stamp, without reading the image.
+pub(crate) fn stamp(connection: &Connection) -> Result {
+ let (header, length): (Vec, i64) = connection.query_row(
+ "SELECT substr(base, 1, 1024), length(base) FROM replica WHERE id=1",
+ [],
+ |row| Ok((row.get(0)?, row.get(1)?)),
+ )?;
+ Ok(Stamp {
+ header: header
+ .try_into()
+ .map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Damaged base image"))?,
+ length: u64::try_from(length).map_err(io::Error::other)?,
+ })
+}
+
pub(crate) fn working(connection: &Connection) -> Result> {
let (base, patch): (Vec, Vec) =
connection.query_row("SELECT base, working FROM replica WHERE id=1", [], |row| {
diff --git a/crates/notebook/src/lib.rs b/crates/notebook/src/lib.rs
index 39c32211ee29438d1a296c585618f01dc657b910..d60f120a5a131ca4ea7e4cab2c0041e0d2a5ef6b 100644
--- a/crates/notebook/src/lib.rs
+++ b/crates/notebook/src/lib.rs
@@ -255,6 +255,31 @@ impl Replica {
images::working(&connection)
}
+ /// The page in `space` as the working image stores it.
+ pub fn page(&self, space: ExGuid) -> Result {
+ let snapshot = self.snapshot()?;
+ let store = Store::parse(&snapshot)?;
+ let index = RevisionIndex::parse(&store)?;
+ Ok(Page::from_space(&Document::parse(&index)?, space)?)
+ }
+
+ /// Whether no edit is queued and the remote still has the last observed image's stamp,
+ /// reading neither image; the cache is not locked during remote I/O.
+ pub(crate) fn settled(&self, remote: &mut impl Remote) -> Result {
+ let lock = || {
+ self.connection
+ .lock()
+ .map_err(|_| io::Error::other("Cache owner panicked"))
+ };
+ if !images::settled(&*lock()?)? {
+ return Ok(false);
+ }
+ let Some(stamp) = remote.stamp().map_err(Error::RemoteIo)? else {
+ return Ok(false);
+ };
+ Ok(images::stamp(&*lock()?)? == stamp)
+ }
+
pub fn pending(&self) -> Result> {
let connection = self
.connection
@@ -263,6 +288,25 @@ impl Replica {
pending(&connection)
}
+ /// Identities and page spaces of the pending edits, oldest first, without reading their
+ /// operations.
+ pub(crate) fn queued(&self) -> Result> {
+ let connection = self
+ .connection
+ .lock()
+ .map_err(|_| io::Error::other("Cache owner panicked"))?;
+ let mut query = connection.prepare("SELECT id, space FROM edits ORDER BY id")?;
+ let mut rows = query.query([])?;
+ let mut edits = Vec::new();
+ while let Some(row) = rows.next()? {
+ edits.push((
+ u64::try_from(row.get::<_, i64>(0)?).map_err(io::Error::other)?,
+ row.get::<_, String>(1)?.parse()?,
+ ));
+ }
+ Ok(edits)
+ }
+
/// Durably queues an edited page model using the supplied local snapshot.
/// While the newest pending edit is an unattempted save of the same page, a new save
/// replaces its result instead of queueing another publication, as OneNote does
diff --git a/crates/notebook/src/merge.rs b/crates/notebook/src/merge.rs
index 58f127b9553953ec57a3d21e9f45a26d4553504f..dfb7d4f455fa78f7f5c5008e610064ee8a5f8f3d 100644
--- a/crates/notebook/src/merge.rs
+++ b/crates/notebook/src/merge.rs
@@ -257,6 +257,18 @@ fn merge_paragraphs(
}
// Child order per container: the remote order with our repositioned paragraphs re-placed.
let (bc, oc, tc) = (children(base), children(ours), children(theirs));
+ // A paragraph we added after one they gave new children would sit after or among those
+ // children; Enter splitting a paragraph carries its children below, so neither is assumed.
+ for pair in oc.values().flat_map(|list| list.windows(2)) {
+ if b.contains_key(&pair[0])
+ && !b.contains_key(&pair[1])
+ && tc
+ .get(&Some(pair[0]))
+ .is_some_and(|children| children.iter().any(|id| !b.contains_key(id)))
+ {
+ return None;
+ }
+ }
let mut order: BTreeMap, Vec> = BTreeMap::new();
let containers: BTreeSet> = bc
.keys()
@@ -459,6 +471,10 @@ fn merge_text(
return None;
}
let mapped = crate::rebase::rebase(b, theirs.text(), start..end)?;
+ // Text they reformatted is not ours to replace, nor to move as a split would.
+ if start < end && theirs.slice(mapped.clone()).ok()? != base.slice(start..end).ok()? {
+ return None;
+ }
let mut merged = theirs.clone();
merged
.apply(Edit {
diff --git a/crates/notebook/src/session.rs b/crates/notebook/src/session.rs
index 1d3f73ef0facec69bff3f416d2396a1f2647f4aa..9f379bb54b9651433e54ac842255b4369e427ed7 100644
--- a/crates/notebook/src/session.rs
+++ b/crates/notebook/src/session.rs
@@ -5,8 +5,8 @@ use crate::{
ConflictKind, EditStatus, Error, PendingEdit, Remote, Replica, Result, SyncWorker, discover,
};
use onestore::{
- CommitError, ExGuid, PageCreation, PreparedEdit, RevisionIndex, Store, document::Document,
- page::Page,
+ CommitError, ExGuid, PageCreation, PreparedEdit, RevisionIndex, Stamp, Store, Transaction,
+ document::Document, page::Page,
};
use std::{
collections::{BTreeMap, VecDeque},
@@ -15,6 +15,7 @@ use std::{
path::{Path, PathBuf},
sync::{
Arc, Mutex,
+ atomic::{AtomicUsize, Ordering},
mpsc::{self, Receiver, Sender},
},
thread::{self, JoinHandle},
@@ -227,7 +228,9 @@ impl Storage for Share {
}
fn commit(&self, path: &str, edit: &PreparedEdit<'_>) -> Result<()> {
- Ok(self.client.commit_prepared(&self.path(path), edit)?)
+ Ok(self
+ .client
+ .commit_transaction(&self.path(path), &edit.transaction())?)
}
fn set_property(
@@ -760,6 +763,8 @@ pub struct Section {
events: Receiver,
saves: Option>,
saved: Receiver<(ExGuid, std::result::Result)>,
+ /// Saves queued and not yet reported.
+ unsaved: Arc,
saver: Option>,
}
@@ -850,12 +855,15 @@ impl Section {
}
};
let (saves, requests) = mpsc::channel();
+ let unsaved = Arc::new(AtomicUsize::new(0));
let saver = {
let (replica, signal) = (Arc::clone(&replica), signal.clone());
+ let unsaved = Arc::clone(&unsaved);
thread::Builder::new()
.name("onestore-save".into())
.spawn(move || {
- save_pages(&replica, &requests, |outcome| {
+ save_pages(&replica, &requests, |outcome, count| {
+ unsaved.fetch_sub(count, Ordering::Release);
if saved_sender.send(outcome).is_ok() {
signal();
}
@@ -889,6 +897,7 @@ impl Section {
events,
saves: Some(saves),
saved,
+ unsaved,
saver: Some(saver),
})
}
@@ -930,10 +939,7 @@ impl Section {
}
pub fn page(&self, space: ExGuid) -> Result {
- let snapshot = self.replica.snapshot()?;
- let store = Store::parse(&snapshot)?;
- let index = RevisionIndex::parse(&store)?;
- Ok(Page::from_space(&Document::parse(&index)?, space)?)
+ self.replica.page(space)
}
/// Copies a page (usually from another section) to the end of this section as a
@@ -999,12 +1005,18 @@ impl Section {
after,
author: author.to_owned(),
};
+ self.unsaved.fetch_add(1, Ordering::Relaxed);
self.saves
.as_ref()
.and_then(|saves| saves.send(save).ok())
.ok_or_else(|| io::Error::other("The save thread stopped").into())
}
+ /// Whether a queued save has yet to report, so the stored page may trail the editor's.
+ pub fn saving(&self) -> bool {
+ self.unsaved.load(Ordering::Acquire) > 0
+ }
+
pub fn status(&self, id: u64) -> Result> {
self.replica.status(id)
}
@@ -1017,13 +1029,13 @@ impl Section {
/// attempt, or a conflict awaiting review.
pub fn queue(&self) -> Result> {
self.replica
- .pending()?
+ .queued()?
.into_iter()
- .map(|edit| {
+ .map(|(id, space)| {
Ok(QueuedEdit {
- id: edit.id,
- space: edit.space,
- status: self.replica.status(edit.id)?.unwrap_or(EditStatus::Pending),
+ id,
+ space,
+ status: self.replica.status(id)?.unwrap_or(EditStatus::Pending),
})
})
.collect()
@@ -1094,7 +1106,8 @@ impl Section {
}
}
- pub fn replica(&self) -> &Replica {
+ /// The replica, which other threads may read pages from while the section is open.
+ pub fn replica(&self) -> &Arc {
&self.replica
}
@@ -1160,7 +1173,7 @@ fn save(
fn save_pages(
replica: &Replica,
requests: &Receiver,
- report: impl Fn((ExGuid, std::result::Result)),
+ report: impl Fn((ExGuid, std::result::Result), usize),
) {
let mut queue = VecDeque::new();
// The last save's page and the working image it left.
@@ -1174,11 +1187,13 @@ fn save_pages(
}
queue.extend(requests.try_iter());
let mut request = queue.pop_front().unwrap();
+ let mut count = 1;
while let Some(next) = queue.front()
&& (next.space, &next.before, &next.author)
== (request.space, &request.after, &request.author)
{
request.after = queue.pop_front().unwrap().after;
+ count += 1;
}
let known = last
.take()
@@ -1200,7 +1215,7 @@ fn save_pages(
}
Err(error) => Err(error.to_string()),
};
- report((request.space, save));
+ report((request.space, save), count);
}
}
@@ -1212,8 +1227,19 @@ impl Remote for FileRemote {
onestore::read_file(&self.0)
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> std::result::Result<(), CommitError> {
- edit.commit_file(&self.0)
+ /// Read without the whole-file lock, which would block OneNote's readers: a change
+ /// detector, never a snapshot to edit.
+ fn stamp(&mut self) -> io::Result> {
+ use std::io::Read;
+ let mut file = std::fs::File::open(&self.0)?;
+ let mut header = [0; 1024];
+ file.read_exact(&mut header)?;
+ let length = file.metadata()?.len();
+ Ok(Some(Stamp { header, length }))
+ }
+
+ fn publish(&mut self, transaction: &Transaction) -> std::result::Result<(), CommitError> {
+ transaction.commit_file(&self.0)
}
fn confirm(&mut self, snapshot: &[u8]) -> std::result::Result<(), CommitError> {
diff --git a/crates/notebook/src/smb/directory.rs b/crates/notebook/src/smb/directory.rs
index 4997431a09200a47462e6573c515ead57de50eb9..d947b6d92e1baebad2130624677e690ef8a76847 100644
--- a/crates/notebook/src/smb/directory.rs
+++ b/crates/notebook/src/smb/directory.rs
@@ -38,6 +38,7 @@ impl Client {
let file = File {
client: self,
id: Some(response.file_id),
+ length: response.end_of_file,
};
let mut entries = BTreeMap::new();
loop {
diff --git a/crates/notebook/src/smb/mod.rs b/crates/notebook/src/smb/mod.rs
index 38f25a82d2b7e49af84cc8a8500713e0e54b2794..6b10a7fcc89c548290c3cfa4826a38bccdf57e38 100644
--- a/crates/notebook/src/smb/mod.rs
+++ b/crates/notebook/src/smb/mod.rs
@@ -218,6 +218,7 @@ impl Client {
Ok(File {
client: self,
id: Some(response.file_id),
+ length: response.end_of_file,
})
}
@@ -374,13 +375,36 @@ impl Client {
})
}
- /// Publishes a prepared edit using the same native writer coordination as text commits.
- pub fn commit_prepared(
+ /// Publishes a transaction using the same native writer coordination as text commits.
+ pub fn commit_transaction(
&self,
path: &str,
- edit: &onestore::PreparedEdit<'_>,
+ transaction: &onestore::Transaction,
) -> Result<(), CommitError> {
- self.commit(path, |file| edit.commit(file))
+ self.commit(path, |file| transaction.commit(file))
+ }
+
+ /// The header and length of a revision store, read without writer coordination or path
+ /// identity checks: a change detector for polling, never a snapshot to edit.
+ pub fn stamp(&self, path: &str) -> io::Result {
+ let mut file = self.open(path, false)?;
+ let mut header = [0; 1024];
+ let mut read = 0;
+ let result = loop {
+ match file.read_at(read as u64, &mut header[read..]) {
+ Ok(0) => break Err(io::ErrorKind::UnexpectedEof.into()),
+ Ok(count) => read += count,
+ Err(error) => break Err(error),
+ }
+ if read == header.len() {
+ break Ok(());
+ }
+ };
+ let length = file.length;
+ let closed = file.close();
+ result?;
+ closed?;
+ Ok(onestore::Stamp { header, length })
}
/// Confirms an observed snapshot's durability under native writer coordination.
@@ -419,6 +443,8 @@ impl Drop for Client {
struct File<'a> {
client: &'a Client,
id: Option,
+ /// The end of file when opened.
+ length: u64,
}
impl File<'_> {
fn coordinate(self, path: &str, write: bool) -> io::Result {
diff --git a/crates/notebook/src/smb/remote.rs b/crates/notebook/src/smb/remote.rs
index 7dc3c146d32c21ada33ebedc6e4123232b953a3c..16fd2ba06ab25ceb5a2e0c08fb4329eced4fceb4 100644
--- a/crates/notebook/src/smb/remote.rs
+++ b/crates/notebook/src/smb/remote.rs
@@ -1,6 +1,6 @@
use super::Client;
use crate::Remote;
-use onestore::{CommitError, PreparedEdit};
+use onestore::{CommitError, Stamp, Transaction};
use std::io;
/// Binds every reconciliation operation to one share-relative file and read limit.
@@ -26,8 +26,12 @@ impl Remote for SmbRemote {
self.client.read(&self.path, self.limit)
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- self.client.commit_prepared(&self.path, edit)
+ fn stamp(&mut self) -> io::Result> {
+ self.client.stamp(&self.path).map(Some)
+ }
+
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ self.client.commit_transaction(&self.path, transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
diff --git a/crates/notebook/src/smb/tests.rs b/crates/notebook/src/smb/tests.rs
index 241f954afc19c64630113def6aa4d3dd370d0cba..54078552e8a67c7b15b3a34a1d308dda2d0a2e57 100644
--- a/crates/notebook/src/smb/tests.rs
+++ b/crates/notebook/src/smb/tests.rs
@@ -120,6 +120,7 @@ fn create(client: &Client, path: &str, bytes: &[u8]) {
let mut file = File {
client,
id: Some(response.file_id),
+ length: response.end_of_file,
};
let mut offset = 0;
while offset < bytes.len() {
@@ -344,6 +345,53 @@ fn live_coordination() {
);
}
+/// Polling reads only the header, even while maintenance excludes snapshot readers, and a
+/// transaction commits against the header it was built on.
+#[test]
+#[ignore = "requires ONESTORE_SMB_LAB pointing to disposable Samba"]
+fn live_stamp_and_transaction() {
+ let poller = client();
+ let source = onestore::create_section("stamp.one", "Stamped", "Author").unwrap();
+ let path = format!(
+ "stamp-{}.one",
+ SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .unwrap()
+ .as_nanos()
+ );
+ create(&poller, &path, &source);
+ assert_eq!(
+ poller.stamp(&path).unwrap(),
+ onestore::Stamp::of(&source).unwrap()
+ );
+ let maintenance = client();
+ let guard = maintenance.open(&path, false).unwrap();
+ guard.lock(0xfffffffb, 0x12).unwrap();
+ assert_eq!(
+ poller.read(&path, 1 << 20).unwrap_err().kind(),
+ io::ErrorKind::WouldBlock
+ );
+ assert_eq!(
+ poller.stamp(&path).unwrap(),
+ onestore::Stamp::of(&source).unwrap()
+ );
+ guard.close().unwrap();
+ let (sid, oid, _) = text(&source);
+ let edit = onestore::PreparedEdit::text(&source, sid, oid, 0..0, "Changed ").unwrap();
+ let transaction = edit.transaction();
+ poller.commit_transaction(&path, &transaction).unwrap();
+ assert_eq!(
+ poller.stamp(&path).unwrap(),
+ onestore::Stamp::of(edit.as_bytes()).unwrap()
+ );
+ assert_eq!(poller.read(&path, 1 << 20).unwrap(), edit.as_bytes());
+ let stale = poller.commit_transaction(&path, &transaction).unwrap_err();
+ assert_eq!(stale.state, CommitState::NotCommitted);
+ assert_eq!(stale.error.kind(), io::ErrorKind::ResourceBusy);
+ assert_eq!(poller.read(&path, 1 << 20).unwrap(), edit.as_bytes());
+ poller.delete(&path).unwrap();
+}
+
#[test]
#[ignore = "requires ONESTORE_SMB_LAB pointing to disposable Samba"]
fn live_storage_inspection() {
diff --git a/crates/notebook/src/sync.rs b/crates/notebook/src/sync.rs
index ebd12be546cb0de0d75541a3ba5645cc42a974c9..40c35ad7d757852d1cf416d91be163fd2a96cbe9 100644
--- a/crates/notebook/src/sync.rs
+++ b/crates/notebook/src/sync.rs
@@ -1,5 +1,5 @@
use super::*;
-use onestore::{CommitError, CommitState};
+use onestore::{CommitError, CommitState, Stamp, Transaction};
use rusqlite::OptionalExtension;
use std::{
collections::BTreeMap,
@@ -7,10 +7,16 @@ use std::{
};
/// A single remote file with fresh reads and native-compatible guarded publication.
-/// Errors retain publication state; confirmation compares, flushes, and notifies cached readers.
+/// Errors retain publication state; confirmation checks the stamp, flushes, and notifies
+/// cached readers.
pub trait Remote {
fn read(&mut self) -> io::Result>;
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> std::result::Result<(), CommitError>;
+ /// The file's stamp without reading its body, when the remote can tell. While it is the
+ /// last observed image's, synchronization neither reads nor revalidates the file.
+ fn stamp(&mut self) -> io::Result> {
+ Ok(None)
+ }
+ fn publish(&mut self, transaction: &Transaction) -> std::result::Result<(), CommitError>;
fn confirm(&mut self, snapshot: &[u8]) -> std::result::Result<(), CommitError>;
}
@@ -78,13 +84,14 @@ impl Replica {
}
}
let _step = Step(self);
- let snapshot = remote.read().map_err(Error::RemoteIo)?;
+ let base = self.remote_snapshot()?;
+ let changed = match remote.stamp().map_err(Error::RemoteIo)? {
+ Some(stamp) if stamp == Stamp::of(&base)? => None,
+ _ => Some(remote.read().map_err(Error::RemoteIo)?).filter(|read| *read != base),
+ };
// An unchanged remote is the base image, validated when it was stored.
- let identity = if snapshot == self.remote_snapshot()? {
- None
- } else {
- Some(validate(&snapshot)?)
- };
+ let identity = changed.as_deref().map(validate).transpose()?;
+ let snapshot = changed.unwrap_or(base);
let (intent, attempted) = {
let mut connection = self
.connection
@@ -92,6 +99,9 @@ impl Replica {
.map_err(|_| io::Error::other("Cache owner panicked"))?;
let transaction =
connection.transaction_with_behavior(TransactionBehavior::Immediate)?;
+ if identity.is_none() && images::settled(&transaction)? {
+ return Ok(None);
+ }
let (base, working) = images::both(&transaction)?;
if let Some(identity) = identity
&& RevisionIndex::parse(&Store::parse(&base)?)?.root != identity
@@ -267,7 +277,7 @@ impl Replica {
)?;
transaction.commit()?;
}
- match remote.publish(&prepared) {
+ match remote.publish(&prepared.transaction()) {
Ok(()) => {}
Err(error) if error.state == CommitState::NotCommitted => {
let connection = self
diff --git a/crates/notebook/src/worker.rs b/crates/notebook/src/worker.rs
index d506a60361e4adc11ead3d22c4b73a052ea07268..6e3d73d209efb9e219eeabd227aee3cd61da4c44 100644
--- a/crates/notebook/src/worker.rs
+++ b/crates/notebook/src/worker.rs
@@ -60,7 +60,8 @@ impl Drop for SyncWorker {
impl Replica {
/// Starts one worker, reconnecting through `connect` after transport failures.
- /// Local edits wake it; `interval` controls idle polling and transport retries.
+ /// Local edits wake it; `interval` controls idle polling and transport retries. While
+ /// nothing is queued, a remote whose `stamp` holds is not read again.
/// Contended operations returning `NotCommitted` also back off by up to one second.
/// `observe` runs on the worker after each attempt, including connection errors.
/// Cache/document errors stop the worker; inspect them through `observe` or `stop`.
@@ -99,12 +100,22 @@ impl Replica {
let thread = thread::Builder::new()
.name("onestore-sync".into())
.spawn(move || {
- let mut remote = None;
+ let mut remote: Option = None;
let jitter = RandomState::new();
let mut contention = 0_u32;
+ // The first attempt always runs, so `observe` hears once that the remote is
+ // reachable.
+ let mut attempted = false;
while !worker_signal.stopped.load(Ordering::Acquire) {
let result = match remote.as_mut() {
- Some(remote) => replica.sync_once(remote),
+ Some(remote) => {
+ if attempted && replica.settled(remote).unwrap_or(false) {
+ let _ = receiver.recv_timeout(interval);
+ continue;
+ }
+ attempted = true;
+ replica.sync_once(remote)
+ }
None => match connect() {
Ok(connected) => {
remote = Some(connected);
diff --git a/crates/notebook/tests/assets.rs b/crates/notebook/tests/assets.rs
index afbb4f12c061db43b8a2f95c02b4ec4d00d67671..1eb7baae18e498c29c115b026c8156b9f922db79 100644
--- a/crates/notebook/tests/assets.rs
+++ b/crates/notebook/tests/assets.rs
@@ -271,7 +271,7 @@ fn a_native_refresh_removing_the_reference_rejects_an_inflight_download() {
fn read(&mut self) -> io::Result> {
fs::read("../../corpus/native-external-assets/native/synthetic.one")
}
- fn publish(&mut self, _: &onestore::PreparedEdit<'_>) -> Result<(), onestore::CommitError> {
+ fn publish(&mut self, _: &onestore::Transaction) -> Result<(), onestore::CommitError> {
panic!("Unexpected publication")
}
fn confirm(&mut self, _: &[u8]) -> Result<(), onestore::CommitError> {
diff --git a/crates/notebook/tests/support/model_schedule.rs b/crates/notebook/tests/support/model_schedule.rs
index c3882c981e984ebc6a12c881ab53821d260be6af..fa871299fc39192e63946d5791f5270d47cc94f2 100644
--- a/crates/notebook/tests/support/model_schedule.rs
+++ b/crates/notebook/tests/support/model_schedule.rs
@@ -5,7 +5,7 @@ use crate::model_ops::{self, AUTHOR};
use crate::server::{Fault, Server};
use notebook::{EditStatus, Operation, Remote, Replica};
use onestore::{
- CommitError, ExGuid, PreparedEdit, RevisionIndex, Store,
+ CommitError, ExGuid, PreparedEdit, RevisionIndex, Store, Transaction,
document::Document,
page::{Outline, Page, PageObject},
};
@@ -140,20 +140,23 @@ impl Remote for Session<'_> {
self.server.read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
assert!(!self.retired, "a retired attempt was replayed");
self.publications += 1;
assert_eq!(self.publications, 1);
let Some((_, Operation::Page(intent))) = &self.intent else {
panic!("the schedule queues page saves only")
};
- if model_ops::page_of(&self.server.visible, SOURCE.1) == intent.before {
+ let mut image = self.server.visible.clone();
+ if transaction.apply(&mut image).is_ok()
+ && model_ops::page_of(&self.server.visible, SOURCE.1) == intent.before
+ {
assert_eq!(
- shape(&model_ops::page_of(edit.as_bytes(), SOURCE.1)),
+ shape(&model_ops::page_of(&image, SOURCE.1)),
shape(&intent.after)
);
}
- self.server.publish(edit)
+ self.server.publish(transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
diff --git a/crates/notebook/tests/support/page_schedule.rs b/crates/notebook/tests/support/page_schedule.rs
index cb89f32459cfe578eadf8a5080c25c69f33013e3..afaacb032c3d2c2bbc3e5817fdb71a2d02c04bc5 100644
--- a/crates/notebook/tests/support/page_schedule.rs
+++ b/crates/notebook/tests/support/page_schedule.rs
@@ -1,7 +1,7 @@
use crate::disk;
use notebook::{EditStatus, Operation, Remote, Replica};
use onestore::{
- CommitError, ExGuid, PageEdit, PagePosition, PreparedEdit, RevisionIndex, Store,
+ CommitError, ExGuid, PageEdit, PagePosition, PreparedEdit, RevisionIndex, Store, Transaction,
document::{Document, Format, Kind, Layout},
page::{
Outline, Page, PageObject, PageParagraph, Paragraph, ParagraphContent, TextObject,
@@ -125,7 +125,9 @@ impl Remote for Session<'_> {
Ok(self.disk.visible.clone())
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ let mut image = self.disk.visible.clone();
+ transaction.apply(&mut image).unwrap();
let mut expected = pages(&self.disk.visible);
match self.operation.unwrap() {
Operation::CreatePage(page) => expected.push((page.space(), page.object(), 1)),
@@ -144,7 +146,7 @@ impl Remote for Session<'_> {
}
Operation::Page(intent) => {
let body = body_text(&intent.after);
- let store = Store::parse(edit.as_bytes()).unwrap();
+ let store = Store::parse(&image).unwrap();
let index = RevisionIndex::parse(&store).unwrap();
let document = Document::parse(&index).unwrap();
let matching: Vec<_> = document
@@ -160,10 +162,10 @@ impl Remote for Session<'_> {
}
_ => panic!(),
}
- assert_eq!(pages(edit.as_bytes()), expected);
+ assert_eq!(pages(&image), expected);
let old = current::current(&self.disk.durable);
- let new = current::current(edit.as_bytes());
- let result = edit.commit(self.disk);
+ let new = current::current(&image);
+ let result = transaction.commit(self.disk);
let observed = current::current(&self.disk.durable);
assert!(observed == old || observed == new);
if result.is_ok() {
diff --git a/crates/notebook/tests/support/server.rs b/crates/notebook/tests/support/server.rs
index 195ba2520618e68b0e9fa14abaa43be99b327876..504f8b4fdc74f51199a05e29713c7c8004c20b15 100644
--- a/crates/notebook/tests/support/server.rs
+++ b/crates/notebook/tests/support/server.rs
@@ -3,7 +3,7 @@
use notebook::Remote;
use onestore::{
- CommitError, CommitIo, CommitState, ExGuid, PreparedEdit, RevisionIndex, Store,
+ CommitError, CommitIo, CommitState, ExGuid, RevisionIndex, Stamp, Store, Transaction,
document::{Document, Kind},
};
use std::io;
@@ -75,7 +75,10 @@ impl Remote for Server {
fn read(&mut self) -> io::Result> {
Ok(self.visible.clone())
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn stamp(&mut self) -> io::Result> {
+ Ok(Stamp::of(&self.visible).ok())
+ }
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
self.publications += 1;
let fault = std::mem::take(&mut self.fault);
match fault {
@@ -85,7 +88,7 @@ impl Remote for Server {
_ => {}
}
let old = self.durable.clone();
- edit.commit(self)?;
+ transaction.commit(self)?;
match fault {
Fault::UnknownAfter => {
self.durable = old;
diff --git a/crates/notebook/tests/sync.rs b/crates/notebook/tests/sync.rs
index f2702fdfd81e39fc01c58932a45e2d5250ca3c1b..0a7daccb1b546b4f9cfb023b8b9e7b91f9a9f5a9 100644
--- a/crates/notebook/tests/sync.rs
+++ b/crates/notebook/tests/sync.rs
@@ -1,7 +1,7 @@
//! Replica protocol: durable receipts, retired attempts, conflict review and contention.
use notebook::{ConflictKind, EditStatus, Error, Remote, Replica};
-use onestore::{CommitError, CommitState, ExGuid, PreparedEdit, page::Page};
+use onestore::{CommitError, CommitState, ExGuid, Transaction, page::Page};
use std::{io, ops::Range};
#[path = "support/server.rs"]
@@ -25,6 +25,51 @@ fn save(cache: &Replica, text: ExGuid, range: Range, replacement: &str) ->
.unwrap()
}
+#[test]
+fn an_unchanged_stamp_publishes_and_settles_without_reading_the_remote() {
+ struct Counted {
+ server: Server,
+ reads: usize,
+ }
+ impl Remote for Counted {
+ fn read(&mut self) -> io::Result> {
+ self.reads += 1;
+ self.server.read()
+ }
+ fn stamp(&mut self) -> io::Result> {
+ self.server.stamp()
+ }
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ self.server.publish(transaction)
+ }
+ fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
+ self.server.confirm(snapshot)
+ }
+ }
+ let directory = tempfile::tempdir().unwrap();
+ let source = onestore::create_section("stamp.one", "Original", "Fixture").unwrap();
+ let (sid, object, _) = text(&source);
+ let cache = Replica::create(directory.path().join("cache.sqlite"), &source).unwrap();
+ let id = save(&cache, object, 0..0, "Local ").unwrap();
+ let mut remote = Counted {
+ server: Server::new(&source),
+ reads: 0,
+ };
+ assert!(matches!(
+ cache.sync_once(&mut remote).unwrap(),
+ Some((published, EditStatus::Published { .. })) if published == id
+ ));
+ assert_eq!(cache.sync_once(&mut remote).unwrap(), None);
+ assert_eq!(remote.reads, 0);
+ // Another writer's commit moves the header, so the next step reads the file.
+ let native =
+ onestore::replace_text(&remote.server.visible, sid, object, 0..0, "Native ").unwrap();
+ remote.server.visible.clone_from(&native);
+ assert_eq!(cache.sync_once(&mut remote).unwrap(), None);
+ assert_eq!(remote.reads, 1);
+ assert_eq!(cache.snapshot().unwrap(), native);
+}
+
#[test]
fn recovery_archive_preserves_the_queue_uncertainty_and_receipts_without_becoming_a_writer() {
use notebook::{Recovery, RecoverySummary};
@@ -417,9 +462,9 @@ fn twelve_local_editors_progress_during_remote_reads_publication_and_confirmatio
self.wait("read");
self.server.read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
self.wait("publish");
- self.server.publish(edit)
+ self.server.publish(transaction)
}
fn confirm(&mut self, source: &[u8]) -> Result<(), CommitError> {
self.wait("confirm");
@@ -768,8 +813,8 @@ fn remote_changes_after_review_cannot_be_overwritten_by_the_reviewed_page() {
}
Ok(snapshot)
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- self.server.publish(edit)
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ self.server.publish(transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
self.server.confirm(snapshot)
diff --git a/crates/notebook/tests/sync_page.rs b/crates/notebook/tests/sync_page.rs
index 93101f65f5f916dab60a1ef358379d73db35cdac..59fb372db5712cb4cdfbe2415e31fa0e92f528c0 100644
--- a/crates/notebook/tests/sync_page.rs
+++ b/crates/notebook/tests/sync_page.rs
@@ -209,6 +209,8 @@ fn surviving_page_revision_alone_does_not_confirm_section_publication() {
// Replacing only the revision identity models maintenance retiring the section proof.
let at = positions[0] + 4;
server.visible[at] ^= 0x40;
+ // A rewrite publishes a new file version (MS-ONESTORE 2.3.1).
+ server.visible[212] ^= 1;
let store = Store::parse(&server.visible).unwrap();
let index = RevisionIndex::parse(&store).unwrap();
index.validate_current().unwrap();
diff --git a/crates/notebook/tests/sync_paragraph.rs b/crates/notebook/tests/sync_paragraph.rs
index bf65b46c72c50cca93af4e975625c659b6f54461..1dd492545de64fbbff2b0d414920ff7493ade744 100644
--- a/crates/notebook/tests/sync_paragraph.rs
+++ b/crates/notebook/tests/sync_paragraph.rs
@@ -97,7 +97,9 @@ fn split_paragraph(page: &mut Page, text: ExGuid, offset: u32) {
}
/// Joins the paragraph carrying `right` into the one carrying `left`; an empty left text
-/// object is replaced by a non-empty right one, which is the identity OneNote keeps.
+/// object is replaced by a non-empty right one, which is the identity OneNote keeps. The
+/// right paragraph's children keep their depth, under the left paragraph or the nearest of
+/// its ancestors above them.
fn join_paragraphs(page: &mut Page, left: ExGuid, right: ExGuid) {
locate_in(page, left, |list, first| {
let second = at(list, right).expect("the joined paragraphs share a container");
@@ -115,9 +117,17 @@ fn join_paragraphs(page: &mut Page, left: ExGuid, right: ExGuid) {
}
target.text = joined;
list.remove(second);
+ let nesting: std::collections::BTreeMap<_, _> =
+ list.iter().map(|p| (p.id, (p.level, p.parent))).collect();
for paragraph in list {
if paragraph.parent == Some(orphaned) {
- paragraph.parent = Some(parent);
+ let mut adopter = Some(parent);
+ while let Some(id) = adopter
+ && nesting[&id].0 >= paragraph.level
+ {
+ adopter = nesting[&id].1;
+ }
+ paragraph.parent = adopter;
}
}
});
diff --git a/crates/notebook/tests/sync_worker.rs b/crates/notebook/tests/sync_worker.rs
index 1dced50807904d233f60917b3e42c38a3d13d7bc..9221beeadbb5296ff10b642b8e624a6d3496abc8 100644
--- a/crates/notebook/tests/sync_worker.rs
+++ b/crates/notebook/tests/sync_worker.rs
@@ -2,7 +2,7 @@
use notebook::{ConflictKind, EditStatus, Error, Remote, Replica};
use onestore::{
- CommitError, CommitState, ExGuid, PreparedEdit, RevisionIndex, Store, document::Document,
+ CommitError, CommitState, ExGuid, RevisionIndex, Store, Transaction, document::Document,
};
use std::io;
@@ -25,8 +25,11 @@ impl Remote for Shared {
fn read(&mut self) -> io::Result> {
self.0.lock().unwrap().read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- self.0.lock().unwrap().publish(edit)
+ fn stamp(&mut self) -> io::Result> {
+ self.0.lock().unwrap().stamp()
+ }
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ self.0.lock().unwrap().publish(transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
self.0.lock().unwrap().confirm(snapshot)
@@ -72,8 +75,8 @@ fn reconnects_after_connect_read_and_uncertain_publish_without_replaying() {
}
self.shared.read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
- self.shared.publish(edit)
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ self.shared.publish(transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
self.shared.confirm(snapshot)
@@ -235,10 +238,10 @@ fn dropping_during_publication_is_nonblocking_and_retains_ownership_until_recove
fn read(&mut self) -> io::Result> {
self.shared.read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
self.entered.send(()).unwrap();
self.resume.recv_timeout(Duration::from_secs(5)).unwrap();
- self.shared.publish(edit)
+ self.shared.publish(transaction)
}
fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
self.shared.confirm(snapshot)
@@ -580,7 +583,7 @@ fn ordinary_read_and_unpublished_write_contention_reuse_the_connection() {
_ => self.server.read(),
}
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
self.writes += 1;
match self.writes {
1 | 2 => Err(CommitError {
@@ -592,7 +595,7 @@ fn ordinary_read_and_unpublished_write_contention_reuse_the_connection() {
}
.into(),
}),
- _ => self.server.publish(edit),
+ _ => self.server.publish(transaction),
}
}
fn confirm(&mut self, source: &[u8]) -> Result<(), CommitError> {
@@ -638,7 +641,7 @@ fn publication_backoff_drains_local_wakes_without_waiting_for_the_idle_poll() {
fn read(&mut self) -> io::Result> {
self.0.read()
}
- fn publish(&mut self, edit: &PreparedEdit<'_>) -> Result<(), CommitError> {
+ fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
let server = &mut self.0;
if server.publications == 0 {
server.publications += 1;
@@ -647,7 +650,7 @@ fn publication_backoff_drains_local_wakes_without_waiting_for_the_idle_poll() {
error: io::ErrorKind::ResourceBusy.into(),
});
}
- server.publish(edit)
+ server.publish(transaction)
}
fn confirm(&mut self, source: &[u8]) -> Result<(), CommitError> {
self.0.confirm(source)
diff --git a/crates/onestore/README.md b/crates/onestore/README.md
index 88c1eee232e4759bebe8df67b31a5785ff3d8106..c969393e74c3777ff8a682e6383fcaa4f92c3cb4 100644
--- a/crates/onestore/README.md
+++ b/crates/onestore/README.md
@@ -64,10 +64,13 @@ harness also accepts `--client-profile release`.
| `OutlineEdit`, `PreparedEdit::outline` | Change ordinary outline position/width or a paragraph's saved expansion default, preserving identities and content |
| `PreparedEdit::page` | Publish an edited `page::Page` as one revision per changed space: text, character and paragraph formatting, hyperlinks (external and, via `page::link`, to pages, paragraphs and sections), bullets and numbering, note tags, table rows, columns, cell shading and indents, nested tables, inserted pictures (in paragraphs or on the page) and attachments, picture position, size and description, a stored attachment's shown name, source path and icon size, paragraph styles on new paragraphs, ink drawings and handwriting (strokes added and erased), equations (built from `page::Math` trees), paragraph insertion/split/join/move/deletion, outline insertion/deletion/position/width and saved collapse state, lowered onto the typed writers with the model's identities |
| `TreeEdit`, `PreparedEdit::tree` | Move or delete a subtree on one page, normalize surviving containers, and replace an emptied table cell's paragraph atomically |
-| `PreparedEdit::commit`, `PreparedEdit::commit_file` | Publish the exact prepared image under caller-held exclusion or the conservative filesystem adapter |
+| `Transaction`, `Stamp`, `PreparedEdit::transaction` | The bytes a commit writes (appended data, in-place list-tail and log patches, header) and the header and length it requires unchanged; `commit` under caller-held exclusion, `commit_file` under the conservative filesystem adapter, `apply` to the base image in memory; serializable for queues |
+| `Arena`, `Section` | Keep a section parsed across edits: `open` validates an image once; `seal` appends one revision per changed space as a `Transaction` on `stamp`, checking only what it appends; `replay` applies a queued transaction; `image` and `page` read the result |
+| `op::{Edit, Op, PageOp, TableEdit, SectionOp}`, `Section::apply` | Object-level edits (text, formatting, links, equations, paragraph insertion/split/join/move/deletion/levels, outlines, lists, tags, styles, paragraph formatting, tables, pictures, attachments, ink, page creation/import/moves/removal) applied whole or not to a kept-open section with emitter-chosen identities, UTF-16 ranges and the edit's time; refusals name the target, identity or structure at fault |
+| `op::lower`, `op::lower_page`, `Section::apply_page` | The ops turning a range of paragraphs, or a whole page model, into another, computed from the models alone |
| `read_file` | Read a snapshot under whole-file exclusion |
| `read_snapshot` | Read a validated snapshot through fresh positioned I/O while the caller excludes maintenance |
-| `commit_file_property` | Lock, compare the source snapshot, append and flush, then publish the revision |
+| `commit_file_property` | Lock, check the source snapshot's stamp, append and flush, then publish the revision |
| `CommitIo`, `commit_property_bytes` | Supply another storage backend with equivalent exclusion and ordered durability |
Scalar edits accept encoded values and require the caller to maintain MS-ONE
@@ -212,7 +215,7 @@ with optional explicit IDs when conflict copies contain identical text.
## Commit behavior
```text
-exclusive lock → exact snapshot comparison
+exclusive lock → header and length check
→ append data → flush
→ prepare header metadata → flush
→ publish transaction counter → flush
@@ -220,7 +223,9 @@ exclusive lock → exact snapshot comparison
→ notify cached readers → flush → unlock
```
-Stale snapshots fail before writing. Live readers must use equivalent exclusion.
+Stale snapshots fail before writing: every committed transaction and placement rewrites
+the header (MS-ONESTORE 2.3.1), so the body is never compared. Live readers must use
+equivalent exclusion.
Native conflict creation can still expose cross-space references before their
targets are saved; such snapshots must be rejected and reread while synchronization
proceeds. `read_file` and `commit_file_property` serialize within the process because
diff --git a/crates/onestore/src/active.rs b/crates/onestore/src/active.rs
index 8b05379d4e1b50bb111238e39b464605640c11d2..6ed47dcb39e3259ff8b0b688b87b5103e14f33bb 100644
--- a/crates/onestore/src/active.rs
+++ b/crates/onestore/src/active.rs
@@ -1,20 +1,27 @@
use crate::{
- Error, ExGuid, Object, RevisionIndex, Store,
- document::{Document, Element, Revision, Space},
+ Error, ExGuid, FileType, Object, RevisionIndex, Store,
+ document::{Document, Element, Kind, Revision, Space},
write::{Commit, LiveRevision, PropertyObject, chain_depth, declared, differing},
};
use bumpalo::Bump;
-use std::collections::{BTreeMap, BTreeSet};
+use std::{
+ collections::{BTreeMap, BTreeSet},
+ sync::Arc,
+};
type Result = std::result::Result;
/// Objects a writer stores in one revision of a page space.
pub(crate) type Changes = BTreeMap;
+/// Payloads a store holds, by identity.
+pub(crate) type Files<'a> = std::rc::Rc Result<&'a [u8]> + 'a>;
+
/// A page space's active revision with the views its writers read, kept as appending
/// their revisions and parsing the result would leave it.
+#[derive(Clone)]
pub(crate) struct ActivePage<'a> {
- store: &'a Store<'a>,
+ files: Files<'a>,
pub pages: Vec,
pub live: LiveRevision<'a>,
/// Elements of the reachable objects.
@@ -42,6 +49,28 @@ impl<'a> ActivePage<'a> {
})?;
let rid = index.active(space)?;
let live = LiveRevision::new(index.resolve(space, rid)?, chain_depth(index, space, rid))?;
+ let store: &'a Store<'a> = index.store;
+ Self::viewed(std::rc::Rc::new(|guid| store.file_data(guid)), pages, live, view)
+ }
+
+ /// The page space `live` holds, whose stored payloads `files` reads.
+ pub(crate) fn open(
+ space: ExGuid,
+ live: LiveRevision<'a>,
+ file_type: FileType,
+ files: Files<'a>,
+ ) -> Result {
+ let (view, _) = Revision::parse(space, &live.revision, file_type, &mut |guid| files(guid))?;
+ let pages = manifest_pages(&view);
+ Self::viewed(files, pages, live, view)
+ }
+
+ fn viewed(
+ files: Files<'a>,
+ pages: Vec,
+ live: LiveRevision<'a>,
+ view: Revision<'a>,
+ ) -> Result {
let parents = view.parents(&pages)?;
let titles = view
.nodes
@@ -50,7 +79,7 @@ impl<'a> ActivePage<'a> {
.map(|(id, _)| *id)
.collect();
Ok(Self {
- store: index.store,
+ files,
pages,
live,
view,
@@ -65,13 +94,13 @@ impl<'a> ActivePage<'a> {
where
'a: 'o,
{
- Element::parse_with(object, self.store, &mut |guid| match self
+ Element::parse_with(object, FileType::Section, &mut |guid| match self
.payloads
.iter()
.find(|(id, _)| *id == guid)
{
Some((_, payload)) => Ok(*payload),
- None => self.store.file_data(guid),
+ None => (self.files)(guid),
})
}
@@ -108,12 +137,23 @@ impl<'a> ActivePage<'a> {
payloads: &[([u8; 16], &[u8])],
changes: Changes,
) -> Result {
+ Ok(self.store(arena, payloads, changes)?.is_some())
+ }
+
+ /// `write`, returning the objects whose content, reachability or reference count may
+ /// have moved; none when it stores nothing.
+ pub(crate) fn store(
+ &mut self,
+ arena: &'a Bump,
+ payloads: &[([u8; 16], &[u8])],
+ changes: Changes,
+ ) -> Result>> {
let changes = self.live.prepare(changes, true)?;
for (guid, payload) in payloads {
self.payloads.push((*guid, arena.alloc_slice_copy(payload)));
}
if changes.is_empty() {
- return Ok(!payloads.is_empty());
+ return Ok((!payloads.is_empty()).then(BTreeSet::new));
}
let mut objects = Vec::new();
for (id, change) in changes {
@@ -132,8 +172,49 @@ impl<'a> ActivePage<'a> {
} else {
self.live.settle(changed)?;
}
- self.refresh(&replaced, touched)?;
- Ok(true)
+ self.refresh(&replaced, touched.clone())?;
+ Ok(Some(touched))
+ }
+
+ /// Takes the stored form of `ids` from `file`, the revision a seal appended, where the
+ /// revisions written here since the previous seal left them otherwise: a seal groups
+ /// tables and aliases read-only objects across all of them at once.
+ pub(crate) fn adopt(
+ &mut self,
+ file: &LiveRevision<'a>,
+ ids: impl IntoIterator- ,
+ ) -> Result<()> {
+ let mut replacements = Vec::new();
+ for id in ids {
+ let Some(stored) = file.revision.objects.get(&id) else {
+ continue;
+ };
+ match self.live.revision.objects.get_mut(&id) {
+ Some(object) if object.jcid == stored.jcid && object.data == stored.data => {
+ object.global_ids = Arc::clone(&stored.global_ids);
+ object.reference_count = stored.reference_count;
+ }
+ _ if file.is_reachable(id) => replacements.push((id, stored.clone())),
+ // Nothing reads an object the file leaves unreachable.
+ _ => {}
+ }
+ }
+ if !replacements.is_empty() {
+ let replaced = replacements.iter().map(|(id, _)| *id).collect();
+ let Commit { touched, .. } = self.live.commit(replacements)?;
+ for id in &touched {
+ if let (Some(object), Some(stored)) = (
+ self.live.revision.objects.get_mut(id),
+ file.revision.objects.get(id),
+ ) {
+ object.global_ids = Arc::clone(&stored.global_ids);
+ object.reference_count = stored.reference_count;
+ }
+ }
+ self.refresh(&replaced, touched)?;
+ }
+ self.live.depth = file.depth;
+ Ok(())
}
/// Brings the view, parents and titles up to date with the revision for the objects a
@@ -215,6 +296,24 @@ impl<'a> ActivePage<'a> {
}
}
+/// The pages a page space's manifest lists.
+pub(crate) fn manifest_pages(view: &Revision<'_>) -> Vec {
+ match view.roots.get(&1).and_then(|id| view.nodes.get(id)) {
+ Some(manifest) if matches!(manifest.kind, Kind::Manifest { .. }) => manifest
+ .content
+ .iter()
+ .filter(|id| {
+ matches!(
+ view.nodes.get(id).map(|node| &node.kind),
+ Some(Kind::Page { .. })
+ )
+ })
+ .copied()
+ .collect(),
+ _ => Vec::new(),
+ }
+}
+
fn edges<'n>(node: &'n Element<'_>) -> impl Iterator
- + 'n {
node.children
.iter()
@@ -245,10 +344,79 @@ pub(crate) fn write(
}
#[cfg(test)]
-mod tests {
+pub(crate) mod tests {
use super::*;
use crate::{Insertion, ParagraphSplit, TextAttribute, TreeEdit, document::Kind};
+ /// A seeded source of the typed writers' changes: insertions, moves, deletions, splits
+ /// and formatting of what a page holds.
+ pub(crate) struct Writes(pub u64);
+
+ impl Writes {
+ fn pick(&mut self, count: usize) -> usize {
+ self.0 = self
+ .0
+ .wrapping_mul(6364136223846793005)
+ .wrapping_add(1442695040888963407);
+ (self.0 >> 33) as usize % count.max(1)
+ }
+
+ pub(crate) fn next(&mut self, active: &ActivePage<'_>) -> Result {
+ let nodes = &active.view.nodes;
+ let listed = |kind: fn(&Kind<'_>) -> bool| -> Vec {
+ nodes
+ .iter()
+ .filter(|(id, node)| kind(&node.kind) && active.parents.contains_key(id))
+ .map(|(id, _)| *id)
+ .collect()
+ };
+ let paragraphs = listed(|kind| matches!(kind, Kind::Paragraph { .. }));
+ let containers = listed(|kind| {
+ matches!(
+ kind,
+ Kind::Paragraph { .. } | Kind::Outline { .. } | Kind::Cell { .. }
+ )
+ });
+ let texts = listed(|kind| matches!(kind, Kind::RichText { .. }));
+ let unavailable = Error {
+ offset: 0,
+ message: "The page has nothing to edit",
+ };
+ let paragraph = *paragraphs
+ .get(self.pick(paragraphs.len()))
+ .ok_or(unavailable)?;
+ let container = *containers
+ .get(self.pick(containers.len()))
+ .ok_or(unavailable)?;
+ let anchor = nodes[&container].children.get(self.pick(4)).copied();
+ let text = *texts.get(self.pick(texts.len())).ok_or(unavailable)?;
+ let words = ["", "a", "Two words", "東京 🦀", "longer text here"];
+ let word = words[self.pick(words.len())];
+ match self.pick(8) {
+ 0..=3 => Insertion::paragraph(container, anchor, word, "Author")
+ .and_then(|insertion| insertion.changes(active)),
+ 4 => TreeEdit::move_to(paragraph, container, anchor, "Author")
+ .and_then(|edit| edit.changes(active)),
+ 5 => TreeEdit::delete(paragraph, "Author").and_then(|edit| edit.changes(active)),
+ 6 => {
+ let at = self.pick(3) as u32;
+ ParagraphSplit::new(text, at, "Author").and_then(|split| split.changes(active))
+ }
+ _ => {
+ let end = self.pick(2) as u32;
+ let bold = self.pick(2) == 0;
+ crate::formatting::format_changes(
+ active,
+ text,
+ 0..end,
+ &[TextAttribute::Bold(bold)],
+ &[],
+ )
+ }
+ }
+ }
+ }
+
/// `active` equals the page `image` stores, views included.
fn assert_stores(active: &ActivePage<'_>, image: &[u8], space: ExGuid) {
let store = Store::parse(image).unwrap();
@@ -288,51 +456,9 @@ mod tests {
let (space, _) = Document::parse(&index).unwrap().pages().unwrap()[0];
let arena = Bump::new();
let mut active = ActivePage::parse(&index, space).unwrap();
- let mut seed = 7_u64;
- let mut pick = |count: usize| {
- seed = seed
- .wrapping_mul(6364136223846793005)
- .wrapping_add(1442695040888963407);
- (seed >> 33) as usize % count.max(1)
- };
+ let mut writes = Writes(7);
for step in 0..steps {
- let nodes = &active.view.nodes;
- let listed = |kind: fn(&Kind<'_>) -> bool| -> Vec {
- nodes
- .iter()
- .filter(|(id, node)| kind(&node.kind) && active.parents.contains_key(id))
- .map(|(id, _)| *id)
- .collect()
- };
- let paragraphs = listed(|kind| matches!(kind, Kind::Paragraph { .. }));
- let containers = listed(|kind| {
- matches!(
- kind,
- Kind::Paragraph { .. } | Kind::Outline { .. } | Kind::Cell { .. }
- )
- });
- let texts = listed(|kind| matches!(kind, Kind::RichText { .. }));
- let paragraph = paragraphs[pick(paragraphs.len())];
- let container = containers[pick(containers.len())];
- let anchor = nodes[&container].children.get(pick(4)).copied();
- let text = texts[pick(texts.len())];
- let words = ["", "a", "Two words", "東京 🦀", "longer text here"];
- let word = words[pick(words.len())];
- let changes = match pick(8) {
- 0..=3 => Insertion::paragraph(container, anchor, word, "Author")
- .and_then(|insertion| insertion.changes(&active)),
- 4 => TreeEdit::move_to(paragraph, container, anchor, "Author")
- .and_then(|edit| edit.changes(&active)),
- 5 => TreeEdit::delete(paragraph, "Author").and_then(|edit| edit.changes(&active)),
- 6 => ParagraphSplit::new(text, pick(3) as u32, "Author")
- .and_then(|split| split.changes(&active)),
- _ => crate::formatting::format_changes(
- &active,
- text,
- 0..pick(2) as u32,
- &[TextAttribute::Bold(pick(2) == 0)],
- ),
- };
+ let changes = writes.next(&active);
let Ok(changes) = changes else {
continue;
};
diff --git a/crates/onestore/src/commit.rs b/crates/onestore/src/commit.rs
index 2a325fcc92d319016dffdb7d17ebe89a362a0468..1ac0817662d22240f0ac7955e2b95262d37c61f2 100644
--- a/crates/onestore/src/commit.rs
+++ b/crates/onestore/src/commit.rs
@@ -383,22 +383,20 @@ impl<'a> PreparedEdit<'a> {
&self.written
}
- /// Publishes these prepared bytes after comparing the entire original snapshot.
- /// The caller must retain OneNote-compatible exclusion through the returned outcome.
+ /// The bytes publishing this edit writes, against its snapshot's stamp.
+ pub fn transaction(&self) -> Transaction {
+ Transaction::between(self.source, &self.written)
+ }
+
+ /// `Transaction::commit` of this edit.
pub fn commit(&self, io: &mut impl CommitIo) -> Result<(), CommitError> {
- commit_bytes(io, self.source, &self.written)
+ self.transaction().commit(io)
}
- /// Publishes these exact bytes through the conservative whole-file filesystem adapter.
- /// A changed source returns ResourceBusy; an uncertain outcome must be reconciled before replay.
+ /// `Transaction::commit_file` of this edit.
#[cfg(any(unix, windows))]
pub fn commit_file(&self, path: impl AsRef) -> Result<(), CommitError> {
- let mut io = FileIo::open(path, true).map_err(|error| CommitError {
- state: CommitState::NotCommitted,
- error,
- })?;
- let result = self.commit(&mut io);
- io.finish(result)
+ self.transaction().commit_file(path)
}
}
@@ -413,7 +411,7 @@ pub fn confirm_file_snapshot(path: impl AsRef, source: &[u8]) -> Result<()
io.finish(result)
}
-/// Compares and flushes a snapshot, then refreshes its header version metadata.
+/// Checks and flushes a snapshot's stamp, then refreshes its header version metadata.
/// No revision is added; reread before using the snapshot for another physical commit.
/// The caller must hold OneNote-compatible exclusion and independently establish which
/// intents the snapshot contains. A successful read alone is not a durable acknowledgement.
@@ -429,7 +427,7 @@ pub fn confirm_snapshot(io: &mut impl CommitIo, source: &[u8]) -> Result<(), Com
version[..16].copy_from_slice(&crate::write::fresh_guid().map_err(io::Error::other)?);
version[16..24].copy_from_slice(&generation.to_le_bytes());
version[24..].copy_from_slice(&crate::write::fresh_guid().map_err(io::Error::other)?);
- compare_snapshot(io, source)?;
+ Stamp::of(source).map_err(io::Error::other)?.check(io)?;
state = CommitState::Unknown;
io.flush()?;
write_all(io, 212, &version)?;
@@ -474,12 +472,12 @@ impl std::error::Error for CommitError {
}
}
-fn write_all(io: &mut impl CommitIo, mut offset: usize, mut bytes: &[u8]) -> io::Result<()> {
+fn write_all(io: &mut impl CommitIo, mut offset: u64, mut bytes: &[u8]) -> io::Result<()> {
while !bytes.is_empty() {
- match io.write_at(offset as u64, bytes) {
+ match io.write_at(offset, bytes) {
Ok(0) => return Err(io::Error::from(ErrorKind::WriteZero)),
Ok(count) if count <= bytes.len() => {
- offset += count;
+ offset += count as u64;
bytes = &bytes[count..];
}
Ok(_) => {
@@ -512,85 +510,203 @@ pub fn commit_property_bytes(
error: io::Error::new(ErrorKind::InvalidData, error),
}
})?;
- commit_bytes(io, source, &written)
+ Transaction::between(source, &written).commit(io)
}
-fn compare_snapshot(io: &mut impl CommitIo, source: &[u8]) -> io::Result<()> {
- let capacity = source.len().clamp(1, 1024 * 1024);
- let mut buffer = Vec::new();
- buffer
- .try_reserve_exact(capacity)
- .map_err(io::Error::other)?;
- buffer.resize(capacity, 0);
- let mut offset = 0;
- while offset < source.len() {
- let size = buffer.len().min(source.len() - offset);
- let count = match io.read_at(offset as u64, &mut buffer[..size]) {
- Err(error) if error.kind() == ErrorKind::Interrupted => continue,
- result => result?,
- };
- if count == 0 {
- return Err(io::Error::from(ErrorKind::UnexpectedEof));
+/// What a commit requires unchanged since its snapshot: the header, which every committed
+/// transaction and every placement rewrites (MS-ONESTORE 2.3.1 `guidFileVersion`), and the
+/// length appends start from. Equal stamps name the same committed image.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Stamp {
+ pub header: [u8; 1024],
+ pub length: u64,
+}
+
+impl Stamp {
+ pub fn of(image: &[u8]) -> Result {
+ Ok(Self {
+ header: image.first_chunk().copied().ok_or(crate::Error {
+ offset: 0,
+ message: "Truncated revision-store header",
+ })?,
+ length: image.len() as u64,
+ })
+ }
+
+ /// Reads the header and probes the length, without reading the body.
+ fn check(&self, io: &mut impl CommitIo) -> io::Result<()> {
+ let mut header = [0; 1024];
+ crate::snapshot::read_exact(
+ &mut |offset, output| io.read_at(offset, output),
+ 0,
+ &mut header,
+ )?;
+ if header != self.header {
+ return Err(io::Error::new(
+ ErrorKind::ResourceBusy,
+ "The file header changed after the edit snapshot",
+ ));
}
- if count > size || buffer[..count] != source[offset..offset + count] {
+ let last = self.length.checked_sub(1).ok_or(ErrorKind::InvalidInput)?;
+ let mut tail = [0; 2];
+ let count = loop {
+ match io.read_at(last, &mut tail) {
+ Err(error) if error.kind() == ErrorKind::Interrupted => {}
+ result => break result?,
+ }
+ };
+ if count != 1 {
return Err(io::Error::new(
ErrorKind::ResourceBusy,
- "The locked file differs from the edit snapshot",
+ "The file length changed after the edit snapshot",
));
}
- offset += count;
+ Ok(())
}
- if io.read_at(source.len() as u64, &mut buffer[..1])? != 0 {
- return Err(io::Error::new(
- ErrorKind::ResourceBusy,
- "The locked file grew after the edit snapshot",
- ));
- }
- Ok(())
}
-pub(crate) fn commit_bytes(
- io: &mut impl CommitIo,
- source: &[u8],
- written: &[u8],
-) -> Result<(), CommitError> {
- let mut state = CommitState::NotCommitted;
- let result = (|| -> io::Result<()> {
- compare_snapshot(io, source)?;
- if written == source {
- state = CommitState::Unknown;
- io.flush()?;
- return Ok(());
+/// One change to a revision store as the bytes committing it writes: `append` at the base
+/// length, `patches` inside the base's data area (list tails and the transaction log), and
+/// the header that publishes them.
+#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(into = "Wire", try_from = "Wire")]
+pub struct Transaction {
+ pub(crate) base: Stamp,
+ pub(crate) append: Vec,
+ pub(crate) patches: Vec<(u64, Vec)>,
+ pub(crate) header: [u8; 1024],
+}
+
+/// A transaction as serialized: headers as byte strings, since serde stops at 32-byte arrays.
+#[derive(serde::Serialize, serde::Deserialize)]
+struct Wire {
+ base: Vec,
+ length: u64,
+ append: Vec,
+ patches: Vec<(u64, Vec)>,
+ header: Vec,
+}
+
+impl From for Wire {
+ fn from(transaction: Transaction) -> Self {
+ Self {
+ base: transaction.base.header.to_vec(),
+ length: transaction.base.length,
+ append: transaction.append,
+ patches: transaction.patches,
+ header: transaction.header.to_vec(),
}
- write_all(io, source.len(), &written[source.len()..])?;
+ }
+}
+
+impl TryFrom for Transaction {
+ type Error = &'static str;
+
+ fn try_from(wire: Wire) -> Result {
+ let header = |bytes: Vec| {
+ <[u8; 1024]>::try_from(bytes).map_err(|_| "A transaction header is 1024 bytes")
+ };
+ Ok(Self {
+ base: Stamp {
+ header: header(wire.base)?,
+ length: wire.length,
+ },
+ append: wire.append,
+ patches: wire.patches,
+ header: header(wire.header)?,
+ })
+ }
+}
+
+impl Transaction {
+ /// The transaction turning `source`, a parsed image, into `written`, which extends it.
+ pub(crate) fn between(source: &[u8], written: &[u8]) -> Self {
+ let differs = |at: &usize| source[*at] != written[*at];
+ let mut patches = Vec::new();
let mut offset = 1024;
- while offset < source.len() {
- if source[offset] == written[offset] {
- offset += 1;
- continue;
+ while let Some(start) = (offset..source.len()).find(differs) {
+ let mut end = start + 1;
+ // Equal gaps shorter than a write request's overhead join the patch.
+ while let Some(next) = (end..source.len().min(end + 64)).find(differs) {
+ end = next + 1;
}
- let start = offset;
- while offset < source.len() && source[offset] != written[offset] {
- offset += 1;
- }
- write_all(io, start, &written[start..offset])?;
+ patches.push((start as u64, written[start..end].to_vec()));
+ offset = end;
+ }
+ Self {
+ base: Stamp {
+ header: *source.first_chunk().unwrap(),
+ length: source.len() as u64,
+ },
+ append: written[source.len()..].to_vec(),
+ patches,
+ header: *written.first_chunk().unwrap(),
+ }
+ }
+
+ /// Writes this transaction into its base image, as a successful commit leaves the file.
+ pub fn apply(&self, image: &mut Vec) -> Result<(), crate::Error> {
+ if Stamp::of(image)? != self.base {
+ return Err(crate::Error {
+ offset: 0,
+ message: "The image is not this transaction's base",
+ });
}
- io.flush()?;
- write_all(io, 100, &written[100..212])?;
- write_all(io, 252, &written[252..1024])?;
- io.flush()?;
- let highest = (96..100).rfind(|at| source[*at] != written[*at]).unwrap();
- state = CommitState::Unknown;
- write_all(io, highest, &written[highest..highest + 1])?;
- io.flush()?;
- if highest > 96 {
- write_all(io, 96, &written[96..highest])?;
- io.flush()?;
+ image.extend_from_slice(&self.append);
+ for (offset, bytes) in &self.patches {
+ let offset = *offset as usize;
+ image[offset..offset + bytes.len()].copy_from_slice(bytes);
}
- // Native readers cache the version GUID without rechecking the transaction count.
- write_all(io, 212, &written[212..252])?;
- io.flush()?;
+ image[..1024].copy_from_slice(&self.header);
Ok(())
- })();
- result.map_err(|error| CommitError { state, error })
+ }
+
+ /// Publishes under caller-held OneNote-compatible exclusion, provided the file still has
+ /// the base stamp; otherwise returns ResourceBusy without writing. Appended data and
+ /// patches are flushed before the header, and the transaction count commits them
+ /// (MS-ONESTORE 2.3.3). Flush must make preceding writes durable before later ones.
+ pub fn commit(&self, io: &mut impl CommitIo) -> Result<(), CommitError> {
+ let mut state = CommitState::NotCommitted;
+ let result = (|| -> io::Result<()> {
+ self.base.check(io)?;
+ if self.append.is_empty() && self.patches.is_empty() && self.header == self.base.header
+ {
+ state = CommitState::Unknown;
+ return io.flush();
+ }
+ write_all(io, self.base.length, &self.append)?;
+ for (offset, bytes) in &self.patches {
+ write_all(io, *offset, bytes)?;
+ }
+ io.flush()?;
+ write_all(io, 100, &self.header[100..212])?;
+ write_all(io, 252, &self.header[252..])?;
+ io.flush()?;
+ state = CommitState::Unknown;
+ // At a counter carry the highest changed byte commits; the lower ones follow.
+ if let Some(highest) = (96..100).rfind(|at| self.base.header[*at] != self.header[*at]) {
+ write_all(io, highest as u64, &self.header[highest..highest + 1])?;
+ io.flush()?;
+ if highest > 96 {
+ write_all(io, 96, &self.header[96..highest])?;
+ io.flush()?;
+ }
+ }
+ // Native readers cache the version GUID without rechecking the transaction count.
+ write_all(io, 212, &self.header[212..252])?;
+ io.flush()
+ })();
+ result.map_err(|error| CommitError { state, error })
+ }
+
+ /// `commit` under the conservative filesystem adapter's whole-file exclusion.
+ #[cfg(any(unix, windows))]
+ pub fn commit_file(&self, path: impl AsRef) -> Result<(), CommitError> {
+ let mut io = FileIo::open(path, true).map_err(|error| CommitError {
+ state: CommitState::NotCommitted,
+ error,
+ })?;
+ let result = self.commit(&mut io);
+ io.finish(result)
+ }
}
diff --git a/crates/onestore/src/create.rs b/crates/onestore/src/create.rs
index 062d894eadd3e0b641e36b8ef78318b2f4ac3927..4c3824efd1c512308787f79d4b83d3fc60c52383 100644
--- a/crates/onestore/src/create.rs
+++ b/crates/onestore/src/create.rs
@@ -1,5 +1,6 @@
use crate::{
Chunk, Error, ExGuid, FileType, PropertySets, Reference, RevisionIndex, Store,
+ op::content::{NATIVE_INDENTS, measurement_bytes},
store::crc,
write::{append, append_list, fresh_guid, node},
};
@@ -24,6 +25,20 @@ pub(crate) fn default_text_style() -> Vec<(u32, Vec)> {
]
}
+/// The page margins MS-ONE requires on every page, in half inches, as OneNote 2010 sets them
+/// on the pages it creates.
+pub(crate) fn page_margins() -> Vec<(u32, Vec)> {
+ [
+ (0x14001c4c, 1.0_f32),
+ (0x14001c4d, 1.0),
+ (0x14001c4e, 2.0),
+ (0x14001c4f, 2.0),
+ ]
+ .into_iter()
+ .map(|(id, value)| (id, value.to_le_bytes().to_vec()))
+ .collect()
+}
+
pub(crate) fn properties(values: &[(u32, Vec)]) -> Result> {
let mut streams: [Vec; 3] = std::array::from_fn(|_| Vec::new());
let mut fields = Vec::new();
@@ -110,14 +125,38 @@ pub(crate) fn placement(ancestor: [u8; 16], name: &str) -> [u8; 20] {
bytes
}
+thread_local! {
+ /// The FILETIME `at` gives writers in place of the system clock.
+ static CLOCK: std::cell::Cell> = const { std::cell::Cell::new(None) };
+}
+
+/// Runs `f` with the writers' clock reading `filetime`, as an op's modification time.
+pub(crate) fn at(filetime: u64, f: impl FnOnce() -> T) -> T {
+ struct Restore(Option);
+ impl Drop for Restore {
+ fn drop(&mut self) {
+ CLOCK.set(self.0);
+ }
+ }
+ let _restore = Restore(CLOCK.replace(Some(filetime)));
+ f()
+}
+
+/// Seconds since 1980 as OneNote's Time32, and FILETIME, of the writers' clock.
pub(crate) fn current_timestamps() -> Result<(u32, u64)> {
- let now = SystemTime::now()
- .duration_since(UNIX_EPOCH)
- .map_err(|_| Error {
+ let now = match CLOCK.get() {
+ Some(filetime) => (filetime / 10_000_000).checked_sub(11644473600).ok_or(Error {
offset: 0,
- message: "System time precedes the Unix epoch",
- })?
- .as_secs();
+ message: "An edit time precedes the Unix epoch",
+ })?,
+ None => SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .map_err(|_| Error {
+ offset: 0,
+ message: "System time precedes the Unix epoch",
+ })?
+ .as_secs(),
+ };
let modified = now
.checked_sub(315532800)
.and_then(|time| u32::try_from(time).ok())
@@ -205,12 +244,16 @@ pub fn create_section(file_name: &str, text: &str, author: &str) -> Result Result Self {
Self { $($field: self.$field.as_ref().or(parent.$field.as_ref()).cloned()),* }
}
+
+ /// The values `self` sets that `parent` does not already give.
+ pub fn over(&self, parent: &Self) -> Self {
+ Self {
+ $($field: self.$field.as_ref().filter(|value| parent.$field.as_ref() != Some(*value)).cloned()),*
+ }
+ }
}
};
}
@@ -275,6 +282,98 @@ impl Revision<'_> {
}
}
+impl<'a> Revision<'a> {
+ /// The elements reachable in `revision` of `space`, and the (space, context) pairs they
+ /// reference.
+ pub(crate) fn parse(
+ space: ExGuid,
+ revision: &crate::ResolvedRevision<'a>,
+ file_type: crate::FileType,
+ file_data: &mut impl FnMut([u8; 16]) -> Result<&'a [u8]>,
+ ) -> Result<(Self, Vec<(ExGuid, ExGuid)>)> {
+ let mut reachable = BTreeSet::new();
+ let mut objects: Vec<_> = revision.roots.values().copied().collect();
+ let mut encrypted = false;
+ while let Some(oid) = objects.pop() {
+ if !reachable.insert(oid) {
+ continue;
+ }
+ let object = revision
+ .objects
+ .get(&oid)
+ .ok_or_else(|| invalid("Document object has no declaration"))?;
+ if matches!(object.data, ObjectData::Encrypted(_)) {
+ encrypted = true;
+ } else {
+ objects.extend(object.references()?.objects);
+ }
+ }
+ if !encrypted {
+ revision.reachable()?;
+ }
+ let mut referenced = Vec::new();
+ let mut nodes = BTreeMap::new();
+ for oid in reachable {
+ let object = &revision.objects[&oid];
+ if !matches!(object.data, ObjectData::Encrypted(_)) {
+ let refs = object.references()?;
+ referenced.extend(
+ refs.object_spaces
+ .into_iter()
+ .map(|sid| (sid, ExGuid::default())),
+ );
+ referenced.extend(refs.contexts.into_iter().map(|context| (space, context)));
+ }
+ nodes.insert(oid, Element::parse_with(object, file_type, file_data)?);
+ }
+ for node in nodes.values() {
+ if let Kind::RichText {
+ runs,
+ paragraph_style,
+ ..
+ } = &node.kind
+ {
+ for target in paragraph_style
+ .iter()
+ .chain(runs.iter().filter_map(|r| r.format.as_ref()))
+ {
+ if !matches!(nodes.get(target).map(|n| &n.kind), Some(Kind::Style { .. })) {
+ return Err(invalid("Text formatting does not reference a style"));
+ }
+ }
+ }
+ let mut tag_types = BTreeSet::new();
+ for tag in &node.tags {
+ let action_type = if tag.status & 4 != 0 {
+ tag.action_type
+ } else {
+ match tag
+ .definition
+ .and_then(|id| nodes.get(&id))
+ .map(|n| &n.kind)
+ {
+ Some(Kind::TagDefinition { action_type, .. }) => *action_type,
+ _ => {
+ return Err(invalid("Note tag does not reference a tag definition"));
+ }
+ }
+ }
+ .ok_or_else(|| invalid("Note tag has no action type"))?;
+ if !tag_types.insert(action_type) {
+ return Err(invalid("Repeated note tag action type"));
+ }
+ }
+ }
+ Ok((
+ Self {
+ roots: revision.roots.clone(),
+ nodes,
+ },
+ referenced,
+ ))
+ }
+}
+
impl Revision<'_> {
/// Maps every element reachable from `roots` through children, content and structure
/// references to its referencing parents, in visiting order.
@@ -807,91 +906,14 @@ impl<'a> Document<'a> {
if space.revisions.contains_key(&rid) {
continue;
}
- let revision = resolve(id, rid)?;
- let mut reachable = BTreeSet::new();
- let mut objects: Vec<_> = revision.roots.values().copied().collect();
- let mut encrypted = false;
- while let Some(oid) = objects.pop() {
- if !reachable.insert(oid) {
- continue;
- }
- let object = revision
- .objects
- .get(&oid)
- .ok_or_else(|| invalid("Document object has no declaration"))?;
- if matches!(object.data, ObjectData::Encrypted(_)) {
- encrypted = true;
- } else {
- objects.extend(object.references()?.objects);
- }
- }
- if !encrypted {
- revision.reachable()?;
- }
- let mut nodes = BTreeMap::new();
- for oid in reachable {
- let object = &revision.objects[&oid];
- if !matches!(object.data, ObjectData::Encrypted(_)) {
- let refs = object.references()?;
- pending.extend(
- refs.object_spaces
- .into_iter()
- .map(|sid| (sid, ExGuid::default())),
- );
- pending.extend(refs.contexts.into_iter().map(|context| (id, context)));
- }
- nodes.insert(
- oid,
- Element::parse_with(object, index.store, &mut file_data)?,
- );
- }
- for node in nodes.values() {
- if let Kind::RichText {
- runs,
- paragraph_style,
- ..
- } = &node.kind
- {
- for target in paragraph_style
- .iter()
- .chain(runs.iter().filter_map(|r| r.format.as_ref()))
- {
- if !matches!(nodes.get(target).map(|n| &n.kind), Some(Kind::Style { .. })) {
- return Err(invalid("Text formatting does not reference a style"));
- }
- }
- }
- let mut tag_types = BTreeSet::new();
- for tag in &node.tags {
- let action_type = if tag.status & 4 != 0 {
- tag.action_type
- } else {
- match tag
- .definition
- .and_then(|id| nodes.get(&id))
- .map(|n| &n.kind)
- {
- Some(Kind::TagDefinition { action_type, .. }) => *action_type,
- _ => {
- return Err(invalid(
- "Note tag does not reference a tag definition",
- ));
- }
- }
- }
- .ok_or_else(|| invalid("Note tag has no action type"))?;
- if !tag_types.insert(action_type) {
- return Err(invalid("Repeated note tag action type"));
- }
- }
- }
- space.revisions.insert(
- rid,
- Revision {
- roots: revision.roots,
- nodes,
- },
- );
+ let (revision, referenced) = Revision::parse(
+ id,
+ &resolve(id, rid)?,
+ index.store.header.file_type,
+ &mut file_data,
+ )?;
+ pending.extend(referenced);
+ space.revisions.insert(rid, revision);
}
for space in spaces.values() {
for node in space.revisions.values().flat_map(|r| r.nodes.values()) {
@@ -931,7 +953,7 @@ impl<'a> Document<'a> {
impl<'a> Element<'a> {
pub(crate) fn parse_with(
object: &Object<'a>,
- store: &Store<'a>,
+ file_type: crate::FileType,
file_data: &mut impl FnMut([u8; 16]) -> Result<&'a [u8]>,
) -> Result {
let empty = |kind| Self {
@@ -1311,7 +1333,7 @@ impl<'a> Element<'a> {
color: f.u32(0x14003466)?,
highlight: f.u32(0x14003465)?,
},
- 0x20001 if store.header.file_type == crate::FileType::TableOfContents => Kind::Toc {
+ 0x20001 if file_type == crate::FileType::TableOfContents => Kind::Toc {
entries: f.refs(0x24001cf6, IdStream::Objects)?,
filename: f.text(0x1c001d6b)?,
identity: f.fixed(0x1c001d94)?,
diff --git a/crates/onestore/src/files.rs b/crates/onestore/src/files.rs
index fdfe6a9a858aa8a251b9c0e3db60b9f891c9b773..afeae1b362b16f0fcf57bf72aa311e448b7700cd 100644
--- a/crates/onestore/src/files.rs
+++ b/crates/onestore/src/files.rs
@@ -131,42 +131,47 @@ impl<'a> Store<'a> {
offset: 0,
message: "File-data object is not declared",
})?;
- let mut c = Cursor {
- bytes: self.chunk_data(chunk)?,
- offset: usize::try_from(chunk.offset).unwrap(),
- };
- if c.read::<16>()?
- != [
- 0xe7, 0x16, 0xe3, 0xbd, 0x65, 0x26, 0x11, 0x45, 0xa4, 0xc4, 0x8d, 0x4d, 0x0b, 0x7a,
- 0x9e, 0xac,
- ]
- {
- return Err(Error {
- offset: c.offset - 16,
- message: "Invalid file-data object header",
- });
- }
- let length = usize::try_from(u64::from_le_bytes(c.read()?)).map_err(|_| Error {
- offset: c.offset - 8,
- message: "File-data length exceeds address space",
- })?;
- c.take(12)?;
- let bytes = c.take(length)?;
- // The object length is aligned; its position in the file need not be.
- let padding = (8 - (36 + length) % 8) % 8;
- c.take(padding)?;
- if c.read::<16>()?
- != [
- 0x22, 0xa7, 0xfb, 0x71, 0x79, 0x0f, 0x0b, 0x4a, 0xbb, 0x13, 0x89, 0x92, 0x56, 0x42,
- 0x6b, 0x24,
- ]
- || !c.bytes.is_empty()
- {
- return Err(Error {
- offset: c.offset - 16,
- message: "Invalid file-data object footer or length",
- });
- }
- Ok(bytes)
+ payload(
+ self.chunk_data(chunk)?,
+ usize::try_from(chunk.offset).unwrap(),
+ )
}
}
+
+/// The payload of a file-data store object, whose bytes start at file offset `offset`.
+pub(crate) fn payload(bytes: &[u8], offset: usize) -> Result<&[u8], Error> {
+ let mut c = Cursor { bytes, offset };
+ if c.read::<16>()?
+ != [
+ 0xe7, 0x16, 0xe3, 0xbd, 0x65, 0x26, 0x11, 0x45, 0xa4, 0xc4, 0x8d, 0x4d, 0x0b, 0x7a,
+ 0x9e, 0xac,
+ ]
+ {
+ return Err(Error {
+ offset: c.offset - 16,
+ message: "Invalid file-data object header",
+ });
+ }
+ let length = usize::try_from(u64::from_le_bytes(c.read()?)).map_err(|_| Error {
+ offset: c.offset - 8,
+ message: "File-data length exceeds address space",
+ })?;
+ c.take(12)?;
+ let bytes = c.take(length)?;
+ // The object length is aligned; its position in the file need not be.
+ let padding = (8 - (36 + length) % 8) % 8;
+ c.take(padding)?;
+ if c.read::<16>()?
+ != [
+ 0x22, 0xa7, 0xfb, 0x71, 0x79, 0x0f, 0x0b, 0x4a, 0xbb, 0x13, 0x89, 0x92, 0x56, 0x42,
+ 0x6b, 0x24,
+ ]
+ || !c.bytes.is_empty()
+ {
+ return Err(Error {
+ offset: c.offset - 16,
+ message: "Invalid file-data object footer or length",
+ });
+ }
+ Ok(bytes)
+}
diff --git a/crates/onestore/src/formatting.rs b/crates/onestore/src/formatting.rs
index 79f0ed7c8d1204418f581d22b141fe60fa690472..44b35d32379deb52ba3e76da402d9355b1f7a8e0 100644
--- a/crates/onestore/src/formatting.rs
+++ b/crates/onestore/src/formatting.rs
@@ -12,6 +12,9 @@ use std::{
sync::Arc,
};
+/// The font sizes OneNote accepts, in points; sizes are written in half points.
+pub const FONT_SIZES: std::ops::RangeInclusive = 6.0..=130.0;
+
fn invalid(message: &'static str) -> Error {
Error { offset: 0, message }
}
@@ -43,6 +46,8 @@ pub enum TextAttribute {
Hyperlink(bool),
/// The run is a hyperlink's visible label or field code rather than surrounding text.
HyperlinkLabel(bool),
+ /// Only false: equation text is written whole through the page model.
+ Math(bool),
}
impl TextAttribute {
@@ -58,6 +63,10 @@ impl TextAttribute {
Self::Hidden(value) => boolean(0x08001e16, *value),
Self::Hyperlink(value) => boolean(0x08001e14, *value),
Self::HyperlinkLabel(value) => boolean(0x08001e19, *value),
+ Self::Math(true) => {
+ return Err(invalid("Equations are written through the page model"));
+ }
+ Self::Math(false) => boolean(0x08003401, false),
Self::Font(font) => {
if font.is_empty() || font.contains('\0') {
return Err(invalid("Font names must be nonempty and contain no NUL"));
@@ -66,7 +75,7 @@ impl TextAttribute {
}
Self::FontSize(points) => {
if !points.is_finite()
- || !(6.0..=130.0).contains(points)
+ || !FONT_SIZES.contains(points)
|| (points * 2.0).fract() != 0.0
{
return Err(invalid(
@@ -99,23 +108,29 @@ pub(crate) fn format_text(
attributes: &[TextAttribute],
) -> Result, Error> {
crate::active::write(source, space, |active| {
- format_changes(active, object, range, attributes)
+ format_changes(active, object, range, attributes, &[])
})
}
-/// `format_text` on an active page.
+/// `format_text` on an active page, also removing the `cleared` properties from the range's
+/// run styles so the text inherits them.
pub(crate) fn format_changes(
active: &ActivePage<'_>,
object: ExGuid,
range: Range,
attributes: &[TextAttribute],
+ cleared: &[crate::op::TextProperty],
) -> Result {
- if attributes.is_empty() || range.start > range.end {
+ let cleared: Vec = cleared.iter().map(|property| property.id()).collect();
+ if (attributes.is_empty() && cleared.is_empty()) || range.start > range.end {
return Err(invalid(
"Select a text range and at least one formatting attribute",
));
}
- let values = attribute_values(attributes)?;
+ let values = match attributes {
+ [] => Vec::new(),
+ attributes => attribute_values(attributes)?,
+ };
let view = &active.view;
let parents = active.editable_parents(object)?;
let node = &view.nodes[&object];
@@ -217,6 +232,7 @@ pub(crate) fn format_changes(
};
if selected {
style.set(&changes)?;
+ style.remove(&cleared)?;
}
if let Some(id) = previous
.filter(|id| raw.objects[id].data == crate::ObjectData::Properties(&style.bytes))
diff --git a/crates/onestore/src/insertion.rs b/crates/onestore/src/insertion.rs
index c6070391d6bb85ce7ad0653de83b88124ffe9d2a..0ce998267f8effcd436520af297ca20ae50e6347 100644
--- a/crates/onestore/src/insertion.rs
+++ b/crates/onestore/src/insertion.rs
@@ -3,6 +3,7 @@ use crate::{
active::{ActivePage, Changes},
create::{current_timestamps, default_text_style, properties, string},
document::Kind,
+ op::content::{NATIVE_INDENTS, measurement_bytes},
write::{PropertyObject, fresh_guid},
};
use serde::{Deserialize, Serialize};
@@ -195,6 +196,36 @@ impl Insertion {
}
pub(crate) fn changes(&self, active: &ActivePage<'_>) -> Result {
+ let paragraph = ExGuid {
+ guid: self.guid,
+ n: if matches!(self.placement, Placement::Outline { .. }) {
+ 3
+ } else {
+ 1
+ },
+ };
+ let changes = self.changes_as(active, self.object(), paragraph, self.text_object())?;
+ let raw = &active.live.revision;
+ if changes
+ .keys()
+ .any(|id| id.guid == self.guid && raw.objects.contains_key(id))
+ {
+ return Err(invalid(
+ "An insertion identity is already present; reconcile the existing edit",
+ ));
+ }
+ Ok(changes)
+ }
+
+ /// `changes` creating the outline or paragraph `object`, the paragraph `paragraph` and its
+ /// text `text` under those identities.
+ pub(crate) fn changes_as(
+ &self,
+ active: &ActivePage<'_>,
+ object: ExGuid,
+ paragraph: ExGuid,
+ text: ExGuid,
+ ) -> Result {
let [page] = active.pages.as_slice() else {
return Err(invalid("Insertion requires a single active page"));
};
@@ -247,42 +278,54 @@ impl Insertion {
pending.extend(parents.get(&id).into_iter().flatten().copied());
}
let modified = current_timestamps()?.0.to_le_bytes();
- let paragraph_n = if matches!(self.placement, Placement::Outline { .. }) {
- 3
- } else {
- 1
- };
- let table = Arc::new(BTreeMap::from([(0, self.guid)]));
- let reference = |n: u32| n.to_le_bytes().to_vec();
+ let (author, default) = (
+ ExGuid {
+ guid: self.guid,
+ n: 4,
+ },
+ ExGuid {
+ guid: self.guid,
+ n: 5,
+ },
+ );
+ let mut table = BTreeMap::from([(0, self.guid)]);
+ for id in [object, paragraph, text] {
+ if !table.values().any(|guid| *guid == id.guid) {
+ table.insert(table.len() as u32, id.guid);
+ }
+ }
+ let table = Arc::new(table);
+ let reference =
+ |id: ExGuid| crate::write::compact(id, &table).map(|compact| compact.to_vec());
let mut new = BTreeMap::new();
- for (n, jcid, values) in [
+ for (id, jcid, values) in [
(
- paragraph_n,
+ paragraph,
0x6000d,
vec![
(0x14001d7a, modified.to_vec()),
(0x14001d09, self.created.to_le_bytes().to_vec()),
(0x0c001c03, vec![1]),
- (0x24001c1f, reference(2)),
- (0x20001d78, reference(4)),
- (0x20001d79, reference(4)),
+ (0x24001c1f, reference(text)?),
+ (0x20001d78, reference(author)?),
+ (0x20001d79, reference(author)?),
],
),
(
- 2,
+ text,
0x6000e,
vec![
(0x14001d7a, modified.to_vec()),
(0x1c001c22, string(&self.text)),
- (0x24001e13, reference(5)),
+ (0x24001e13, reference(default)?),
(0x10001cfe, 0x409_u16.to_le_bytes().to_vec()),
],
),
- (4, 0x120001, vec![(0x1c001d75, string(&self.author))]),
- (5, 0x12004d, default_text_style()),
+ (author, 0x120001, vec![(0x1c001d75, string(&self.author))]),
+ (default, 0x12004d, default_text_style()),
] {
new.insert(
- ExGuid { guid: self.guid, n },
+ id,
PropertyObject {
jcid,
bytes: properties(&values)?,
@@ -291,10 +334,6 @@ impl Insertion {
);
}
if !self.formats.is_empty() {
- let default = ExGuid {
- guid: self.guid,
- n: 5,
- };
let mut segments = Vec::new();
let mut end = 0;
for span in &self.formats {
@@ -329,7 +368,7 @@ impl Insertion {
if !segments.iter().any(|(_, id)| *id == default) {
new.remove(&default);
}
- let target = new.get_mut(&self.text_object()).unwrap();
+ let target = new.get_mut(&text).unwrap();
let mut references = Vec::new();
let mut ends = Vec::new();
for (end, id) in segments {
@@ -340,16 +379,17 @@ impl Insertion {
target.set(&[(0x24001e13, &references), (0x1c001e12, &ends)])?;
}
if let Placement::Outline { x, y } = self.placement {
+ let children = reference(paragraph)?;
new.insert(
- self.object(),
+ object,
PropertyObject {
jcid: 0x6000c,
global_ids: table,
bytes: properties(&[
(0x14001d7a, modified.to_vec()),
- (0x24001c20, reference(3)),
+ (0x24001c20, children),
(0x0c001c03, vec![1]),
- (0x1c001c12, vec![1, 0, 0, 0, 0, 0, 0, 0]),
+ (0x1c001c12, measurement_bytes(&NATIVE_INDENTS, 4)?),
(0x14001c14, (x / 36.0).to_le_bytes().to_vec()),
(0x14001c15, (y / 36.0).to_le_bytes().to_vec()),
(0x14001c1b, 13_f32.to_le_bytes().to_vec()),
@@ -359,16 +399,11 @@ impl Insertion {
);
}
let raw = &active.live.revision;
- if new.keys().any(|id| raw.objects.contains_key(id)) {
- return Err(invalid(
- "An insertion identity is already present; reconcile the existing edit",
- ));
- }
// Drop the overlay before moving the property bytes it borrows.
let title = {
let mut overlay = BTreeMap::new();
let mut parent = view.nodes[&self.parent].clone();
- parent.children.insert(position, self.object());
+ parent.children.insert(position, object);
overlay.insert(self.parent, parent);
for (id, object) in &new {
overlay.insert(
@@ -397,7 +432,7 @@ impl Insertion {
None => Vec::new(),
_ => return Err(invalid("The parent has an invalid child list")),
};
- let child = parent.reference(self.object())?;
+ let child = parent.reference(object)?;
if position > ids.len() / 4 {
return Err(invalid("The parent has an invalid child list"));
}
diff --git a/crates/onestore/src/lib.rs b/crates/onestore/src/lib.rs
index be75f348c7463b60e8c2f8d163a04d7fddc7b2ec..d60291cd2898af3dfb123177aa011dc332c413a1 100644
--- a/crates/onestore/src/lib.rs
+++ b/crates/onestore/src/lib.rs
@@ -12,6 +12,7 @@ mod flush;
mod formatting;
mod insertion;
mod objects;
+pub mod op;
mod outline;
pub mod page;
mod pages;
@@ -20,6 +21,7 @@ mod properties;
#[cfg(feature = "protected")]
pub mod protected;
mod revisions;
+mod section;
mod snapshot;
mod store;
mod toc;
@@ -27,8 +29,8 @@ mod tree;
mod write;
pub use commit::{
- CommitError, CommitIo, CommitState, PreparedEdit, commit_property_bytes, commit_text,
- confirm_snapshot, place,
+ CommitError, CommitIo, CommitState, PreparedEdit, Stamp, Transaction, commit_property_bytes,
+ commit_text, confirm_snapshot, place,
};
#[cfg(any(unix, windows))]
pub use commit::{
@@ -38,7 +40,7 @@ pub use commit::{
pub use create::{create_section, create_table_of_contents};
pub use edit::replace_text;
pub use files::FileDataReference;
-pub use formatting::TextAttribute;
+pub use formatting::{FONT_SIZES, TextAttribute};
pub use insertion::Insertion;
pub use objects::{Object, ObjectData, ObjectReferences, ResolvedRevision};
pub use outline::OutlineEdit;
@@ -46,6 +48,7 @@ pub use pages::{PageCreation, PageEdit, PagePosition};
pub use paragraph::{ParagraphJoin, ParagraphSplit};
pub use properties::{IdStream, Property, PropertySets, Value};
pub use revisions::{ExGuid, ObjectSpace, Revision, RevisionIndex};
+pub use section::{Arena, Section};
pub use snapshot::{read_snapshot, read_storage_snapshot};
pub use store::{Chunk, Error, FileType, Header, Node, NodeList, Reference, Store};
pub use toc::TocEdit;
diff --git a/crates/onestore/src/objects.rs b/crates/onestore/src/objects.rs
index dd548ae0a0ac98e54f4c220cdb838955cb1392a7..5556312ca104bb117fd0d8f0bb1618e003ea589b 100644
--- a/crates/onestore/src/objects.rs
+++ b/crates/onestore/src/objects.rs
@@ -19,7 +19,7 @@ pub enum ObjectData<'a> {
},
}
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub struct Object<'a> {
pub jcid: u32,
pub reference_count: u32,
@@ -27,7 +27,7 @@ pub struct Object<'a> {
pub global_ids: Arc,
}
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub struct ResolvedRevision<'a> {
pub roots: BTreeMap,
pub objects: BTreeMap>,
diff --git a/crates/onestore/src/op/apply.rs b/crates/onestore/src/op/apply.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6e624be1f405de5d128ca456c1879386d45aa296
--- /dev/null
+++ b/crates/onestore/src/op/apply.rs
@@ -0,0 +1,1188 @@
+//! `Section::apply`: each op checked against the page it names, then written through the
+//! typed writers onto the section's copy of that page.
+
+use super::{
+ Edit, Op, OpError, PageOp, SectionOp, TableEdit, TextProperty,
+ content::{self, AttachmentIds},
+ levels,
+ lower::{ParagraphFields, format_edits, paragraph_fields},
+ properties,
+ table::{self, Structure},
+};
+use crate::{
+ Error, ExGuid, Insertion, OutlineEdit, ParagraphJoin, ParagraphSplit, Section, TextAttribute,
+ TreeEdit,
+ active::{ActivePage, Changes},
+ document::Kind,
+ page::{
+ Attachment, Image, Ink, Page, PageObject, PageParagraph, Paragraph, ParagraphContent,
+ TableCell, TableColumn,
+ },
+};
+use std::{
+ collections::{BTreeMap, BTreeSet},
+ ops::Range,
+};
+
+fn invalid(message: &'static str) -> Error {
+ Error { offset: 0, message }
+}
+
+impl<'a> Section<'a> {
+ /// Applies an edit whole or not at all, `author` naming who made it. Its modification
+ /// times are `edit.at`.
+ pub fn apply(&mut self, author: &str, edit: &Edit) -> Result<(), OpError> {
+ if author.contains('\0') {
+ return Err(OpError::Unsupported("Choose an author name without NUL"));
+ }
+ let undo = edit.ops.len() > 1 || edit.ops.iter().any(stores_more_than_once);
+ crate::create::at(edit.at, || {
+ self.atomically(undo, |section| {
+ for op in &edit.ops {
+ match op {
+ Op::Page { space, op } => Writer {
+ section: &mut *section,
+ space: *space,
+ author,
+ }
+ .apply(op)?,
+ Op::Section(op) => section.apply_section(author, op)?,
+ }
+ }
+ Ok(())
+ })
+ })
+ .map_err(|error| self.classify(error))
+ }
+
+ /// Lowers `after` against the page `space` holds and applies the result as one edit;
+ /// returns the ops, which reach `after` where the writers can store it.
+ pub fn apply_page(
+ &mut self,
+ author: &str,
+ at: u64,
+ space: ExGuid,
+ after: &Page,
+ ) -> Result, OpError> {
+ let before = self.page(space).map_err(|error| self.classify(Failure::Rejected(error)))?;
+ let ops = super::lower_page(&before, after)
+ .map_err(|error| OpError::Unsupported(error.message))?;
+ let edit = Edit {
+ at,
+ ops: ops
+ .iter()
+ .map(|op| Op::Page {
+ space,
+ op: op.clone(),
+ })
+ .collect(),
+ };
+ self.apply(author, &edit)?;
+ Ok(ops)
+ }
+
+ fn classify(&self, failure: Failure) -> OpError {
+ match failure {
+ Failure::Refused(error) => error,
+ Failure::Rejected(error) if self.broken() => OpError::Failed(error),
+ Failure::Rejected(error) => OpError::Unsupported(error.message),
+ }
+ }
+
+ fn apply_section(&mut self, author: &str, op: &SectionOp) -> Result<(), Failure> {
+ match op {
+ SectionOp::Create(creation) => {
+ let (root, roots, objects) = creation.changes(self)?;
+ self.apply_changes(self.root(), &[], root)?;
+ self.create_space(creation.space(), roots, objects)?;
+ }
+ SectionOp::Import { creation, page } => {
+ self.apply_section(author, &SectionOp::Create(creation.clone()))?;
+ let space = creation.space();
+ let before = self.page(space)?;
+ let mut after = page.clone();
+ // The created page's title stays; the imported page brings the rest.
+ after.objects.retain(|object| !matches!(object, PageObject::Title(_)));
+ for object in before.objects.iter().rev() {
+ if let PageObject::Title(_) = object {
+ after.objects.insert(0, object.clone());
+ }
+ }
+ after.title = before.title.clone();
+ after.identity = before.identity;
+ after.created = before.created;
+ after.margin_origin = before.margin_origin;
+ for op in super::lower_page(&before, &after)? {
+ Writer {
+ section: self,
+ space,
+ author,
+ }
+ .apply(&op)?;
+ }
+ }
+ SectionOp::Pages(edits) => {
+ for (space, changes) in crate::pages::section_changes(self, edits, &[])? {
+ self.apply_changes(space, &[], changes)?;
+ }
+ }
+ SectionOp::Delete(pages) => {
+ for (space, changes) in crate::pages::section_changes(self, &[], pages)? {
+ self.apply_changes(space, &[], changes)?;
+ }
+ }
+ }
+ Ok(())
+ }
+}
+
+/// Whether an op may store more than one revision of a page, so its failure part way needs
+/// the page as it was.
+fn stores_more_than_once(op: &Op) -> bool {
+ match op {
+ Op::Section(_) => true,
+ Op::Page { op, .. } => matches!(
+ op,
+ PageOp::Link { .. }
+ | PageOp::Insert { .. }
+ | PageOp::Move { .. }
+ | PageOp::Add { .. }
+ | PageOp::Table {
+ edit: TableEdit::Rows { .. } | TableEdit::Column { .. },
+ ..
+ }
+ ),
+ }
+}
+
+/// Why an op was not applied: a precondition it names, or what a writer refused.
+enum Failure {
+ Refused(OpError),
+ Rejected(Error),
+}
+
+impl From for Failure {
+ fn from(error: Error) -> Self {
+ Self::Rejected(error)
+ }
+}
+
+impl From for Failure {
+ fn from(error: OpError) -> Self {
+ Self::Refused(error)
+ }
+}
+
+/// Writes ops onto one page of a section.
+struct Writer<'s, 'a> {
+ section: &'s mut Section<'a>,
+ space: ExGuid,
+ author: &'s str,
+}
+
+impl<'a> Writer<'_, 'a> {
+ fn page(&mut self) -> Result<&ActivePage<'a>, Error> {
+ self.section.active(self.space)
+ }
+
+ fn write(
+ &mut self,
+ changes: impl FnOnce(&ActivePage<'a>) -> Result,
+ ) -> Result<(), Failure> {
+ self.write_with(&[], changes)
+ }
+
+ fn write_with(
+ &mut self,
+ payloads: &[([u8; 16], &[u8])],
+ changes: impl FnOnce(&ActivePage<'a>) -> Result,
+ ) -> Result<(), Failure> {
+ let changes = changes(self.page()?)?;
+ self.section.apply_changes(self.space, payloads, changes)?;
+ Ok(())
+ }
+
+ /// Requires `id` reachable on the page.
+ fn target(&mut self, id: ExGuid) -> Result<(), Failure> {
+ let page = self.page()?;
+ if page.live.is_reachable(id) && page.view.nodes.contains_key(&id) {
+ Ok(())
+ } else {
+ Err(OpError::TargetUnavailable(id).into())
+ }
+ }
+
+ /// Requires `id` free for a new object: not reachable on the page.
+ fn free(&mut self, id: ExGuid) -> Result<(), Failure> {
+ if id.guid == [0; 16] || self.page()?.live.is_reachable(id) {
+ Err(OpError::DuplicateIdentity(id).into())
+ } else {
+ Ok(())
+ }
+ }
+
+ /// The only parent of `id` on the page.
+ fn parent(&mut self, id: ExGuid) -> Result {
+ match self.page()?.parents.get(&id).map(Vec::as_slice) {
+ Some([parent]) => Ok(*parent),
+ _ => Err(OpError::StructureChanged("Page content must have one parent").into()),
+ }
+ }
+
+ /// The container `id` lies in, outline groups passed over.
+ fn container(&mut self, id: ExGuid) -> Result {
+ let mut at = self.parent(id)?;
+ while matches!(self.page()?.view.nodes[&at].kind, Kind::OutlineGroup) {
+ at = self.parent(at)?;
+ }
+ Ok(at)
+ }
+
+ /// The text object a paragraph holds.
+ fn text_of(&mut self, paragraph: ExGuid) -> Result {
+ let page = self.page()?;
+ let node = &page.view.nodes[¶graph];
+ match node.content.as_slice() {
+ [text] if matches!(page.view.nodes[text].kind, Kind::RichText { .. }) => Ok(*text),
+ _ => Err(OpError::Unsupported("Select a paragraph holding text").into()),
+ }
+ }
+
+ /// The absolute outline level of paragraph `id`; zero for an outline or cell.
+ fn level(&mut self, id: ExGuid) -> Result {
+ if !matches!(self.page()?.view.nodes[&id].kind, Kind::Paragraph { .. }) {
+ return Ok(0);
+ }
+ let container = self.container(id)?;
+ let depth = self.depth(container, id)?;
+ Ok(self.level(container)? + depth)
+ }
+
+ fn depth(&mut self, container: ExGuid, id: ExGuid) -> Result {
+ levels::stored_depths(&self.page()?.view, container)
+ .into_iter()
+ .find(|(child, _)| *child == id)
+ .map(|(_, depth)| depth)
+ .ok_or_else(|| OpError::StructureChanged("A paragraph left its container").into())
+ }
+
+ /// Stores `container`'s children at the depths they have, `targets` overriding some.
+ fn regroup(&mut self, container: ExGuid, targets: &[(ExGuid, u32)]) -> Result<(), Failure> {
+ let page = self.page()?;
+ let current = levels::stored_depths(&page.view, container);
+ let is_cell = matches!(page.view.nodes[&container].kind, Kind::Cell { .. });
+ let (children, depths): (Vec, Vec) = current
+ .iter()
+ .map(|(child, depth)| {
+ let target = targets
+ .iter()
+ .find(|(id, _)| id == child)
+ .map_or(*depth, |(_, depth)| *depth);
+ (*child, target)
+ })
+ .unzip();
+ if current.iter().map(|(_, depth)| *depth).eq(depths.iter().copied()) {
+ return Ok(());
+ }
+ let (level, runs) = levels::runs(&children, &depths, is_cell)?;
+ self.write(|page| levels::regroup_changes(page, container, level, &runs))
+ }
+
+ fn apply(&mut self, op: &PageOp) -> Result<(), Failure> {
+ match op {
+ PageOp::Text { text, range, with } => {
+ self.target(*text)?;
+ if with.contains(['\0', '\n', '\u{fffc}']) {
+ return Err(OpError::Unsupported("Use ordinary paragraph text").into());
+ }
+ self.write(|page| crate::edit::text_changes(page, *text, range.clone(), with))
+ }
+ PageOp::Format {
+ text,
+ range,
+ set,
+ clear,
+ } => {
+ self.target(*text)?;
+ self.write(|page| {
+ crate::formatting::format_changes(page, *text, range.clone(), set, clear)
+ })
+ }
+ PageOp::Link {
+ text,
+ range,
+ target,
+ } => {
+ self.target(*text)?;
+ let page = self.page()?;
+ let current = crate::page::text_of(&page.view, &page.parents, *text)?;
+ for op in link_ops(¤t, *text, range.clone(), target.as_deref())? {
+ self.apply(&op)?;
+ }
+ Ok(())
+ }
+ PageOp::Equation { text, math } => {
+ self.target(*text)?;
+ self.write(|page| content::equation_changes(page, *text, math))
+ }
+ PageOp::Insert {
+ container,
+ before,
+ paragraphs,
+ } => {
+ self.target(*container)?;
+ self.insert(*container, *before, paragraphs)
+ }
+ PageOp::Split {
+ text,
+ at,
+ paragraph,
+ right,
+ lists,
+ } => {
+ self.target(*text)?;
+ for id in [*paragraph, *right].iter().chain(lists) {
+ self.free(*id)?;
+ }
+ let split = ParagraphSplit::new(*text, *at, self.author)?;
+ self.write(|page| split.changes_as(page, *paragraph, *right, lists))
+ }
+ PageOp::Join { left, right } => {
+ self.target(*left)?;
+ self.target(*right)?;
+ let join = ParagraphJoin::new(*left, *right, self.author)?;
+ self.write(|page| join.changes(page))
+ }
+ PageOp::Move {
+ object,
+ parent,
+ before,
+ } => {
+ self.target(*object)?;
+ self.move_to(*object, *parent, *before)
+ }
+ PageOp::Delete { object } => {
+ self.target(*object)?;
+ let page = self.page()?;
+ if matches!(page.view.nodes[object].kind, Kind::Paragraph { .. }) {
+ let container = self.container(*object)?;
+ if matches!(self.page()?.view.nodes[&container].kind, Kind::Cell { .. })
+ && levels::flat_children(&self.page()?.view, container) == [*object]
+ {
+ return Err(OpError::Unsupported(
+ "A table cell keeps a paragraph; insert its replacement first",
+ )
+ .into());
+ }
+ }
+ let edit = TreeEdit::delete(*object, self.author)?;
+ self.write(|page| edit.changes(page))
+ }
+ PageOp::Level { paragraph, level } => {
+ self.target(*paragraph)?;
+ let container = self.container(*paragraph)?;
+ let base = self.level(container)?;
+ let depth = level
+ .checked_sub(base)
+ .filter(|depth| *depth > 0)
+ .ok_or(OpError::Unsupported(
+ "A paragraph lies deeper than its parent",
+ ))?;
+ self.regroup(container, &[(*paragraph, depth)])
+ }
+ PageOp::Outline { object, edit } => {
+ self.target(*object)?;
+ self.write(|page| edit.changes(page, *object))
+ }
+ PageOp::Paragraph {
+ paragraph,
+ alignment,
+ rtl,
+ space_before,
+ space_after,
+ line_spacing,
+ language,
+ } => {
+ self.target(*paragraph)?;
+ let text = self.text_of(*paragraph)?;
+ let values = ParagraphFields {
+ alignment: *alignment,
+ rtl: *rtl,
+ space_before: *space_before,
+ space_after: *space_after,
+ line_spacing: *line_spacing,
+ language: *language,
+ }
+ .values()?;
+ if values.is_empty() {
+ return Ok(());
+ }
+ self.write(|page| properties::paragraph_format_changes(page, text, &values))
+ }
+ PageOp::Style {
+ paragraph,
+ style,
+ definition,
+ } => {
+ self.target(*paragraph)?;
+ let text = self.text_of(*paragraph)?;
+ self.write(|page| properties::style_changes(page, text, *style, Some(definition)))
+ }
+ PageOp::List { paragraph, lists } => {
+ self.target(*paragraph)?;
+ let page = self.page()?;
+ for (id, _) in lists {
+ if page
+ .parents
+ .get(id)
+ .is_some_and(|owners| owners.iter().any(|owner| owner != paragraph))
+ {
+ return Err(OpError::Unsupported("A list node belongs to one paragraph").into());
+ }
+ }
+ let nodes = lists
+ .iter()
+ .map(|(id, definition)| Ok((*id, properties::list_values(definition)?)))
+ .collect::, Error>>()?;
+ self.write(|page| properties::list_changes(page, *paragraph, &nodes))
+ }
+ PageOp::Tags {
+ target,
+ tags,
+ definitions,
+ } => {
+ self.target(*target)?;
+ let mut entries = Vec::new();
+ for tag in tags {
+ let definition = tag
+ .definition
+ .ok_or(OpError::Unsupported("A note tag names its definition"))?;
+ let model = definitions
+ .iter()
+ .find(|(id, _)| *id == definition)
+ .map(|(_, definition)| definition);
+ entries.push((definition, tag, model));
+ }
+ self.write(|page| properties::tag_changes(page, *target, &entries))
+ }
+ PageOp::Add { object, before } => self.add(object, *before),
+ PageOp::Picture {
+ picture,
+ layout,
+ alt,
+ } => {
+ self.target(*picture)?;
+ let page = self.page()?;
+ let node = &page.view.nodes[picture];
+ if !matches!(node.kind, Kind::Image { .. }) {
+ return Err(OpError::Unsupported("Select a picture").into());
+ }
+ let stored = Image::read(&page.view, *picture, node)?;
+ self.write(|page| {
+ content::picture_edit_changes(
+ page,
+ *picture,
+ (&stored.layout, &stored.alt),
+ layout,
+ alt,
+ )
+ })
+ }
+ PageOp::Attachment {
+ attachment,
+ filename,
+ source_path,
+ size,
+ } => {
+ self.target(*attachment)?;
+ let page = self.page()?;
+ let node = &page.view.nodes[attachment];
+ if !matches!(node.kind, Kind::Attachment { .. }) {
+ return Err(OpError::Unsupported("Select an attachment").into());
+ }
+ let stored = Attachment::read(&page.view, *attachment, node)?;
+ let edited = Attachment {
+ filename: filename.clone(),
+ source_path: source_path.clone(),
+ size: *size,
+ ..stored.clone()
+ };
+ self.write(|page| content::attachment_edit_changes(page, &stored, &edited))
+ }
+ PageOp::Strokes { ink, add, remove } => {
+ self.target(*ink)?;
+ let page = self.page()?;
+ let node = &page.view.nodes[ink];
+ if !matches!(node.kind, Kind::Ink { .. }) {
+ return Err(OpError::Unsupported("Select ink").into());
+ }
+ let stored = Ink::read(&page.view, *ink, node)?;
+ if !stored.groups.is_empty() {
+ return Err(OpError::Unsupported("Grouped ink keeps its strokes").into());
+ }
+ for id in remove {
+ if !stored.strokes.iter().any(|stroke| stroke.id == *id) {
+ return Err(OpError::TargetUnavailable(*id).into());
+ }
+ }
+ for stroke in add {
+ self.free(stroke.id)?;
+ }
+ let kept: Vec = stored
+ .strokes
+ .iter()
+ .map(|stroke| stroke.id)
+ .filter(|id| !remove.contains(id))
+ .collect();
+ let added: Vec<_> = add.iter().map(|stroke| (stroke.id, stroke)).collect();
+ self.write(|page| content::strokes_changes(page, *ink, &kept, &added))
+ }
+ PageOp::Table { table, edit } => {
+ self.target(*table)?;
+ self.table(*table, edit)
+ }
+ }
+ }
+
+ /// Moves `object` before `before` in `parent`, or among the page's children.
+ fn move_to(
+ &mut self,
+ object: ExGuid,
+ parent: Option,
+ before: Option,
+ ) -> Result<(), Failure> {
+ let Some(parent) = parent else {
+ let [page] = self.page()?.pages[..] else {
+ return Err(OpError::Unsupported("Choose a page space holding one page").into());
+ };
+ if let Some(before) = before
+ && self.parent(before)? != page
+ {
+ return Err(OpError::StructureChanged("The anchor is not on the page").into());
+ }
+ let edit = TreeEdit::move_to(object, page, before, self.author)?;
+ return self.write(|page| edit.changes(page));
+ };
+ self.target(parent)?;
+ let mut at = parent;
+ loop {
+ if at == object {
+ return Err(OpError::StructureChanged("A subtree cannot move inside itself").into());
+ }
+ match self.page()?.parents.get(&at).map(Vec::as_slice) {
+ Some([up]) => at = *up,
+ _ => break,
+ }
+ }
+ let holder = match before {
+ Some(before) => {
+ self.target(before)?;
+ if self.container(before)? != parent {
+ return Err(
+ OpError::StructureChanged("The anchor is no child of the container").into(),
+ );
+ }
+ self.parent(before)?
+ }
+ None => parent,
+ };
+ let level = self.level(object)?;
+ let edit = TreeEdit::move_to(object, holder, before, self.author)?;
+ self.write(|page| edit.changes(page))?;
+ if matches!(self.page()?.view.nodes[&parent].kind, Kind::Cell { .. }) {
+ return Ok(());
+ }
+ let base = self.level(parent)?;
+ let depth = if level > base { level - base } else { 1 };
+ self.regroup(parent, &[(object, depth)])
+ }
+
+ /// Inserts paragraphs into `container` before `before` as `PageOp::Insert` does.
+ fn insert(
+ &mut self,
+ container: ExGuid,
+ before: Option,
+ paragraphs: &[PageParagraph],
+ ) -> Result<(), Failure> {
+ if paragraphs.is_empty() {
+ return Err(OpError::Unsupported("Insert at least one paragraph").into());
+ }
+ let holder = match before {
+ Some(before) => {
+ self.target(before)?;
+ if self.container(before)? != container {
+ return Err(
+ OpError::StructureChanged("The anchor is no child of the container").into(),
+ );
+ }
+ self.parent(before)?
+ }
+ None => container,
+ };
+ let mut seen = BTreeSet::new();
+ for paragraph in paragraphs {
+ bare(paragraph)?;
+ for id in super::model::identities(std::slice::from_ref(paragraph)) {
+ if !seen.insert(id) {
+ return Err(OpError::DuplicateIdentity(id).into());
+ }
+ self.free(id)?;
+ }
+ if let Some(parent) = paragraph.parent
+ && parent != container
+ && !paragraphs.iter().any(|p| p.id == parent)
+ {
+ return Err(OpError::StructureChanged(
+ "An inserted paragraph's parent precedes it among them",
+ )
+ .into());
+ }
+ }
+ let base = self.level(container)?;
+ let mut targets: BTreeMap> = BTreeMap::new();
+ for paragraph in paragraphs {
+ let (parent, anchor, holder) = match paragraph.parent.filter(|p| *p != container) {
+ Some(parent) => (parent, None, parent),
+ None => (container, before, holder),
+ };
+ let parent_level = if parent == container {
+ base
+ } else {
+ paragraphs.iter().find(|p| p.id == parent).unwrap().level
+ };
+ let depth = paragraph
+ .level
+ .checked_sub(parent_level)
+ .filter(|depth| *depth > 0)
+ .ok_or(OpError::Unsupported("A paragraph lies deeper than its parent"))?;
+ targets.entry(parent).or_default().push((paragraph.id, depth));
+ self.paragraph(holder, anchor, paragraph, None)?;
+ }
+ for (parent, targets) in targets {
+ if !matches!(self.page()?.view.nodes[&parent].kind, Kind::Cell { .. }) {
+ self.regroup(parent, &targets)?;
+ }
+ }
+ Ok(())
+ }
+
+ /// Creates one paragraph with its content in `holder` before `anchor`; with `outline`,
+ /// as the first paragraph of that new outline at its position.
+ fn paragraph(
+ &mut self,
+ holder: ExGuid,
+ anchor: Option,
+ paragraph: &PageParagraph,
+ outline: Option<(ExGuid, f32, f32)>,
+ ) -> Result<(), Failure> {
+ let (text, text_id) = match ¶graph.content {
+ ParagraphContent::Text(text) => (text.text.text(), text.id),
+ _ => (
+ "",
+ ExGuid {
+ guid: crate::write::fresh_guid()?,
+ n: 1,
+ },
+ ),
+ };
+ let equation = paragraph
+ .text()
+ .is_some_and(|text| crate::page::Math::is_equation(&text.text));
+ let insertion = match outline {
+ Some((_, x, y)) => {
+ let page = self.page()?.pages.first().copied().unwrap_or_default();
+ Insertion::outline(page, x, y, text, self.author)?
+ }
+ None => Insertion::paragraph(holder, anchor, text, self.author)?,
+ };
+ let object = outline.map_or(paragraph.id, |(id, _, _)| id);
+ self.write(|page| insertion.changes_as(page, object, paragraph.id, text_id))?;
+ match ¶graph.content {
+ ParagraphContent::Text(target) => {
+ if equation {
+ return self.write(|page| content::equation_changes(page, text_id, &target.text));
+ }
+ let page = self.page()?;
+ let stored = crate::page::text_of(&page.view, &page.parents, text_id)?;
+ let values = paragraph_fields(&stored, &target.text)?.values()?;
+ if !values.is_empty() {
+ self.write(|page| properties::paragraph_format_changes(page, text_id, &values))?;
+ }
+ let page = self.page()?;
+ let stored = crate::page::text_of(&page.view, &page.parents, text_id)?;
+ for (range, set, clear) in format_edits(&stored, &target.text, true)? {
+ self.write(|page| {
+ crate::formatting::format_changes(page, text_id, range, &set, &clear)
+ })?;
+ }
+ Ok(())
+ }
+ ParagraphContent::Table(table) => {
+ super::table::validate_table(table)?;
+ let structure = Structure {
+ rows: table
+ .rows
+ .iter()
+ .map(|row| (row.id, row.cells.iter().map(|cell| cell.id).collect()))
+ .collect(),
+ new_rows: table.rows.iter().map(|row| row.id).collect(),
+ new_cells: table
+ .rows
+ .iter()
+ .flat_map(|row| &row.cells)
+ .map(|cell| (cell.id, (table::cell_indents(&cell.indents, None), cell.shading)))
+ .collect(),
+ columns: &table.columns,
+ borders: table.borders,
+ };
+ self.write(|page| table::table_changes(page, table.id, Some(paragraph.id), &structure))?;
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ self.cell(cell)?;
+ }
+ Ok(())
+ }
+ ParagraphContent::Image(image) => {
+ if image.layout.x.is_some() || image.layout.y.is_some() {
+ return Err(OpError::Unsupported("A paragraph picture has no position of its own").into());
+ }
+ self.picture(image, Some(paragraph.id))
+ }
+ ParagraphContent::Attachment(attachment) => {
+ let Some(bytes) = &attachment.bytes else {
+ return Err(OpError::Unsupported("A new attachment needs its payload").into());
+ };
+ let ids = AttachmentIds {
+ object: attachment.id,
+ file: fresh()?,
+ payload: crate::write::fresh_guid()?,
+ preview: match &attachment.preview {
+ Some(_) => Some((crate::write::fresh_guid()?, fresh()?)),
+ None => None,
+ },
+ };
+ let mut payloads: Vec<([u8; 16], &[u8])> = vec![(ids.payload, bytes)];
+ if let (Some((payload, _)), Some(icon)) = (ids.preview, &attachment.preview) {
+ payloads.push((payload, icon));
+ }
+ self.write_with(&payloads, |page| {
+ content::attachment_changes(page, attachment, &ids, paragraph.id)
+ })
+ }
+ ParagraphContent::Ink(ink) => self.ink(ink, Some(paragraph.id)),
+ ParagraphContent::Unsupported(_) => {
+ Err(OpError::Unsupported("Unsupported content cannot be inserted").into())
+ }
+ }
+ }
+
+ /// Fills a new cell with its paragraphs.
+ fn cell(&mut self, cell: &TableCell) -> Result<(), Failure> {
+ if cell.paragraphs.is_empty() {
+ return Err(OpError::Unsupported("A new table cell needs a paragraph").into());
+ }
+ self.insert(cell.id, None, &cell.paragraphs)
+ }
+
+ fn picture(&mut self, image: &Image, holder: Option) -> Result<(), Failure> {
+ let Some(bytes) = &image.bytes else {
+ return Err(OpError::Unsupported("A new picture needs its payload").into());
+ };
+ let (file, payload) = (fresh()?, crate::write::fresh_guid()?);
+ let bytes: &[u8] = bytes;
+ self.write_with(&[(payload, bytes)], |page| {
+ content::picture_changes(page, image, image.id, file, payload, holder)
+ })
+ }
+
+ fn ink(&mut self, ink: &Ink, holder: Option) -> Result<(), Failure> {
+ for stroke in &ink.strokes {
+ self.free(stroke.id)?;
+ }
+ let data = fresh()?;
+ let strokes: Vec<_> = ink.strokes.iter().map(|stroke| (stroke.id, stroke)).collect();
+ self.write(|page| content::ink_changes(page, ink, ink.id, data, &strokes, holder))
+ }
+
+ /// Adds a page object on top, then moves it before `before`.
+ fn add(&mut self, object: &PageObject, before: Option) -> Result<(), Failure> {
+ self.free(object.id())?;
+ match object {
+ PageObject::Outline(outline) => {
+ let (Some(x), Some(y)) = (outline.layout.x, outline.layout.y) else {
+ return Err(OpError::Unsupported("A new outline needs a position").into());
+ };
+ let [first, rest @ ..] = outline.paragraphs.as_slice() else {
+ return Err(OpError::Unsupported("A new outline needs a paragraph").into());
+ };
+ for paragraph in &outline.paragraphs {
+ bare(paragraph)?;
+ for id in super::model::identities(std::slice::from_ref(paragraph)) {
+ self.free(id)?;
+ }
+ }
+ if first.parent.is_some() || first.level != 1 {
+ return Err(OpError::Unsupported("An outline starts at its first level").into());
+ }
+ self.paragraph(outline.id, None, first, Some((outline.id, x, y)))?;
+ // Later paragraphs follow the first, their levels as the outline gives them.
+ if !rest.is_empty() {
+ let mut targets = vec![(first.id, 1)];
+ for paragraph in rest {
+ let parent = paragraph.parent.unwrap_or(outline.id);
+ let parent_level = rest
+ .iter()
+ .chain([first])
+ .find(|p| p.id == parent)
+ .map_or(0, |p| p.level);
+ let depth = paragraph
+ .level
+ .checked_sub(parent_level)
+ .filter(|depth| *depth > 0)
+ .ok_or(OpError::Unsupported("A paragraph lies deeper than its parent"))?;
+ self.paragraph(parent, None, paragraph, None)?;
+ if parent == outline.id {
+ targets.push((paragraph.id, depth));
+ } else {
+ self.regroup(parent, &[(paragraph.id, depth)])?;
+ }
+ }
+ self.regroup(outline.id, &targets)?;
+ }
+ // A new outline is 468 points wide unless it says otherwise.
+ if let Some(points) = outline.layout.max_width
+ && (points, outline.layout.width_set_by_user) != (468.0, None)
+ {
+ let edit = OutlineEdit::Width {
+ points,
+ user_set: outline.layout.width_set_by_user == Some(true),
+ };
+ self.write(|page| edit.changes(page, outline.id))?;
+ }
+ if !outline.indents.is_empty() && outline.indents != content::NATIVE_INDENTS {
+ let indents = content::measurement_bytes(&outline.indents, 4)?;
+ let id = outline.id;
+ self.write(|page| {
+ let mut node =
+ crate::write::PropertyObject::from_object(&page.live.revision.objects[&id])?;
+ node.set(&[(0x1c001c12, &indents)])?;
+ Ok(BTreeMap::from([(id, node)]))
+ })?;
+ }
+ }
+ PageObject::Image(image) => {
+ if image.layout.x.is_none() || image.layout.y.is_none() {
+ return Err(OpError::Unsupported("A new page-level picture needs a position").into());
+ }
+ self.picture(image, None)?;
+ }
+ PageObject::Ink(ink) => self.ink(ink, None)?,
+ PageObject::Title(_) | PageObject::Unsupported(_) => {
+ return Err(OpError::Unsupported("Titles and unsupported objects cannot be added").into());
+ }
+ }
+ if before.is_some() {
+ self.move_to(object.id(), None, before)?;
+ }
+ Ok(())
+ }
+
+ fn table(&mut self, id: ExGuid, edit: &TableEdit) -> Result<(), Failure> {
+ let page = self.page()?;
+ let node = &page.view.nodes[&id];
+ let Kind::Table {
+ widths,
+ locked,
+ borders,
+ ..
+ } = &node.kind
+ else {
+ return Err(OpError::Unsupported("Select a table").into());
+ };
+ let mut columns: Vec = widths
+ .iter()
+ .enumerate()
+ .map(|(i, width)| TableColumn {
+ width: *width,
+ locked: locked.get(i).copied().unwrap_or(false),
+ })
+ .collect();
+ let mut rows: Vec<(ExGuid, Vec)> = node
+ .children
+ .iter()
+ .map(|row| (*row, page.view.nodes[row].children.clone()))
+ .collect();
+ let mut borders = *borders;
+ let template = rows
+ .first()
+ .and_then(|(_, cells)| cells.first())
+ .and_then(|cell| match &page.view.nodes[cell].kind {
+ Kind::Cell { indents, .. } => Some(indents.clone()),
+ _ => None,
+ });
+ let mut new_rows = BTreeSet::new();
+ let mut new_cells: BTreeMap, Option)> = BTreeMap::new();
+ let mut filled: Vec<&TableCell> = Vec::new();
+ let new_cell = |cell: &TableCell| {
+ (
+ table::cell_indents(&cell.indents, template.as_deref()).to_vec(),
+ cell.shading,
+ )
+ };
+ match edit {
+ TableEdit::Rows { before, rows: added } => {
+ let at = match before {
+ Some(before) => rows
+ .iter()
+ .position(|(row, _)| row == before)
+ .ok_or(OpError::StructureChanged("The anchor row is not in the table"))?,
+ None => rows.len(),
+ };
+ for row in added {
+ if row.cells.len() != columns.len() {
+ return Err(OpError::Unsupported("Every table row has one cell per column").into());
+ }
+ new_rows.insert(row.id);
+ for cell in &row.cells {
+ new_cells.insert(cell.id, new_cell(cell));
+ filled.push(cell);
+ }
+ }
+ rows.splice(
+ at..at,
+ added
+ .iter()
+ .map(|row| (row.id, row.cells.iter().map(|cell| cell.id).collect())),
+ );
+ }
+ TableEdit::Column { at, width, cells } => {
+ let at = *at as usize;
+ if at > columns.len() || cells.len() != rows.len() {
+ return Err(OpError::Unsupported("A new column has one cell per row").into());
+ }
+ for ((_, row), cell) in rows.iter_mut().zip(cells) {
+ row.insert(at, cell.id);
+ new_cells.insert(cell.id, new_cell(cell));
+ filled.push(cell);
+ }
+ columns.insert(
+ at,
+ TableColumn {
+ width: *width,
+ locked: false,
+ },
+ );
+ }
+ TableEdit::DeleteRow(row) => {
+ let before = rows.len();
+ rows.retain(|(id, _)| id != row);
+ if rows.len() == before {
+ return Err(OpError::TargetUnavailable(*row).into());
+ }
+ if rows.is_empty() {
+ return Err(OpError::Unsupported("A table keeps a row; delete the table instead").into());
+ }
+ }
+ TableEdit::DeleteColumn(at) => {
+ let at = *at as usize;
+ if at >= columns.len() || columns.len() == 1 {
+ return Err(OpError::Unsupported("Choose a column of a table with several").into());
+ }
+ columns.remove(at);
+ for (_, cells) in &mut rows {
+ cells.remove(at);
+ }
+ }
+ TableEdit::Columns(widths) => {
+ if widths.len() != columns.len() {
+ return Err(OpError::Unsupported("Give every column its width").into());
+ }
+ columns = widths.clone();
+ }
+ TableEdit::Borders(value) => borders = Some(*value),
+ TableEdit::Cell {
+ cell,
+ shading,
+ indents,
+ } => {
+ if !rows.iter().any(|(_, cells)| cells.contains(cell)) {
+ return Err(OpError::TargetUnavailable(*cell).into());
+ }
+ let Kind::Cell {
+ shading: stored_shading,
+ indents: stored_indents,
+ } = &page.view.nodes[cell].kind
+ else {
+ return Err(OpError::Unsupported("Select a table cell").into());
+ };
+ let stored = (*stored_shading, stored_indents.clone());
+ return self.write(|page| {
+ table::cell_changes(page, *cell, (stored.0, &stored.1), *shading, indents)
+ });
+ }
+ }
+ for cell in &filled {
+ for id in std::iter::once(cell.id).chain(super::model::identities(&cell.paragraphs)) {
+ self.free(id)?;
+ }
+ }
+ for row in &new_rows {
+ self.free(*row)?;
+ }
+ if columns.iter().any(|c| !c.width.is_finite() || c.width < 36.0) {
+ return Err(OpError::Unsupported("Table columns are at least 36 points wide").into());
+ }
+ let structure = Structure {
+ rows,
+ new_rows,
+ new_cells: new_cells
+ .iter()
+ .map(|(id, (indents, shading))| (*id, (indents.as_slice(), *shading)))
+ .collect(),
+ columns: &columns,
+ borders,
+ };
+ self.write(|page| table::table_changes(page, id, None, &structure))?;
+ for cell in filled {
+ self.cell(cell)?;
+ }
+ Ok(())
+ }
+}
+
+fn fresh() -> Result {
+ Ok(ExGuid {
+ guid: crate::write::fresh_guid()?,
+ n: 1,
+ })
+}
+
+/// Requires what `Insert` leaves to other ops unset.
+fn bare(paragraph: &PageParagraph) -> Result<(), OpError> {
+ let text_tags = paragraph.text().is_some_and(|text| !text.tags.is_empty());
+ if paragraph.style.is_some()
+ || !paragraph.lists.is_empty()
+ || !paragraph.tags.is_empty()
+ || text_tags
+ || paragraph.collapsed
+ {
+ return Err(OpError::Unsupported(
+ "Set styles, lists, tags and collapse state with their own ops",
+ ));
+ }
+ if paragraph.media != Default::default() {
+ return Err(OpError::Unsupported(
+ "Recording annotations are made by OneNote while it records",
+ ));
+ }
+ match ¶graph.content {
+ ParagraphContent::Text(text) if text.date_field.is_some() => Err(OpError::Unsupported(
+ "New paragraphs contain plain text without fields",
+ )),
+ ParagraphContent::Table(table) => {
+ if !table.tags.is_empty() {
+ return Err(OpError::Unsupported("Set a table's tags with their own op"));
+ }
+ for paragraph in table.rows.iter().flat_map(|row| &row.cells).flat_map(|cell| &cell.paragraphs)
+ {
+ bare(paragraph)?;
+ }
+ Ok(())
+ }
+ ParagraphContent::Attachment(attachment) if attachment.recording.is_some() => Err(
+ OpError::Unsupported("Recordings are captured by OneNote, not inserted"),
+ ),
+ _ => Ok(()),
+ }
+}
+
+/// The field code OneNote stores before a hyperlink's label.
+fn field_code(target: &str) -> Result {
+ if target.is_empty() || target.contains(['"', '\0', '\r', '\n', '\u{fddf}']) {
+ return Err(invalid("Choose a link target without quotes or line breaks"));
+ }
+ Ok(format!("\u{fddf}HYPERLINK \"{target}\""))
+}
+
+/// The text edits making `range` of `text` a hyperlink to `target`: the field code
+/// inserted hidden before the label, both flagged as link runs as OneNote stores them. With
+/// `None` or an existing link, the field code before the label is removed first.
+pub(crate) fn link_ops(
+ text: &Paragraph,
+ id: ExGuid,
+ range: Range,
+ target: Option<&str>,
+) -> Result, Error> {
+ if range.is_empty() {
+ return Err(invalid("A link needs a label"));
+ }
+ let at = |offset: u32| super::lower::format_in(text, offset);
+ let mut ops = Vec::new();
+ let mut label = range.clone();
+ // A field code is a hidden link run ending where the label starts.
+ let start = text.byte_offset(range.start)?;
+ let spans = text.spans();
+ let code = spans.iter().enumerate().find_map(|(i, span)| {
+ let from = if i == 0 { 0 } else { spans[i - 1].end };
+ (span.end == start
+ && span.format.hidden == Some(true)
+ && span.format.hyperlink == Some(true)
+ && text.text()[from..span.end].starts_with('\u{fddf}'))
+ .then_some(from..span.end)
+ });
+ if let Some(code) = code {
+ let code = text.utf16_offset(code.start)?..text.utf16_offset(code.end)?;
+ let length = code.end - code.start;
+ ops.push(PageOp::Text {
+ text: id,
+ range: code.clone(),
+ with: String::new(),
+ });
+ label = label.start - length..label.end - length;
+ } else if target.is_none() {
+ return Err(invalid("The range is no link"));
+ }
+ let base = at(range.start)?.clone();
+ match target {
+ Some(target) => {
+ let code = field_code(target)?;
+ let length = code.encode_utf16().count() as u32;
+ ops.push(PageOp::Text {
+ text: id,
+ range: label.start..label.start,
+ with: code,
+ });
+ let mut set = vec![
+ TextAttribute::Hyperlink(true),
+ TextAttribute::HyperlinkLabel(true),
+ ];
+ if base.hidden != Some(true) {
+ ops.push(PageOp::Format {
+ text: id,
+ range: label.start..label.start + length,
+ set: [set.clone(), vec![TextAttribute::Hidden(true)]].concat(),
+ clear: Vec::new(),
+ });
+ }
+ set.retain(|attribute| match attribute {
+ TextAttribute::Hyperlink(_) => base.hyperlink != Some(true),
+ _ => base.hyperlink_label != Some(true),
+ });
+ if !set.is_empty() || base.hidden == Some(true) {
+ ops.push(PageOp::Format {
+ text: id,
+ range: label.start + length..label.end + length,
+ set,
+ clear: Vec::new(),
+ });
+ }
+ }
+ None => ops.push(PageOp::Format {
+ text: id,
+ range: label,
+ set: Vec::new(),
+ clear: vec![TextProperty::Hyperlink, TextProperty::HyperlinkLabel],
+ }),
+ }
+ ops.retain(|op| !matches!(op, PageOp::Format { set, clear, .. } if set.is_empty() && clear.is_empty()));
+ Ok(ops)
+}
diff --git a/crates/onestore/src/op/content.rs b/crates/onestore/src/op/content.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d4ff55ca870cfebf3f26828fee50e71387bc66fa
--- /dev/null
+++ b/crates/onestore/src/op/content.rs
@@ -0,0 +1,746 @@
+//! Paragraph and page content other than text: pictures, attachments, ink and equations,
+//! written as OneNote 2010 stores them.
+
+use super::Values;
+use crate::{
+ Error, ExGuid,
+ active::{ActivePage, Changes},
+ document::{Format, Layout},
+ page::{Attachment, Image, Ink, InkStroke, Paragraph},
+ write::PropertyObject,
+};
+use std::collections::BTreeMap;
+
+fn invalid(message: &'static str) -> Error {
+ Error { offset: 0, message }
+}
+
+/// The `{GUID}` form a file-data declaration uses to name a payload in the file-data store.
+fn payload_reference(guid: [u8; 16]) -> String {
+ let id = ExGuid { guid, n: 0 }.to_string();
+ format!("{}", id.split(',').next().unwrap())
+}
+
+/// The compact child references a page object holds.
+fn page_children(object: &PropertyObject) -> Result, Error> {
+ let properties = crate::PropertySets::parse(&object.bytes)?;
+ match properties.sets[0]
+ .iter()
+ .find(|p| p.id == 0x24001c20)
+ .map(|p| &p.value)
+ {
+ Some(crate::Value::References { compact_ids, .. }) => Ok(compact_ids.to_vec()),
+ None => Ok(Vec::new()),
+ _ => Err(invalid("The page has an invalid child list")),
+ }
+}
+
+/// Makes `object` the content of paragraph `holder`, or a child of the page after its others.
+fn hold(
+ active: &ActivePage<'_>,
+ changed: &mut Changes,
+ object: ExGuid,
+ holder: Option,
+ modified: &[u8; 4],
+) -> Result<(), Error> {
+ let raw = &active.live.revision;
+ match holder {
+ Some(holder) => {
+ let mut paragraph = PropertyObject::from_object(&raw.objects[&holder])?;
+ let content = paragraph.reference(object)?;
+ paragraph.set(&[(0x24001c1f, &content), (0x14001d7a, modified)])?;
+ changed.insert(holder, paragraph);
+ }
+ None => {
+ let [page] = active.pages[..] else {
+ return Err(invalid("Choose an object space containing one active page"));
+ };
+ let mut node = PropertyObject::from_object(&raw.objects[&page])?;
+ let mut children = page_children(&node)?;
+ children.extend(node.reference(object)?);
+ node.set(&[(0x24001c20, &children), (0x14001d7a, modified)])?;
+ changed.insert(page, node);
+ }
+ }
+ Ok(())
+}
+
+/// The character-style properties a span format sets; paragraph-level fields stay on the
+/// paragraph style.
+pub(crate) fn style_values(format: &Format) -> Values {
+ let mut values = Values::new();
+ for (id, flag) in [
+ (0x08001c04, format.bold),
+ (0x08001c05, format.italic),
+ (0x08001c06, format.underline),
+ (0x08001c07, format.strike),
+ (0x08001c08, format.superscript),
+ (0x08001c09, format.subscript),
+ (0x08001e16, format.hidden),
+ (0x08001e14, format.hyperlink),
+ (0x08001e19, format.hyperlink_label),
+ (0x08003401, format.math),
+ (0x08001e22, format.embedded_object),
+ ] {
+ if let Some(flag) = flag {
+ values.push((id | (u32::from(flag) << 31), Vec::new()));
+ }
+ }
+ if let Some(font) = &format.font {
+ values.push((0x1c001c0a, crate::create::string(font)));
+ }
+ if let Some(size) = format.font_size {
+ values.push((
+ 0x10001c0b,
+ ((size * 2.0).round() as u16).to_le_bytes().to_vec(),
+ ));
+ }
+ if let Some(color) = format.color {
+ values.push((0x14001c0c, color.to_le_bytes().to_vec()));
+ }
+ if let Some(highlight) = format.highlight {
+ values.push((0x14001c0d, highlight.to_le_bytes().to_vec()));
+ }
+ if let Some(language) = format.language {
+ values.push((0x14001c3b, language.to_le_bytes().to_vec()));
+ }
+ values
+}
+
+/// The indentation table, in points, OneNote gives each outline and table cell it creates.
+pub(crate) const NATIVE_INDENTS: [f32; 4] = [18.0, 0.0, 27.0, 27.0];
+
+/// A native measurement array: a count byte, `header - 1` reserved bytes, then each value
+/// in half-inch units.
+pub(crate) fn measurement_bytes(values: &[f32], header: usize) -> Result, Error> {
+ let count = u8::try_from(values.len())
+ .map_err(|_| invalid("A measurement array exceeds the document range"))?;
+ let mut bytes = vec![0u8; header];
+ bytes[0] = count;
+ for value in values {
+ if !value.is_finite() {
+ return Err(invalid("A measurement must be finite"));
+ }
+ bytes.extend_from_slice(&(value / 36.0).to_le_bytes());
+ }
+ Ok(bytes)
+}
+
+/// A stored picture keeps what `Picture` cannot change.
+pub(crate) fn picture_fixed_fields(stored: &Image, image: &Image) -> Result<(), Error> {
+ if stored.id != image.id
+ || stored.bytes != image.bytes
+ || stored.size != image.size
+ || stored.background != image.background
+ {
+ return Err(invalid(
+ "A stored picture keeps its payload, intrinsic size and background state",
+ ));
+ }
+ Ok(())
+}
+
+/// Position and displayed-size properties that take `layout` from `stored`, and the ones
+/// to remove.
+fn layout_values(stored: &Layout, layout: &Layout) -> Result<(Values, Vec), Error> {
+ let mut values = Values::new();
+ let mut removed = Vec::new();
+ if (layout.x, layout.y) != (stored.x, stored.y) {
+ let (Some(x), Some(y)) = (layout.x, layout.y) else {
+ return Err(invalid("A picture position needs both coordinates"));
+ };
+ if !(x.is_finite() && y.is_finite()) {
+ return Err(invalid("A picture position must be finite"));
+ }
+ values.push((0x14001c14, (x / 36.0).to_le_bytes().to_vec()));
+ values.push((0x14001c15, (y / 36.0).to_le_bytes().to_vec()));
+ }
+ if (
+ layout.max_width,
+ layout.max_height,
+ layout.width_set_by_user,
+ ) != (
+ stored.max_width,
+ stored.max_height,
+ stored.width_set_by_user,
+ ) {
+ match (layout.max_width, layout.max_height) {
+ (Some(width), Some(height)) => {
+ if !(width.is_finite() && height.is_finite() && width > 0.0 && height > 0.0) {
+ return Err(invalid("Picture size must be positive"));
+ }
+ values.push((0x14001c1b, (width / 36.0).to_le_bytes().to_vec()));
+ values.push((0x14001c1c, (height / 36.0).to_le_bytes().to_vec()));
+ let user_set = u32::from(layout.width_set_by_user == Some(true));
+ values.push((0x08001cbd | (user_set << 31), Vec::new()));
+ }
+ (None, None) => removed.extend([0x14001c1b, 0x14001c1c, 0x08001cbd]),
+ _ => return Err(invalid("A picture size needs both dimensions")),
+ }
+ }
+ if layout.reserved_width != stored.reserved_width {
+ return Err(invalid("A picture has no reserved width"));
+ }
+ Ok((values, removed))
+}
+
+fn icon_size(values: &mut Values, size: Option<[f32; 2]>, message: &'static str) -> Result<(), Error> {
+ if let Some([width, height]) = size {
+ if !(width.is_finite() && height.is_finite() && width > 0.0 && height > 0.0) {
+ return Err(invalid(message));
+ }
+ values.push((0x140034cd, (width / 36.0).to_le_bytes().to_vec()));
+ values.push((0x140034ce, (height / 36.0).to_le_bytes().to_vec()));
+ }
+ Ok(())
+}
+
+/// What OneNote stores for an inserted picture: a file-data object declaring payload
+/// `payload` by identity and extension, and picture object `id` that paragraph `holder`
+/// holds as content or the page lists as a child. The caller embeds the payload.
+pub(crate) fn picture_changes(
+ active: &ActivePage<'_>,
+ image: &Image,
+ id: ExGuid,
+ file: ExGuid,
+ payload: [u8; 16],
+ holder: Option,
+) -> Result {
+ let Some(bytes) = &image.bytes else {
+ return Err(invalid("A new picture needs its payload"));
+ };
+ let extension = match bytes.as_ref() {
+ [0x89, b'P', b'N', b'G', ..] => ".png",
+ [0xff, 0xd8, 0xff, ..] => ".jpg",
+ [b'G', b'I', b'F', b'8', ..] => ".gif",
+ [b'B', b'M', ..] => ".bmp",
+ _ => return Err(invalid("Choose a PNG, JPEG, GIF or BMP picture")),
+ };
+ let modified = crate::create::current_timestamps()?.0.to_le_bytes();
+ let mut values: Values = vec![(0x14001d7a, modified.to_vec())];
+ if let Some([width, height]) = image.size {
+ if !(width.is_finite() && height.is_finite() && width > 0.0 && height > 0.0) {
+ return Err(invalid("Picture size must be positive"));
+ }
+ values.push((0x140034cd, (width / 36.0).to_le_bytes().to_vec()));
+ values.push((0x140034ce, (height / 36.0).to_le_bytes().to_vec()));
+ }
+ values.extend(layout_values(&Default::default(), &image.layout)?.0);
+ if let Some(alt) = &image.alt {
+ values.push((0x1c001e58, crate::create::string(alt)));
+ }
+ if image.background {
+ values.push((0x08001d13 | (1 << 31), Vec::new()));
+ }
+ values.push((0x14001c3b, 0x409_u32.to_le_bytes().to_vec()));
+ values.push((0x08001d85, Vec::new()));
+ let mut changed = BTreeMap::new();
+ changed.insert(
+ file,
+ PropertyObject::file(file, &payload_reference(payload), extension)?,
+ );
+ let mut picture = PropertyObject {
+ jcid: 0x60011,
+ bytes: crate::create::properties(&values)?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, id.guid)])),
+ };
+ picture.reference(id)?;
+ let container = picture.reference(file)?;
+ picture.set(&[(0x20001c3f, &container)])?;
+ changed.insert(id, picture);
+ hold(active, &mut changed, id, holder, &modified)?;
+ Ok(changed)
+}
+
+/// A moved, resized or described picture as OneNote stores one: the position, the layout
+/// width and height with the user flag and the description on the picture object, leaving
+/// the intrinsic size alone.
+pub(crate) fn picture_edit_changes(
+ active: &ActivePage<'_>,
+ object: ExGuid,
+ stored: (&Layout, &Option),
+ layout: &Layout,
+ alt: &Option,
+) -> Result {
+ let mut values: Values = vec![(
+ 0x14001d7a,
+ crate::create::current_timestamps()?
+ .0
+ .to_le_bytes()
+ .to_vec(),
+ )];
+ let (layout, mut removed) = layout_values(stored.0, layout)?;
+ values.extend(layout);
+ if alt != stored.1 {
+ match alt {
+ Some(alt) => values.push((0x1c001e58, crate::create::string(alt))),
+ None => removed.push(0x1c001e58),
+ }
+ }
+ let raw = &active.live.revision;
+ let mut picture = PropertyObject::from_object(&raw.objects[&object])?;
+ picture.remove(&removed)?;
+ let values: Vec<(u32, &[u8])> = values
+ .iter()
+ .map(|(id, bytes)| (*id, bytes.as_slice()))
+ .collect();
+ picture.set(&values)?;
+ Ok(BTreeMap::from([(object, picture)]))
+}
+
+/// Identities of a new attachment's objects and payloads.
+pub(crate) struct AttachmentIds {
+ pub object: ExGuid,
+ pub file: ExGuid,
+ pub payload: [u8; 16],
+ /// The preview icon's payload and file-data object, when it has one.
+ pub preview: Option<([u8; 16], ExGuid)>,
+}
+
+/// What OneNote stores for an inserted file: an embedded-file container declaring the
+/// payload and an attachment object naming the file, which paragraph `holder` holds as
+/// content. The caller embeds the payloads.
+pub(crate) fn attachment_changes(
+ active: &ActivePage<'_>,
+ attachment: &Attachment,
+ ids: &AttachmentIds,
+ holder: ExGuid,
+) -> Result {
+ let name = attachment.filename.as_str();
+ if name.is_empty() || name.contains(['\0', '/', '\\']) {
+ return Err(invalid(
+ "An attachment needs a file name without path separators",
+ ));
+ }
+ if attachment.recording.is_some() {
+ return Err(invalid("Recordings are captured by OneNote, not inserted"));
+ }
+ if attachment.bytes.is_none() {
+ return Err(invalid("A new attachment needs its payload"));
+ }
+ if attachment
+ .preview
+ .as_ref()
+ .is_some_and(|icon| !icon.starts_with(&[0x89, b'P', b'N', b'G']))
+ {
+ return Err(invalid("An attachment preview is a PNG icon"));
+ }
+ let extension = name
+ .rfind('.')
+ .filter(|dot| *dot > 0)
+ .map(|dot| &name[dot..])
+ .unwrap_or("");
+ let modified = crate::create::current_timestamps()?.0.to_le_bytes();
+ let mut values: Values = vec![(0x14001d7a, modified.to_vec())];
+ icon_size(&mut values, attachment.size, "Attachment icon size must be positive")?;
+ values.push((0x14001c3b, 0x409_u32.to_le_bytes().to_vec()));
+ values.push((0x10001cfe, 0x409_u16.to_le_bytes().to_vec()));
+ values.push((0x1c001dcf, vec![0; 32]));
+ values.push((
+ 0x1c001d61,
+ [16u32, 1, 0, 0, 0]
+ .iter()
+ .flat_map(|v| v.to_le_bytes())
+ .collect(),
+ ));
+ values.push((0x14001c3e, 1u32.to_le_bytes().to_vec()));
+ values.push((0x14001c84, 1u32.to_le_bytes().to_vec()));
+ values.push((0x1c001c22, crate::create::string(name)));
+ values.push((0x1c001d9c, crate::create::string(name)));
+ if let Some(path) = &attachment.source_path {
+ values.push((0x1c001d9d, crate::create::string(path)));
+ }
+ let mut changed = BTreeMap::new();
+ let mut file = PropertyObject::file(ids.file, &payload_reference(ids.payload), extension)?;
+ file.jcid = crate::write::EMBEDDED_FILE_JCID;
+ changed.insert(ids.file, file);
+ let mut node = PropertyObject {
+ jcid: 0x60035,
+ bytes: crate::create::properties(&values)?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, ids.object.guid)])),
+ };
+ node.reference(ids.object)?;
+ let container = node.reference(ids.file)?;
+ node.set(&[(0x20001d9b, &container)])?;
+ if let Some((payload, icon)) = ids.preview {
+ changed.insert(
+ icon,
+ PropertyObject::file(icon, &payload_reference(payload), ".png")?,
+ );
+ let reference = node.reference(icon)?;
+ node.set(&[(0x20001c3f, &reference)])?;
+ }
+ changed.insert(ids.object, node);
+ hold(active, &mut changed, ids.object, Some(holder), &modified)?;
+ Ok(changed)
+}
+
+/// A stored attachment keeps its payload and preview; its shown name, recorded source
+/// path and icon size change in place, as OneNote's rename does.
+pub(crate) fn attachment_edit_changes(
+ active: &ActivePage<'_>,
+ stored: &Attachment,
+ attachment: &Attachment,
+) -> Result {
+ let mut values: Values = vec![(
+ 0x14001d7a,
+ crate::create::current_timestamps()?
+ .0
+ .to_le_bytes()
+ .to_vec(),
+ )];
+ if attachment.recording != stored.recording {
+ return Err(invalid("A recording stays the recording OneNote captured"));
+ }
+ let name = attachment.filename.as_str();
+ if name.is_empty() || name.contains(['\0', '/', '\\']) {
+ return Err(invalid(
+ "An attachment needs a file name without path separators",
+ ));
+ }
+ let mut removed = Vec::new();
+ if attachment.filename != stored.filename {
+ let name = crate::create::string(&attachment.filename);
+ values.push((0x1c001c22, name.clone()));
+ values.push((0x1c001d9c, name));
+ }
+ if attachment.source_path != stored.source_path {
+ match &attachment.source_path {
+ Some(path) => values.push((0x1c001d9d, crate::create::string(path))),
+ None => removed.push(0x1c001d9d),
+ }
+ }
+ if attachment.size != stored.size {
+ match attachment.size {
+ Some(_) => icon_size(&mut values, attachment.size, "Attachment icon size must be positive")?,
+ None => removed.extend([0x140034cd, 0x140034ce]),
+ }
+ }
+ let object = stored.id;
+ let raw = &active.live.revision;
+ let mut node = PropertyObject::from_object(&raw.objects[&object])?;
+ node.remove(&removed)?;
+ let values: Vec<(u32, &[u8])> = values
+ .iter()
+ .map(|(id, bytes)| (*id, bytes.as_slice()))
+ .collect();
+ node.set(&values)?;
+ Ok(BTreeMap::from([(object, node)]))
+}
+
+/// Creates stroke objects (numbered from `first`) and one drawing-attribute object per
+/// distinct pen; returns the compact references for the data node's stroke list.
+fn write_strokes(
+ changed: &mut Changes,
+ data_object: &mut PropertyObject,
+ strokes: &[(ExGuid, &InkStroke)],
+ first: usize,
+ filetime: u64,
+) -> Result, Error> {
+ let mut styles: Vec<(InkPen, ExGuid)> = Vec::new();
+ let mut references = Vec::new();
+ for (offset, (stroke_id, stroke)) in strokes.iter().enumerate() {
+ let pen = InkPen::of(stroke);
+ let style = match styles.iter().find(|(known, _)| *known == pen) {
+ Some((_, id)) => *id,
+ None => {
+ let id = ExGuid {
+ guid: crate::write::fresh_guid()?,
+ n: 1,
+ };
+ let mut style = PropertyObject {
+ jcid: 0x120048,
+ bytes: crate::create::properties(&pen.values())?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, id.guid)])),
+ };
+ style.reference(id)?;
+ changed.insert(id, style);
+ styles.push((pen, id));
+ id
+ }
+ };
+ let mut object = PropertyObject {
+ jcid: 0x20047,
+ bytes: crate::create::properties(&stroke_values(
+ stroke,
+ (first + offset) as u32 + 1,
+ filetime,
+ )?)?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, stroke_id.guid)])),
+ };
+ object.reference(*stroke_id)?;
+ let style_reference = object.reference(style)?;
+ object.set(&[(0x20003409, &style_reference)])?;
+ changed.insert(*stroke_id, object);
+ references.extend(data_object.reference(*stroke_id)?);
+ }
+ Ok(references)
+}
+
+/// The drawing attributes OneNote shares between strokes drawn with the same pen.
+#[derive(PartialEq)]
+struct InkPen {
+ width: u32,
+ height: u32,
+ color: Option,
+ transparency: Option,
+ pen_tip: Option,
+}
+
+impl InkPen {
+ fn of(stroke: &InkStroke) -> Self {
+ Self {
+ width: (stroke.width * 2540.0 / 72.0).to_bits(),
+ height: (stroke.height * 2540.0 / 72.0).to_bits(),
+ color: stroke.color,
+ transparency: stroke.transparency,
+ pen_tip: stroke.pen_tip,
+ }
+ }
+
+ fn values(&self) -> Values {
+ let mut values: Values = vec![
+ (0x1c00340a, crate::page::ink::DIMENSIONS.to_vec()),
+ (0x1400340c, self.height.to_le_bytes().to_vec()),
+ (0x1400340d, self.width.to_le_bytes().to_vec()),
+ ];
+ if let Some(color) = self.color {
+ values.push((0x1400340f, color.to_le_bytes().to_vec()));
+ }
+ if let Some(transparency) = self.transparency {
+ values.push((0x0c003414, vec![transparency]));
+ }
+ if let Some(tip) = self.pen_tip {
+ values.push((0x0c003412, vec![tip]));
+ }
+ values
+ }
+}
+
+fn stroke_values(stroke: &InkStroke, index: u32, filetime: u64) -> Result {
+ if stroke.points.is_empty() {
+ return Err(invalid("A stroke needs at least one point"));
+ }
+ if stroke
+ .points
+ .iter()
+ .any(|p| !p[0].is_finite() || !p[1].is_finite())
+ || !(stroke.width.is_finite() && stroke.height.is_finite())
+ || stroke.width <= 0.0
+ || stroke.height <= 0.0
+ {
+ return Err(invalid(
+ "Stroke points and pen size must be finite and positive",
+ ));
+ }
+ let left = stroke
+ .points
+ .iter()
+ .map(|p| p[0])
+ .fold(f32::INFINITY, f32::min);
+ let top = stroke
+ .points
+ .iter()
+ .map(|p| p[1])
+ .fold(f32::INFINITY, f32::min);
+ let mut origin = ((left - stroke.width / 2.0) / 36.0).to_le_bytes().to_vec();
+ origin.extend_from_slice(&((top - stroke.height / 2.0) / 36.0).to_le_bytes());
+ Ok(vec![
+ (0x1c00340b, stroke.packet()),
+ (0x14003419, index.to_le_bytes().to_vec()),
+ (0x1000341b, 0x409_u16.to_le_bytes().to_vec()),
+ (0x0c00341c, vec![0]),
+ (0x1c00341a, crate::write::fresh_guid()?.to_vec()),
+ (0x1c00341d, filetime.to_le_bytes().to_vec()),
+ (0x1c00345b, origin),
+ ])
+}
+
+/// New ink as OneNote 2010 stores a drawing: container `id` that the page lists as a child
+/// (or paragraph `holder` holds as content), its data node `data` listing the strokes, each
+/// stroke's packet and half-inch origin, and one drawing-attribute object per distinct pen.
+pub(crate) fn ink_changes(
+ active: &ActivePage<'_>,
+ ink: &Ink,
+ id: ExGuid,
+ data: ExGuid,
+ strokes: &[(ExGuid, &InkStroke)],
+ holder: Option,
+) -> Result {
+ if !ink.groups.is_empty() {
+ return Err(invalid("New ink holds strokes, not nested groups"));
+ }
+ if ink.strokes.is_empty() {
+ return Err(invalid("New ink needs at least one stroke"));
+ }
+ if ink.layout != Default::default() {
+ return Err(invalid("Ink positions come from its strokes"));
+ }
+ let (modified, filetime) = crate::create::current_timestamps()?;
+ let modified = modified.to_le_bytes();
+ let mut changed = BTreeMap::new();
+ let mut data_object = PropertyObject {
+ jcid: 0x2003b,
+ bytes: crate::create::properties(&[])?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, data.guid)])),
+ };
+ data_object.reference(data)?;
+ let references = write_strokes(&mut changed, &mut data_object, strokes, 0, filetime)?;
+ data_object.set(&[(0x24003416, &references)])?;
+ changed.insert(data, data_object);
+ let mut object = PropertyObject {
+ jcid: 0x60014,
+ bytes: crate::create::properties(&[
+ (0x14001d7a, modified.to_vec()),
+ (0x14001d4e, 1u32.to_le_bytes().to_vec()),
+ ])?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, id.guid)])),
+ };
+ object.reference(id)?;
+ let data_reference = object.reference(data)?;
+ object.set(&[(0x20003415, &data_reference)])?;
+ changed.insert(id, object);
+ hold(active, &mut changed, id, holder, &modified)?;
+ Ok(changed)
+}
+
+/// Rewrites a drawing's stroke list: `kept` strokes stay as they are (OneNote erases whole
+/// strokes rather than editing them), the rest leave the list, `added` ones are created.
+pub(crate) fn strokes_changes(
+ active: &ActivePage<'_>,
+ container: ExGuid,
+ kept: &[ExGuid],
+ added: &[(ExGuid, &InkStroke)],
+) -> Result {
+ let data = match active
+ .view
+ .nodes
+ .get(&container)
+ .map(|node| &node.kind)
+ {
+ Some(crate::document::Kind::Ink {
+ data: Some(data), ..
+ }) => *data,
+ _ => return Err(invalid("Stored ink has no stroke data to rewrite")),
+ };
+ let (modified, filetime) = crate::create::current_timestamps()?;
+ let modified = modified.to_le_bytes();
+ let raw = &active.live.revision;
+ let mut changed = BTreeMap::new();
+ let mut data_object = PropertyObject::from_object(&raw.objects[&data])?;
+ let mut references = Vec::new();
+ for id in kept {
+ references.extend(data_object.reference(*id)?);
+ }
+ references.extend(write_strokes(
+ &mut changed,
+ &mut data_object,
+ added,
+ kept.len(),
+ filetime,
+ )?);
+ data_object.set(&[(0x24003416, &references)])?;
+ changed.insert(data, data_object);
+ let mut object = PropertyObject::from_object(&raw.objects[&container])?;
+ object.set(&[(0x14001d7a, &modified)])?;
+ changed.insert(container, object);
+ Ok(changed)
+}
+
+/// An equation as OneNote stores one: the linear text, one run per span with a style
+/// carrying the span's format, the run-data array naming each run's inline object, and
+/// the math language marker on the text object.
+pub(crate) fn equation_changes(
+ active: &ActivePage<'_>,
+ object: ExGuid,
+ text: &Paragraph,
+) -> Result {
+ if text.text().contains('\u{fffc}') {
+ return Err(invalid("Equations cannot hold embedded objects"));
+ }
+ let encoded: Vec = text
+ .text()
+ .encode_utf16()
+ .chain([0])
+ .flat_map(u16::to_le_bytes)
+ .collect();
+ let mut ends = Vec::new();
+ let mut styles: Vec = Vec::new();
+ let mut sets = Vec::new();
+ let all_math = text.spans().iter().all(|s| s.format.math == Some(true));
+ for span in text.spans() {
+ ends.extend(text.utf16_offset(span.end)?.to_le_bytes());
+ styles.push(style_values(&span.format));
+ sets.push(match &span.format.math_object {
+ Some(object) => {
+ let mut set = vec![(0x1400344f, object.kind.to_le_bytes().to_vec())];
+ if let Some(count) = object.arguments {
+ set.push((0x14003450, count.to_le_bytes().to_vec()));
+ }
+ if let Some(columns) = object.columns {
+ set.push((0x0c003451, vec![columns]));
+ }
+ for (id, symbol) in [0x10003453, 0x10003454, 0x10003455]
+ .into_iter()
+ .zip(&object.symbols)
+ {
+ let unit = u16::try_from(u32::from(*symbol))
+ .map_err(|_| invalid("Math symbols are single UTF-16 units"))?;
+ set.push((id, unit.to_le_bytes().to_vec()));
+ }
+ set
+ }
+ None => Vec::new(),
+ });
+ }
+ ends.truncate(ends.len() - 4);
+ let has_objects = sets.iter().any(|set| !set.is_empty());
+ let modified = crate::create::current_timestamps()?.0.to_le_bytes();
+ let raw = &active.live.revision;
+ let mut changed = BTreeMap::new();
+ let mut target = PropertyObject::from_object(&raw.objects[&object])?;
+ let mut references = Vec::new();
+ let mut created: Vec<(Values, ExGuid)> = Vec::new();
+ for values in &styles {
+ let id = match created.iter().find(|(known, _)| known == values) {
+ Some((_, id)) => *id,
+ None => {
+ let id = ExGuid {
+ guid: crate::write::fresh_guid()?,
+ n: 1,
+ };
+ let mut style = PropertyObject {
+ jcid: 0x12004d,
+ bytes: crate::create::properties(values)?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, id.guid)])),
+ };
+ style.reference(id)?;
+ changed.insert(id, style);
+ created.push((values.clone(), id));
+ id
+ }
+ };
+ references.extend(target.reference(id)?);
+ }
+ target.remove(&[0x1c003498, 0x40003499])?;
+ target.set(&[
+ (0x1c001c22, &encoded),
+ (0x1c001e12, &ends),
+ (0x24001e13, &references),
+ (0x14001d7a, &modified),
+ ])?;
+ if has_objects {
+ target.set_sets(0x40003499, 0x44000811, &sets)?;
+ }
+ if all_math {
+ // The flags and language marker OneNote's equation editor leaves on every equation
+ // text object.
+ target.set(&[
+ (0x10001cfe, &0x7f_u16.to_le_bytes()),
+ (0x14001c3e, &1u32.to_le_bytes()),
+ (0x14001c84, &1u32.to_le_bytes()),
+ ])?;
+ }
+ changed.insert(object, target);
+ Ok(changed)
+}
diff --git a/crates/onestore/src/op/levels.rs b/crates/onestore/src/op/levels.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4143bed29890b99348f68feec990d63a6e3f56c3
--- /dev/null
+++ b/crates/onestore/src/op/levels.rs
@@ -0,0 +1,143 @@
+//! Outline levels: OneNote stores a container's children at its child level and nests each
+//! run of deeper paragraphs in an outline group adding the rest
+//! (`evidence/structural-edits/xml/c6-first-tab.xml`, MS-ONE 2.2.22).
+
+use crate::{
+ Error, ExGuid,
+ active::{ActivePage, Changes},
+ document::{Kind, Revision},
+ write::PropertyObject,
+};
+use std::collections::BTreeMap;
+
+fn invalid(message: &'static str) -> Error {
+ Error { offset: 0, message }
+}
+
+/// The children of `container` with its outline groups lifted into it, in order.
+pub(crate) fn flat_children(view: &Revision<'_>, container: ExGuid) -> Vec {
+ fn flat(view: &Revision<'_>, id: ExGuid, out: &mut Vec) {
+ for child in &view.nodes[&id].children {
+ match view.nodes[child].kind {
+ Kind::OutlineGroup => flat(view, *child, out),
+ _ => out.push(*child),
+ }
+ }
+ }
+ let mut children = Vec::new();
+ flat(view, container, &mut children);
+ children
+}
+
+/// How much deeper than `container` each of its children lies, groups lifted.
+pub(crate) fn stored_depths(view: &Revision<'_>, container: ExGuid) -> Vec<(ExGuid, u32)> {
+ fn walk(view: &Revision<'_>, id: ExGuid, base: u32, out: &mut Vec<(ExGuid, u32)>) {
+ let node = &view.nodes[&id];
+ let depth = base + u32::from(node.child_level.unwrap_or(0));
+ for child in &node.children {
+ match view.nodes[child].kind {
+ Kind::OutlineGroup => walk(view, *child, depth, out),
+ _ => out.push((*child, depth)),
+ }
+ }
+ }
+ let mut out = Vec::new();
+ walk(view, container, 0, &mut out);
+ out
+}
+
+/// Lifts the children of `container`'s outline groups into it.
+pub(crate) fn ungroup_changes(active: &ActivePage<'_>, container: ExGuid) -> Result {
+ let children = flat_children(&active.view, container);
+ let parents = active.editable_parents(container)?;
+ let modified = crate::create::current_timestamps()?.0.to_le_bytes();
+ let raw = &active.live.revision;
+ let mut holder = PropertyObject::from_object(&raw.objects[&container])?;
+ let mut references = Vec::new();
+ for child in children {
+ references.extend(holder.reference(child)?);
+ }
+ holder.set(&[(0x24001c20, &references), (0x14001d7a, &modified)])?;
+ let mut changed = BTreeMap::from([(container, holder)]);
+ crate::formatting::touch_ancestors(raw, parents, container, &modified, &mut changed)?;
+ Ok(changed)
+}
+
+/// Children in runs: one child at the container's child level, or a run sharing a deeper
+/// depth.
+pub(crate) type Runs = Vec<(u32, Vec)>;
+
+/// The child level of a container whose children lie `depths` deeper than it, and its
+/// children in runs.
+pub(crate) fn runs(children: &[ExGuid], depths: &[u32], is_cell: bool) -> Result<(u32, Runs), Error> {
+ let level = *depths
+ .iter()
+ .min()
+ .ok_or_else(|| invalid("A container needs a child"))?;
+ if !(1..=31).contains(&level) || depths.iter().any(|depth| *depth > level + 31) {
+ return Err(invalid(
+ "Outline levels lie 1 to 31 deeper than their parent",
+ ));
+ }
+ if is_cell && depths.iter().any(|depth| *depth != level) {
+ return Err(invalid("Table cells hold no outline groups"));
+ }
+ let mut runs: Runs = Vec::new();
+ for (id, depth) in children.iter().zip(depths) {
+ match runs.last_mut() {
+ Some((last, ids)) if *last == *depth && *depth != level => ids.push(*id),
+ _ => runs.push((*depth, vec![*id])),
+ }
+ }
+ Ok((level, runs))
+}
+
+/// Stores `container`'s children as `runs` below child level `level`, each deeper run in a
+/// new outline group.
+pub(crate) fn regroup_changes(
+ active: &ActivePage<'_>,
+ container: ExGuid,
+ level: u32,
+ runs: &[(u32, Vec)],
+) -> Result {
+ let parents = active.editable_parents(container)?;
+ let modified = crate::create::current_timestamps()?.0.to_le_bytes();
+ let raw = &active.live.revision;
+ let mut holder = PropertyObject::from_object(&raw.objects[&container])?;
+ let mut changed = BTreeMap::new();
+ let mut references = Vec::new();
+ for (depth, ids) in runs {
+ if *depth == level {
+ references.extend(holder.reference(ids[0])?);
+ continue;
+ }
+ let id = ExGuid {
+ guid: crate::write::fresh_guid()?,
+ n: 1,
+ };
+ let mut group = PropertyObject {
+ jcid: 0x60019,
+ bytes: crate::create::properties(&[
+ (0x14001d7a, modified.to_vec()),
+ (0x0c001c03, vec![(depth - level) as u8]),
+ ])?,
+ global_ids: std::sync::Arc::new(BTreeMap::from([(0, id.guid)])),
+ };
+ let mut members = Vec::new();
+ for member in ids {
+ members.extend(group.reference(*member)?);
+ }
+ group.set(&[(0x24001c20, &members)])?;
+ group.reference(id)?;
+ changed.insert(id, group);
+ references.extend(holder.reference(id)?);
+ }
+ holder.set(&[
+ (0x24001c20, &references),
+ (0x0c001c03, &[level as u8]),
+ (0x14001d7a, &modified),
+ ])?;
+ changed.insert(container, holder);
+ crate::formatting::touch_ancestors(raw, parents, container, &modified, &mut changed)?;
+ Ok(changed)
+}
diff --git a/crates/onestore/src/op/lower.rs b/crates/onestore/src/op/lower.rs
new file mode 100644
index 0000000000000000000000000000000000000000..207d77184efdcc5bb74d52be412be1e333f8cb9d
--- /dev/null
+++ b/crates/onestore/src/op/lower.rs
@@ -0,0 +1,1778 @@
+//! The ops that turn one page model into another, computed from the models alone: each op
+//! is interpreted on a prediction of the page (`model::apply`) so later ones see what earlier
+//! ones leave, as the typed writers would store it.
+
+use super::{PageOp, TableEdit, TextProperty, Values, model};
+use crate::{
+ Error, ExGuid, TextAttribute,
+ document::{Format, Kind, Tag},
+ page::{
+ Definition, Outline, Page, PageObject, PageParagraph, Paragraph, ParagraphContent, Table,
+ TableCell, TextObject, text::new_id,
+ },
+};
+use std::{
+ collections::{BTreeMap, BTreeSet},
+ ops::Range,
+};
+
+fn invalid(message: &'static str) -> Error {
+ Error { offset: 0, message }
+}
+
+/// The ops that turn `before`, a page as stored, into `after`.
+pub fn lower_page(before: &Page, after: &Page) -> Result, Error> {
+ let old = View::new(before, false)?;
+ let new = View::new(after, false)?;
+ Lowering::new(before.clone(), None).run(before, after, &old, &new)
+}
+
+/// The ops that replace `before`, consecutive paragraphs of outline or table cell
+/// `container` with their parents listed first or outside the range, by `after`. `next`
+/// is the paragraph following the range; `definitions` holds the lists, tags and styles
+/// the paragraphs reference. Only the paragraphs given are read.
+pub fn lower(
+ container: ExGuid,
+ before: &[PageParagraph],
+ after: &[PageParagraph],
+ next: Option<&PageParagraph>,
+ definitions: &BTreeMap,
+) -> Result, Error> {
+ let page = |paragraphs: &[PageParagraph]| Page {
+ title: String::new(),
+ identity: None,
+ created: None,
+ margin_origin: [0.0; 2],
+ objects: vec![PageObject::Outline(Outline {
+ id: container,
+ title: false,
+ min_width: None,
+ layout: Default::default(),
+ indents: Vec::new(),
+ paragraphs: paragraphs.to_vec(),
+ unsupported: Vec::new(),
+ })],
+ definitions: definitions.clone(),
+ };
+ let (before, after) = (page(before), page(after));
+ let old = View::new(&before, true)?;
+ let new = View::new(&after, true)?;
+ let tail = next.map(|next| (next.parent.unwrap_or(container), next.id));
+ Lowering::new(before.clone(), tail).run(&before, &after, &old, &new)
+}
+
+/// Direct children of every container, in model order, plus lookups by identity.
+pub(crate) struct View<'a> {
+ pub page: &'a Page,
+ pub outlines: BTreeMap,
+ /// Outlines owned by a title object rather than the page.
+ pub title_outlines: BTreeSet,
+ pub paragraphs: BTreeMap,
+ pub children: BTreeMap>,
+ pub container: BTreeMap,
+ pub page_children: Vec,
+ /// Containers a partial model names as parents without holding them, in order.
+ pub external: Vec,
+ partial: bool,
+}
+
+impl<'a> View<'a> {
+ /// `partial` accepts parents outside the model, as a range of paragraphs has.
+ pub(crate) fn new(page: &'a Page, partial: bool) -> Result {
+ let mut view = Self {
+ page,
+ outlines: BTreeMap::new(),
+ title_outlines: BTreeSet::new(),
+ paragraphs: BTreeMap::new(),
+ children: BTreeMap::new(),
+ container: BTreeMap::new(),
+ page_children: Vec::new(),
+ external: Vec::new(),
+ partial,
+ };
+ for object in &page.objects {
+ view.page_children.push(object.id());
+ match object {
+ PageObject::Outline(outline) => view.outline(outline)?,
+ PageObject::Title(title) => {
+ for outline in &title.outlines {
+ view.title_outlines.insert(outline.id);
+ view.outline(outline)?;
+ }
+ }
+ PageObject::Image(_) | PageObject::Ink(_) | PageObject::Unsupported(_) => {}
+ }
+ }
+ Ok(view)
+ }
+
+ fn outline(&mut self, outline: &'a Outline) -> Result<(), Error> {
+ if self.outlines.insert(outline.id, outline).is_some() {
+ return Err(invalid("The page model repeats an outline identity"));
+ }
+ self.children.entry(outline.id).or_default();
+ self.paragraphs_of(outline.id, &outline.paragraphs)
+ }
+
+ fn paragraphs_of(&mut self, root: ExGuid, list: &'a [PageParagraph]) -> Result<(), Error> {
+ let listed: BTreeSet = if self.partial {
+ list.iter().map(|p| p.id).collect()
+ } else {
+ BTreeSet::new()
+ };
+ for paragraph in list {
+ let container = paragraph.parent.unwrap_or(root);
+ if let Some(parent) = paragraph.parent
+ && !self.paragraphs.contains_key(&parent)
+ {
+ if !self.partial || listed.contains(&parent) {
+ return Err(invalid(
+ "A paragraph's parent must precede it in its container",
+ ));
+ }
+ if !self.external.contains(&parent) {
+ self.external.push(parent);
+ }
+ }
+ if self.paragraphs.insert(paragraph.id, paragraph).is_some() {
+ return Err(invalid("The page model repeats a paragraph identity"));
+ }
+ self.children
+ .entry(container)
+ .or_default()
+ .push(paragraph.id);
+ self.children.entry(paragraph.id).or_default();
+ self.container.insert(paragraph.id, container);
+ if let ParagraphContent::Table(table) = ¶graph.content {
+ for row in &table.rows {
+ for cell in &row.cells {
+ if self.children.contains_key(&cell.id) {
+ return Err(invalid("The page model repeats a cell identity"));
+ }
+ self.children.entry(cell.id).or_default();
+ self.paragraphs_of(cell.id, &cell.paragraphs)?;
+ }
+ }
+ }
+ }
+ Ok(())
+ }
+
+ pub(crate) fn text(&self, paragraph: ExGuid) -> Option<&'a TextObject> {
+ self.paragraphs.get(¶graph).and_then(|p| p.text())
+ }
+
+ /// How much deeper than `container` each of its children lies: their outline levels
+ /// less the paragraph's, or less nothing in an outline or cell.
+ pub(crate) fn depths(&self, container: ExGuid, children: &[ExGuid]) -> Option> {
+ let base = self.paragraphs.get(&container).map_or(0, |p| p.level);
+ children
+ .iter()
+ .map(|id| self.paragraphs.get(id)?.level.checked_sub(base))
+ .collect()
+ }
+
+ /// Each outline's paragraphs in document order, a table's cells following its paragraph.
+ pub(crate) fn documents(&self) -> impl Iterator
- > + '_ {
+ fn walk<'a>(list: &'a [PageParagraph], out: &mut Vec<&'a PageParagraph>) {
+ for paragraph in list {
+ out.push(paragraph);
+ if let ParagraphContent::Table(table) = ¶graph.content {
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ walk(&cell.paragraphs, out);
+ }
+ }
+ }
+ }
+ self.outlines.values().map(|outline| {
+ let mut out = Vec::new();
+ walk(&outline.paragraphs, &mut out);
+ out
+ })
+ }
+
+ /// Every container in document order: outlines, external parents, paragraphs and cells.
+ fn containers(&self) -> Vec {
+ let mut containers = Vec::new();
+ for object in &self.page.objects {
+ let outlines: Vec<&Outline> = match object {
+ PageObject::Outline(outline) => vec![outline],
+ PageObject::Title(title) => title.outlines.iter().collect(),
+ PageObject::Image(_) | PageObject::Ink(_) | PageObject::Unsupported(_) => {
+ Vec::new()
+ }
+ };
+ for outline in outlines {
+ containers.push(outline.id);
+ containers.extend(&self.external);
+ collect_containers(&outline.paragraphs, &mut containers);
+ }
+ }
+ containers
+ }
+}
+
+pub(crate) fn collect_containers(list: &[PageParagraph], out: &mut Vec) {
+ for paragraph in list {
+ out.push(paragraph.id);
+ if let ParagraphContent::Table(table) = ¶graph.content {
+ for row in &table.rows {
+ for cell in &row.cells {
+ out.push(cell.id);
+ collect_containers(&cell.paragraphs, out);
+ }
+ }
+ }
+ }
+}
+
+/// What the writers keep as stored, checked before any op: titles, unsupported objects,
+/// definitions other than lists and tags, outline roles, paragraph styles and formats,
+/// recording links, fields and content types.
+pub(crate) fn validate(
+ before: &Page,
+ after: &Page,
+ old: &View<'_>,
+ new: &View<'_>,
+) -> Result<(), Error> {
+ if after.created != before.created || after.margin_origin != before.margin_origin {
+ return Err(invalid("Page creation time and margins cannot be edited"));
+ }
+ for (id, definition) in &after.definitions {
+ if before
+ .definitions
+ .get(id)
+ .is_some_and(|stored| stored != definition)
+ && !matches!(
+ definition.kind,
+ Kind::List { .. } | Kind::TagDefinition { .. }
+ )
+ {
+ return Err(invalid("Style definitions cannot be edited"));
+ }
+ }
+ for paragraph in new.paragraphs.values() {
+ if let ParagraphContent::Table(table) = ¶graph.content {
+ super::table::validate_table(table)?;
+ }
+ }
+ let fixed = |page: &Page| -> Vec {
+ let mut fixed: Vec = page
+ .objects
+ .iter()
+ .filter_map(|object| match object {
+ PageObject::Unsupported(unsupported) => Some(format!("{unsupported:?}")),
+ PageObject::Title(title) => Some(format!(
+ "{:?} {:?} {:?} {:?}",
+ title.id,
+ title.date,
+ title.layout,
+ title.outlines.iter().map(|o| o.id).collect::>()
+ )),
+ PageObject::Outline(_) | PageObject::Image(_) | PageObject::Ink(_) => None,
+ })
+ .collect();
+ fixed.sort();
+ fixed
+ };
+ if fixed(before) != fixed(after) {
+ return Err(invalid(
+ "Titles and unsupported objects cannot be edited through the page model",
+ ));
+ }
+ for (id, outline) in &new.outlines {
+ if outline.paragraphs.is_empty() {
+ return Err(invalid(
+ "An outline needs a paragraph; remove the outline instead",
+ ));
+ }
+ let Some(previous) = old.outlines.get(id) else {
+ continue;
+ };
+ let same = outline.title == previous.title
+ && outline.min_width == previous.min_width
+ && outline.indents == previous.indents
+ && outline.unsupported == previous.unsupported
+ && (!new.title_outlines.contains(id) || outline.layout == previous.layout);
+ if !same {
+ return Err(invalid(
+ "Outline roles, indentation tables and title geometry cannot be edited",
+ ));
+ }
+ }
+ let owners: BTreeMap = old
+ .paragraphs
+ .values()
+ .filter_map(|owner| Some((owner.text()?.id, *owner)))
+ .collect();
+ for (id, paragraph) in &new.paragraphs {
+ let Some(previous) = old.paragraphs.get(id) else {
+ continue;
+ };
+ // A join moves a text object, with its style and recording link, into an emptied
+ // paragraph; one new to the page starts as a copy without the link.
+ let owner = paragraph.text().map(|text| owners.get(&text.id));
+ let (style, media) = match owner {
+ Some(Some(owner)) => (owner.style, owner.media.clone()),
+ Some(None) => (paragraph.style, Default::default()),
+ None => (previous.style, previous.media.clone()),
+ };
+ if paragraph.media != media {
+ return Err(invalid("Recording annotations cannot be edited"));
+ }
+ if paragraph.style != style || paragraph.format != previous.format {
+ return Err(invalid(
+ "Paragraph styles and paragraph formatting cannot be edited",
+ ));
+ }
+ match (¶graph.content, &previous.content) {
+ (ParagraphContent::Text(text), ParagraphContent::Text(previous)) => {
+ if text.date_field != previous.date_field {
+ return Err(invalid("Text fields cannot be edited"));
+ }
+ }
+ (ParagraphContent::Table(table), ParagraphContent::Table(previous)) => {
+ if table.id != previous.id
+ || table.layout != previous.layout
+ || table.tags != previous.tags
+ {
+ return Err(invalid("Table identity, layout and tags cannot be edited"));
+ }
+ let cells: BTreeMap = previous
+ .rows
+ .iter()
+ .flat_map(|row| &row.cells)
+ .map(|cell| (cell.id, cell))
+ .collect();
+ let unchanged_cells = table.rows.iter().flat_map(|row| &row.cells).all(|cell| {
+ cells.get(&cell.id).is_none_or(|before| {
+ cell.layout == before.layout && cell.unsupported == before.unsupported
+ })
+ });
+ if !unchanged_cells {
+ return Err(invalid("Cell layout cannot be edited"));
+ }
+ }
+ (ParagraphContent::Unsupported(a), ParagraphContent::Unsupported(b)) if a == b => {}
+ (ParagraphContent::Ink(a), ParagraphContent::Ink(b)) => {
+ if a.id != b.id {
+ return Err(invalid("Ink identity cannot change"));
+ }
+ }
+ (ParagraphContent::Image(a), ParagraphContent::Image(b)) => {
+ super::content::picture_fixed_fields(a, b)?;
+ if (a.layout.x, a.layout.y) != (b.layout.x, b.layout.y) {
+ return Err(invalid("A paragraph picture has no position of its own"));
+ }
+ }
+ (ParagraphContent::Attachment(a), ParagraphContent::Attachment(b)) => {
+ if a.id != b.id {
+ return Err(invalid("Attachment identity cannot change"));
+ }
+ }
+ _ => return Err(invalid("Paragraph content type cannot change")),
+ }
+ }
+ Ok(())
+}
+
+/// Identities that keep their stored position: a longest increasing run of survivors,
+/// always including immovable ones. `after` may contain identities absent from `before`.
+pub(crate) fn kept_set(
+ before: &[ExGuid],
+ after: &[ExGuid],
+ movable: impl Fn(ExGuid) -> bool,
+) -> Result, Error> {
+ let position: BTreeMap =
+ after.iter().enumerate().map(|(i, id)| (*id, i)).collect();
+ let sequence: Vec<(ExGuid, usize)> = before
+ .iter()
+ .filter_map(|id| position.get(id).map(|at| (*id, *at)))
+ .collect();
+ let fixed: Vec = sequence
+ .iter()
+ .filter(|(id, _)| !movable(*id))
+ .map(|(_, at)| *at)
+ .collect();
+ if fixed.windows(2).any(|w| w[0] > w[1]) {
+ return Err(invalid(
+ "Images and unsupported objects cannot be reordered",
+ ));
+ }
+ if sequence.windows(2).all(|pair| pair[0].1 < pair[1].1) {
+ return Ok(sequence.into_iter().map(|(id, _)| id).collect());
+ }
+ // Longest increasing subsequence over `after` positions, forced through immovable items.
+ let n = sequence.len();
+ let mut best = vec![1usize; n];
+ let mut previous = vec![usize::MAX; n];
+ for i in 0..n {
+ let (id, at) = sequence[i];
+ let mandatory_before = sequence[..i]
+ .iter()
+ .filter(|(other, _)| !movable(*other))
+ .map(|(_, at)| *at)
+ .max();
+ if movable(id) && mandatory_before.is_some_and(|m| m > at) {
+ best[i] = 0;
+ continue;
+ }
+ let mandatory_after = sequence[i + 1..]
+ .iter()
+ .filter(|(other, _)| !movable(*other))
+ .map(|(_, at)| *at)
+ .min();
+ if movable(id) && mandatory_after.is_some_and(|m| m < at) {
+ best[i] = 0;
+ continue;
+ }
+ for j in 0..i {
+ if best[j] > 0 && sequence[j].1 < at && best[j] + 1 > best[i] {
+ best[i] = best[j] + 1;
+ previous[i] = j;
+ }
+ }
+ }
+ let mut kept = BTreeSet::new();
+ if let Some((mut i, _)) = best
+ .iter()
+ .enumerate()
+ .max_by_key(|(i, b)| (**b, usize::MAX - i))
+ && best[i] > 0
+ {
+ loop {
+ kept.insert(sequence[i].0);
+ if previous[i] == usize::MAX {
+ break;
+ }
+ i = previous[i];
+ }
+ }
+ for (id, _) in &sequence {
+ if !movable(*id) && !kept.contains(id) {
+ return Err(invalid(
+ "Images and unsupported objects cannot be reordered",
+ ));
+ }
+ }
+ Ok(kept)
+}
+
+/// The format of the span containing the UTF-16 position `at` (the following span at a
+/// boundary, the last at the end), which text inserted there takes.
+pub(crate) fn format_in(paragraph: &Paragraph, at: u32) -> Result<&Format, Error> {
+ let byte = paragraph.byte_offset(at)?;
+ let spans = paragraph.spans();
+ let index = spans
+ .partition_point(|span| span.end <= byte)
+ .min(spans.len() - 1);
+ Ok(&spans[index].format)
+}
+
+/// The smallest UTF-16 range whose replacement turns `before` into `after`.
+pub(crate) fn text_edit(before: &str, after: &str) -> Result<(Range, String), Error> {
+ let prefix = before
+ .char_indices()
+ .zip(after.chars())
+ .take_while(|((_, a), b)| a == b)
+ .map(|((i, a), _)| i + a.len_utf8())
+ .last()
+ .unwrap_or(0);
+ let suffix = before[prefix..]
+ .chars()
+ .rev()
+ .zip(after[prefix..].chars().rev())
+ .take_while(|(a, b)| a == b)
+ .map(|(a, _)| a.len_utf8())
+ .sum::();
+ let units = |s: &str| -> Result {
+ u32::try_from(s.encode_utf16().count())
+ .map_err(|_| invalid("Text exceeds UTF-16 offset range"))
+ };
+ let start = units(&before[..prefix])?;
+ let end = start + units(&before[prefix..before.len() - suffix])?;
+ Ok((start..end, after[prefix..after.len() - suffix].to_owned()))
+}
+
+/// A character-format change over a range: attributes to set and properties to clear.
+pub(crate) type FormatEdit = (Range, Vec, Vec);
+
+/// The format edits turning `stored`'s spans into `target`'s, which has the same text. A
+/// `fresh` text object was created by this edit, so an unset language keeps the writer's.
+pub(crate) fn format_edits(
+ stored: &Paragraph,
+ target: &Paragraph,
+ fresh: bool,
+) -> Result, Error> {
+ let mut boundaries = BTreeSet::new();
+ for paragraph in [stored, target] {
+ for span in paragraph.spans() {
+ boundaries.insert(paragraph.utf16_offset(span.end)?);
+ }
+ }
+ boundaries.insert(0);
+ let boundaries: Vec = boundaries.into_iter().collect();
+ let mut pending: Option = None;
+ let mut edits = Vec::new();
+ for window in boundaries.windows(2) {
+ let (start, end) = (window[0], window[1]);
+ if start == end {
+ continue;
+ }
+ let (set, clear) = attributes(format_in(stored, start)?, format_in(target, start)?, fresh)?;
+ match &mut pending {
+ Some((range, previous_set, previous_clear))
+ if *previous_set == set && *previous_clear == clear && range.end == start =>
+ {
+ range.end = end;
+ }
+ _ => {
+ if let Some(edit) = pending.take() {
+ edits.push(edit);
+ }
+ pending = Some((start..end, set, clear));
+ }
+ }
+ }
+ edits.extend(pending);
+ if target.text().is_empty() {
+ let (set, clear) = attributes(format_in(stored, 0)?, format_in(target, 0)?, fresh)?;
+ edits.push((0..0, set, clear));
+ }
+ edits.retain(|(_, set, clear)| !set.is_empty() || !clear.is_empty());
+ Ok(edits)
+}
+
+/// The change turning `current` into `target`; unsupported differences are errors. A value the
+/// target leaves unset is cleared from the run, as the model's formats are complete.
+fn attributes(
+ current: &Format,
+ target: &Format,
+ fresh: bool,
+) -> Result<(Vec, Vec), Error> {
+ let mut out = Vec::new();
+ let mut cleared = Vec::new();
+ macro_rules! boolean {
+ ($field:ident, $variant:ident) => {
+ match target.$field {
+ Some(value) if current.$field != Some(value) => {
+ out.push(TextAttribute::$variant(value))
+ }
+ None if current.$field.is_some() => cleared.push(TextProperty::$variant),
+ _ => {}
+ }
+ };
+ }
+ boolean!(bold, Bold);
+ boolean!(italic, Italic);
+ boolean!(underline, Underline);
+ boolean!(strike, Strike);
+ boolean!(superscript, Superscript);
+ boolean!(subscript, Subscript);
+ boolean!(hidden, Hidden);
+ boolean!(hyperlink, Hyperlink);
+ boolean!(hyperlink_label, HyperlinkLabel);
+ boolean!(math, Math);
+ macro_rules! value {
+ ($field:ident, $property:ident, $attribute:expr) => {
+ if current.$field != target.$field {
+ match &target.$field {
+ Some(value) => out.push($attribute(value)),
+ None => cleared.push(TextProperty::$property),
+ }
+ }
+ };
+ }
+ let color =
+ |value: u32| (value != 0xff000000).then(|| value.to_le_bytes()[..3].try_into().unwrap());
+ value!(font, Font, |font: &String| TextAttribute::Font(font.clone()));
+ value!(font_size, FontSize, |size: &f32| TextAttribute::FontSize(
+ *size
+ ));
+ value!(color, Color, |value: &u32| TextAttribute::Color(color(
+ *value
+ )));
+ value!(highlight, Highlight, |value: &u32| {
+ TextAttribute::Highlight(color(*value))
+ });
+ if current.language != target.language {
+ match target.language {
+ Some(language) => out.push(TextAttribute::Language(language)),
+ None if fresh => {}
+ None => {
+ return Err(invalid("Inherited character formatting cannot be restored"));
+ }
+ }
+ }
+ // An absent value and its stored default are the same formatting.
+ let flag = |a: Option, b: Option| a.unwrap_or(false) == b.unwrap_or(false);
+ let points = |a: Option, b: Option| a.unwrap_or(0.0) == b.unwrap_or(0.0);
+ let same_rest = flag(current.embedded_object, target.embedded_object)
+ && current.alignment.unwrap_or(0) == target.alignment.unwrap_or(0)
+ && flag(current.rtl, target.rtl)
+ && points(current.space_before, target.space_before)
+ && points(current.space_after, target.space_after)
+ && points(current.line_spacing, target.line_spacing)
+ && points(current.list_spacing, target.list_spacing);
+ if !same_rest {
+ return Err(invalid(
+ "Fields and paragraph spacing cannot be edited through the page model",
+ ));
+ }
+ Ok((out, cleared))
+}
+
+/// Paragraph formatting a text object stores: alignment, direction, spacing and language.
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub(crate) struct ParagraphFields {
+ pub alignment: Option,
+ pub rtl: Option,
+ pub space_before: Option,
+ pub space_after: Option,
+ pub line_spacing: Option,
+ pub language: Option,
+}
+
+impl ParagraphFields {
+ pub(crate) fn values(&self) -> Result {
+ super::properties::paragraph_values(
+ self.alignment,
+ self.rtl,
+ self.space_before,
+ self.space_after,
+ self.line_spacing,
+ self.language,
+ )
+ }
+}
+
+/// The paragraph formatting `target` sets throughout that `stored` lacks somewhere.
+pub(crate) fn paragraph_fields(
+ stored: &Paragraph,
+ target: &Paragraph,
+) -> Result {
+ let first = format_in(target, 0)?;
+ macro_rules! field {
+ ($field:ident) => {{
+ let value = first.$field.unwrap_or_default();
+ (target
+ .spans()
+ .iter()
+ .all(|span| span.format.$field.unwrap_or_default() == value)
+ && stored
+ .spans()
+ .iter()
+ .any(|span| span.format.$field.unwrap_or_default() != value))
+ .then_some(value)
+ }};
+ }
+ Ok(ParagraphFields {
+ alignment: field!(alignment),
+ rtl: field!(rtl),
+ space_before: field!(space_before),
+ space_after: field!(space_after),
+ line_spacing: field!(line_spacing),
+ language: field!(language),
+ })
+}
+
+/// `paragraph_fields` encoded, as the page writer stores them.
+pub(crate) fn paragraph_change(stored: &Paragraph, target: &Paragraph) -> Result {
+ paragraph_fields(stored, target)?.values()
+}
+
+/// Whether two tag lists store the same tags.
+pub(crate) fn same_tags(a: &[Tag], b: &[Tag]) -> bool {
+ let key = |t: &Tag| {
+ (
+ t.definition,
+ t.action_type,
+ t.status,
+ t.created,
+ t.completed,
+ t.start,
+ t.due,
+ t.task_id,
+ )
+ };
+ a.len() == b.len() && a.iter().zip(b).all(|(x, y)| key(x) == key(y))
+}
+
+/// Whether the writers can split or join this text: ordinary text without generated fields,
+/// equations or embedded objects.
+fn ordinary(text: &TextObject) -> bool {
+ text.date_field.is_none()
+ && !text.text.text().contains('\u{fffc}')
+ && text.text.spans().iter().all(|span| {
+ span.format.math != Some(true) && span.format.embedded_object != Some(true)
+ })
+}
+
+/// Whether a split at `offset` would divide a hyperlink, which the writer refuses.
+fn divides_link(text: &Paragraph, offset: u32) -> Result {
+ let byte = text.byte_offset(offset)?;
+ let link = |span: &crate::page::text::Span| span.format.hyperlink == Some(true);
+ let spans = text.spans();
+ let mut start = 0;
+ for (i, span) in spans.iter().enumerate() {
+ if start < byte && byte < span.end {
+ return Ok(link(span));
+ }
+ if byte == span.end && byte > 0 && i + 1 < spans.len() {
+ let next = &spans[i + 1];
+ return Ok(link(span) && link(next) && !text.text()[byte..].starts_with('\u{fddf}'));
+ }
+ start = span.end;
+ }
+ Ok(false)
+}
+
+/// A paragraph as `Insert` and `Add` create it: structure and content, without the
+/// properties their own ops set.
+fn bare(paragraph: &PageParagraph) -> PageParagraph {
+ let mut stripped = paragraph.clone();
+ stripped.style = None;
+ stripped.lists.clear();
+ stripped.tags.clear();
+ stripped.collapsed = false;
+ match &mut stripped.content {
+ ParagraphContent::Text(text) => text.tags.clear(),
+ ParagraphContent::Table(table) => {
+ for cell in table.rows.iter_mut().flat_map(|row| &mut row.cells) {
+ cell.paragraphs = cell.paragraphs.iter().map(bare).collect();
+ }
+ }
+ _ => {}
+ }
+ stripped
+}
+
+fn bare_cells(cells: &[TableCell]) -> Vec {
+ cells
+ .iter()
+ .map(|cell| TableCell {
+ paragraphs: cell.paragraphs.iter().map(bare).collect(),
+ ..cell.clone()
+ })
+ .collect()
+}
+
+struct Lowering {
+ ops: Vec,
+ /// The page as the ops so far leave it.
+ current: Page,
+ /// The paragraph after a partial model's range: its container and identity.
+ tail: Option<(ExGuid, ExGuid)>,
+ /// Paragraphs and text objects the ops so far created.
+ created: BTreeSet,
+}
+
+impl Lowering {
+ fn new(current: Page, tail: Option<(ExGuid, ExGuid)>) -> Self {
+ Self {
+ ops: Vec::new(),
+ current,
+ tail,
+ created: BTreeSet::new(),
+ }
+ }
+
+ fn emit(&mut self, op: PageOp) -> Result<(), Error> {
+ model::apply(&mut self.current, &op)?;
+ self.ops.push(op);
+ Ok(())
+ }
+
+ /// Whether the page, as the ops so far leave it, holds `id` as a paragraph, text,
+ /// list node or table part.
+ fn holds(&self, id: ExGuid) -> bool {
+ model::holds(&self.current, id)
+ }
+
+ fn run(
+ mut self,
+ before: &Page,
+ after: &Page,
+ old: &View<'_>,
+ new: &View<'_>,
+ ) -> Result, Error> {
+ validate(before, after, old, new)?;
+ let mut placed: BTreeMap> = old.children.clone();
+ let mut consumed = BTreeSet::new();
+ self.split_and_join(old, new, &mut placed, &mut consumed)?;
+ self.place_page(old, new)?;
+ self.place(old, new, &placed)?;
+ self.delete(old, new, &consumed)?;
+ self.levels(new)?;
+ self.equations(new)?;
+ self.text(new)?;
+ self.styles(after, new)?;
+ self.lists(after, new)?;
+ self.tags(after, new)?;
+ self.paragraph_formatting(new)?;
+ self.formatting(old, new)?;
+ self.layout(old, new)?;
+ Ok(self.ops)
+ }
+
+ /// Splits and joins stored paragraphs as OneNote's Enter, Backspace and Delete do.
+ fn split_and_join(
+ &mut self,
+ old: &View<'_>,
+ new: &View<'_>,
+ placed: &mut BTreeMap>,
+ consumed: &mut BTreeSet,
+ ) -> Result<(), Error> {
+ // A new paragraph may be split from the stored paragraph nearest before it, whatever
+ // placement or pasted paragraphs the same edit adds between them.
+ let mut splits = Vec::new();
+ for document in new.documents() {
+ let mut left = None;
+ for paragraph in document {
+ if old.paragraphs.contains_key(¶graph.id) {
+ left = paragraph.text().is_some().then_some(paragraph.id);
+ } else if let Some(left) = left {
+ let container = new.container[¶graph.id];
+ let at = new.children[&container]
+ .iter()
+ .position(|id| *id == paragraph.id);
+ splits.push(((container, at), left, paragraph.id));
+ }
+ }
+ }
+ splits.sort();
+ let mut split = BTreeSet::new();
+ for (_, left, right) in splits {
+ let (Some(previous), Some(after), Some(next)) =
+ (old.text(left), new.text(left), new.text(right))
+ else {
+ continue;
+ };
+ if split.contains(&left)
+ || after.id != previous.id
+ || new.paragraphs[&right].style != old.paragraphs[&left].style
+ || !ordinary(previous)
+ || old.title_outlines.contains(&root(old, left))
+ {
+ continue;
+ }
+ let Ok(offset) = after.text.utf16_offset(after.text.text().len()) else {
+ continue;
+ };
+ let length = previous.text.utf16_offset(previous.text.text().len())?;
+ // Splitting at the end only differs from appending a paragraph by the copied
+ // paragraph style; without one, an appended empty paragraph is an insertion.
+ if offset == length && new.paragraphs[&right].style.is_none() {
+ continue;
+ }
+ let (Ok(head), Ok(tail)) = (
+ previous.text.slice(0..offset),
+ previous.text.slice(offset..length),
+ ) else {
+ continue;
+ };
+ // An emptied side takes the writer's insertion style, so only its text must agree.
+ let same = |expected: &Paragraph, actual: &Paragraph| {
+ expected.text() == actual.text()
+ && (expected.text().is_empty() || expected == actual)
+ };
+ if !same(&head, &after.text)
+ || !same(&tail, &next.text)
+ || divides_link(&previous.text, offset)?
+ || old.paragraphs[&left].lists.len() > 251
+ {
+ continue;
+ }
+ // A text object a join moved into the paragraph keeps its identity there.
+ let right_text = if self.holds(next.id) {
+ new_id().map_err(|_| invalid("System random source failed"))?
+ } else {
+ next.id
+ };
+ // The split copies the left paragraph's list nodes in order; a node the model
+ // shares with a stored paragraph stays that paragraph's.
+ let stored_lists = old.paragraphs[&left].lists.len();
+ let model_lists = &new.paragraphs[&right].lists;
+ let mut lists = Vec::new();
+ for i in 0..stored_lists {
+ lists.push(match model_lists.get(i) {
+ Some(list) if model_lists.len() == stored_lists && !self.holds(*list) => *list,
+ _ => new_id().map_err(|_| invalid("System random source failed"))?,
+ });
+ }
+ self.emit(PageOp::Split {
+ text: previous.id,
+ at: offset,
+ paragraph: right,
+ right: right_text,
+ lists,
+ })?;
+ self.created.extend([right, right_text]);
+ split.insert(left);
+ // An earlier split may have carried the left paragraph to its tail.
+ let list = placed
+ .values_mut()
+ .find(|list| list.contains(&left))
+ .unwrap();
+ let at = list.iter().position(|id| *id == left).unwrap();
+ list.insert(at + 1, right);
+ placed.insert(right, placed[&left].clone());
+ placed.insert(left, Vec::new());
+ }
+ for (container, children) in &old.children {
+ if !new.children.contains_key(container) {
+ continue;
+ }
+ for pair in children.windows(2) {
+ let [left, right] = [pair[0], pair[1]];
+ let (Some(previous), Some(after), Some(removed)) =
+ (old.text(left), new.text(left), old.text(right))
+ else {
+ continue;
+ };
+ if new.paragraphs.contains_key(&right)
+ || !old.children[&left].is_empty()
+ || !old.children[&right].is_empty()
+ || removed.text.text().is_empty()
+ || !ordinary(previous)
+ || !ordinary(removed)
+ || old.title_outlines.contains(&root(old, left))
+ {
+ continue;
+ }
+ let mut joined = previous.text.clone();
+ if joined.append(removed.text.clone()).is_err() || joined != after.text {
+ continue;
+ }
+ let adopts_right = previous.text.text().is_empty();
+ if after.id != if adopts_right { removed.id } else { previous.id } {
+ continue;
+ }
+ self.emit(PageOp::Join {
+ left: previous.id,
+ right: removed.id,
+ })?;
+ consumed.insert(right);
+ placed.get_mut(container).unwrap().retain(|id| *id != right);
+ placed.remove(&right);
+ }
+ }
+ Ok(())
+ }
+
+ /// Adds, changes and orders what the page holds directly: outlines, pictures and ink.
+ fn place_page(&mut self, old: &View<'_>, new: &View<'_>) -> Result<(), Error> {
+ let pictures = |page: &Page| -> BTreeMap {
+ page.objects
+ .iter()
+ .filter_map(|object| match object {
+ PageObject::Image(image) => Some((image.id, image.clone())),
+ _ => None,
+ })
+ .collect()
+ };
+ let stored = pictures(old.page);
+ for (id, image) in pictures(new.page) {
+ if let Some(previous) = stored.get(&id)
+ && *previous != image
+ {
+ super::content::picture_fixed_fields(previous, &image)?;
+ self.emit(PageOp::Picture {
+ picture: id,
+ layout: image.layout.clone(),
+ alt: image.alt.clone(),
+ })?;
+ }
+ }
+ let inks = |page: &Page| -> BTreeMap {
+ page.objects
+ .iter()
+ .filter_map(|object| match object {
+ PageObject::Ink(ink) => Some((ink.id, ink.clone())),
+ _ => None,
+ })
+ .collect()
+ };
+ let stored = inks(old.page);
+ for (id, ink) in inks(new.page) {
+ if let Some(previous) = stored.get(&id)
+ && *previous != ink
+ {
+ self.strokes(previous, &ink)?;
+ }
+ }
+ let title = |page: &Page, id: ExGuid| {
+ page.objects
+ .iter()
+ .any(|object| matches!(object, PageObject::Title(title) if title.id == id))
+ };
+ let survivors: Vec = old
+ .page_children
+ .iter()
+ .copied()
+ .filter(|id| {
+ !title(old.page, *id) && new.page.objects.iter().any(|object| object.id() == *id)
+ })
+ .collect();
+ let after: Vec<&PageObject> = new
+ .page
+ .objects
+ .iter()
+ .filter(|object| !title(new.page, object.id()))
+ .collect();
+ let order: Vec = after.iter().map(|object| object.id()).collect();
+ let kept = kept_set(&survivors, &order, |id| {
+ new.outlines.contains_key(&id) && !new.title_outlines.contains(&id)
+ })?;
+ let mut next = None;
+ for object in after.iter().rev() {
+ let id = object.id();
+ let stored = old.page_children.contains(&id);
+ if !stored {
+ if new.title_outlines.contains(&id) {
+ return Err(invalid("Title outlines cannot be added"));
+ }
+ let object = match object {
+ PageObject::Outline(outline) => {
+ if outline.paragraphs.iter().any(|p| old.paragraphs.contains_key(&p.id)) {
+ return Err(invalid(
+ "A new outline holds new paragraphs; move stored ones after",
+ ));
+ }
+ self.created.extend(model::identities(&outline.paragraphs));
+ PageObject::Outline(Outline {
+ paragraphs: outline.paragraphs.iter().map(bare).collect(),
+ ..(*outline).clone()
+ })
+ }
+ PageObject::Image(_) | PageObject::Ink(_) => (*object).clone(),
+ PageObject::Title(_) | PageObject::Unsupported(_) => {
+ return Err(invalid(
+ "Titles and unsupported objects cannot be edited through the page model",
+ ));
+ }
+ };
+ self.emit(PageOp::Add {
+ object,
+ before: next,
+ })?;
+ } else if !kept.contains(&id) {
+ self.emit(PageOp::Move {
+ object: id,
+ parent: None,
+ before: next,
+ })?;
+ }
+ next = Some(id);
+ }
+ Ok(())
+ }
+
+ /// Inserts new paragraphs and moves stored ones to the containers and order the model
+ /// gives them, then edits the stored tables and paragraph content.
+ fn place(
+ &mut self,
+ old: &View<'_>,
+ new: &View<'_>,
+ placed: &BTreeMap>,
+ ) -> Result<(), Error> {
+ let mut inserted: BTreeSet = BTreeSet::new();
+ // New outlines and cells, whose paragraphs arrive with them.
+ let arriving: BTreeSet = new
+ .children
+ .keys()
+ .filter(|id| {
+ !old.children.contains_key(id)
+ && !new.paragraphs.contains_key(id)
+ && !new.external.contains(id)
+ })
+ .copied()
+ .collect();
+ for container in new.containers() {
+ if arriving.contains(&root(new, container)) {
+ continue;
+ }
+ let Some(children) = new.children.get(&container) else {
+ continue;
+ };
+ let current: Vec = placed
+ .get(&container)
+ .map(|list| {
+ list.iter()
+ .copied()
+ .filter(|id| new.paragraphs.contains_key(id))
+ .collect()
+ })
+ .unwrap_or_default();
+ let kept = kept_set(¤t, children, |_| true)?;
+ let tail = self
+ .tail
+ .filter(|(parent, _)| *parent == container)
+ .map(|(_, id)| id);
+ let mut next = tail;
+ let mut run: Vec = Vec::new();
+ for id in children.iter().rev() {
+ let fresh = !old.paragraphs.contains_key(id) && !self.created.contains(id);
+ if fresh && !inserted.contains(id) {
+ run.push(*id);
+ continue;
+ }
+ self.insert(container, next, &mut run, new, &mut inserted)?;
+ if !kept.contains(id) && !inserted.contains(id) {
+ self.emit(PageOp::Move {
+ object: *id,
+ parent: Some(container),
+ before: next,
+ })?;
+ }
+ next = Some(*id);
+ }
+ self.insert(container, next, &mut run, new, &mut inserted)?;
+ }
+ self.tables(old, new)?;
+ self.content(old, new)?;
+ Ok(())
+ }
+
+ /// Inserts `run`, new siblings in reverse order, with their new descendants.
+ fn insert(
+ &mut self,
+ container: ExGuid,
+ before: Option,
+ run: &mut Vec,
+ new: &View<'_>,
+ inserted: &mut BTreeSet,
+ ) -> Result<(), Error> {
+ if run.is_empty() {
+ return Ok(());
+ }
+ run.reverse();
+ let mut paragraphs = Vec::new();
+ let mut pending: Vec = run.drain(..).rev().collect();
+ while let Some(id) = pending.pop() {
+ let paragraph = new.paragraphs[&id];
+ paragraphs.push(bare(paragraph));
+ inserted.insert(id);
+ self.created.insert(id);
+ if let Some(text) = paragraph.text() {
+ self.created.insert(text.id);
+ }
+ if let ParagraphContent::Table(table) = ¶graph.content {
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ self.created.extend(model::identities(&cell.paragraphs));
+ }
+ }
+ // New children follow their parent; stored ones move there later.
+ pending.extend(
+ new.children[&id]
+ .iter()
+ .rev()
+ .filter(|child| !self.holds(**child) && !inserted.contains(child)),
+ );
+ }
+ self.emit(PageOp::Insert {
+ container,
+ before,
+ paragraphs,
+ })
+ }
+
+ /// Row, column, width, border and cell edits of stored tables.
+ fn tables(&mut self, old: &View<'_>, new: &View<'_>) -> Result<(), Error> {
+ let stored: BTreeMap = old
+ .paragraphs
+ .values()
+ .filter_map(|p| match &p.content {
+ ParagraphContent::Table(table) => Some((table.id, table)),
+ _ => None,
+ })
+ .collect();
+ for paragraph in new.paragraphs.values() {
+ let ParagraphContent::Table(table) = ¶graph.content else {
+ continue;
+ };
+ let Some(previous) = stored.get(&table.id) else {
+ continue;
+ };
+ self.table(previous, table)?;
+ let cells: BTreeMap = previous
+ .rows
+ .iter()
+ .flat_map(|row| &row.cells)
+ .map(|cell| (cell.id, cell))
+ .collect();
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ let Some(before) = cells.get(&cell.id) else {
+ continue;
+ };
+ if (cell.shading, &cell.indents) != (before.shading, &before.indents) {
+ self.emit(PageOp::Table {
+ table: table.id,
+ edit: TableEdit::Cell {
+ cell: cell.id,
+ shading: cell.shading,
+ indents: cell.indents.clone(),
+ },
+ })?;
+ }
+ }
+ }
+ Ok(())
+ }
+
+ /// The row and column edits turning stored table `before` into `after`.
+ fn table(&mut self, before: &Table, after: &Table) -> Result<(), Error> {
+ let id = after.id;
+ let unsupported = || invalid("Table rows and cells keep their order; add or remove them");
+ let old_rows: Vec = before.rows.iter().map(|row| row.id).collect();
+ let new_rows: Vec = after.rows.iter().map(|row| row.id).collect();
+ let kept_rows: Vec = old_rows
+ .iter()
+ .copied()
+ .filter(|row| new_rows.contains(row))
+ .collect();
+ if new_rows
+ .iter()
+ .filter(|row| old_rows.contains(row))
+ .ne(kept_rows.iter())
+ {
+ return Err(unsupported());
+ }
+ // The column pattern every kept row shares: which stored cells stay, which are new.
+ let mut deleted: Option> = None;
+ let mut added: Option> = None;
+ for row in &kept_rows {
+ let old_cells: Vec = before.rows.iter().find(|r| r.id == *row).unwrap().cells
+ .iter()
+ .map(|cell| cell.id)
+ .collect();
+ let new_cells: Vec = after.rows.iter().find(|r| r.id == *row).unwrap().cells
+ .iter()
+ .map(|cell| cell.id)
+ .collect();
+ let gone: Vec = (0..old_cells.len() as u32)
+ .filter(|i| !new_cells.contains(&old_cells[*i as usize]))
+ .collect();
+ let fresh: Vec = (0..new_cells.len() as u32)
+ .filter(|i| !old_cells.contains(&new_cells[*i as usize]))
+ .collect();
+ if old_cells
+ .iter()
+ .filter(|cell| new_cells.contains(cell))
+ .ne(new_cells.iter().filter(|cell| old_cells.contains(cell)))
+ || deleted.as_ref().is_some_and(|known| *known != gone)
+ || added.as_ref().is_some_and(|known| *known != fresh)
+ {
+ return Err(unsupported());
+ }
+ deleted = Some(gone);
+ added = Some(fresh);
+ }
+ let (deleted, added) = (deleted.unwrap_or_default(), added.unwrap_or_default());
+ if kept_rows.is_empty() && before.columns.len() != after.columns.len() {
+ return Err(unsupported());
+ }
+ for row in &old_rows {
+ if !new_rows.contains(row) && !kept_rows.is_empty() {
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::DeleteRow(*row),
+ })?;
+ }
+ }
+ for at in deleted.iter().rev() {
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::DeleteColumn(*at),
+ })?;
+ }
+ for at in &added {
+ let cells = kept_rows
+ .iter()
+ .map(|row| {
+ let row = after.rows.iter().find(|r| r.id == *row).unwrap();
+ bare_cells(&row.cells[*at as usize..=*at as usize]).remove(0)
+ })
+ .collect::>();
+ for cell in &cells {
+ self.created.extend(model::identities(&cell.paragraphs));
+ }
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::Column {
+ at: *at,
+ width: after.columns[*at as usize].width,
+ cells,
+ },
+ })?;
+ }
+ // New rows, each run before the stored row that follows it.
+ let mut run = Vec::new();
+ let mut next = None;
+ for row in after.rows.iter().rev() {
+ if old_rows.contains(&row.id) {
+ self.rows(id, next, &mut run)?;
+ next = Some(row.id);
+ } else {
+ run.push(row.clone());
+ }
+ }
+ self.rows(id, next, &mut run)?;
+ if kept_rows.is_empty() {
+ for row in &old_rows {
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::DeleteRow(*row),
+ })?;
+ }
+ }
+ let current = model::table(&self.current, id)
+ .ok_or_else(|| invalid("A table is missing after row edits"))?;
+ if current.columns != after.columns {
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::Columns(after.columns.clone()),
+ })?;
+ }
+ let current = model::table(&self.current, id).unwrap();
+ if current.borders != after.borders
+ && let Some(borders) = after.borders
+ {
+ self.emit(PageOp::Table {
+ table: id,
+ edit: TableEdit::Borders(borders),
+ })?;
+ }
+ Ok(())
+ }
+
+ fn rows(
+ &mut self,
+ table: ExGuid,
+ before: Option,
+ run: &mut Vec