diff --git a/Cargo.lock b/Cargo.lock
index b5c096c3c76618a0682b361a9785e5dff8246398..39dde40d5cb822acd8b1d4f75bfc24bdf5620915 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -451,6 +451,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+[[package]]
+name = "base64"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
+
[[package]]
name = "bit-set"
version = "0.10.0"
@@ -964,6 +970,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
name = "draw"
version = "0.1.0"
dependencies = [
+ "base64 0.22.1",
"bytemuck",
"image",
"linebender_resource_handle",
@@ -1237,6 +1244,17 @@ dependencies = [
"windows-link",
]
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
[[package]]
name = "getrandom"
version = "0.3.4"
@@ -1400,6 +1418,22 @@ dependencies = [
"digest",
]
+[[package]]
+name = "http"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
[[package]]
name = "hybrid-array"
version = "0.4.14"
@@ -1885,6 +1919,8 @@ dependencies = [
"canvas",
"draw",
"notebook",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
"onestore",
"parley",
"pollster",
@@ -1990,6 +2026,7 @@ name = "notebook"
version = "0.1.0"
dependencies = [
"libc",
+ "nix",
"onestore",
"rusqlite",
"serde",
@@ -2361,7 +2398,7 @@ name = "onestore"
version = "0.1.0"
dependencies = [
"aes",
- "base64",
+ "base64 0.22.1",
"bumpalo",
"cbc",
"getrandom 0.4.3",
@@ -2849,6 +2886,20 @@ dependencies = [
"bytemuck",
]
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "roxmltree"
version = "0.21.1"
@@ -2924,6 +2975,41 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "rustls"
+version = "0.23.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
[[package]]
name = "rustversion"
version = "1.0.23"
@@ -3232,8 +3318,10 @@ name = "snowbound"
version = "0.1.0"
dependencies = [
"accesskit",
+ "accesskit_consumer",
"accesskit_winit",
"arboard",
+ "block2 0.5.1",
"canvas",
"draw",
"fontique",
@@ -3247,11 +3335,16 @@ dependencies = [
"parley",
"png",
"pollster",
+ "ring",
"sctk-adwaita",
"serde",
"serde_json",
"smithay-clipboard",
"ui",
+ "ureq",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
"wgpu",
"winit",
"zbus",
@@ -3616,6 +3709,8 @@ dependencies = [
name = "ui"
version = "0.1.0"
dependencies = [
+ "accesskit",
+ "accesskit_consumer",
"draw",
"nucleo-matcher",
"parley",
@@ -3653,6 +3748,40 @@ dependencies = [
"ctutils",
]
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"
+dependencies = [
+ "base64 0.23.1",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pki-types",
+ "ureq-proto",
+ "utf8-zero",
+ "webpki-roots",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be"
+dependencies = [
+ "base64 0.23.1",
+ "http",
+ "httparse",
+ "log",
+]
+
[[package]]
name = "usvg"
version = "0.48.1"
@@ -3678,6 +3807,12 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -3942,6 +4077,15 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "webpki-roots"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
+dependencies = [
+ "rustls-pki-types",
+]
+
[[package]]
name = "weezl"
version = "0.1.12"
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..46944bba7343fcbb526ae34e9953c4973a8d37bc
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2026 clover caruso
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/apps/ios/Info.plist b/apps/ios/Info.plist
index ab475a47a5afa0062c2d7d809d6a6a1299034982..4c4d8523c9c02c23057ad0e2cd42d2e08da38af4 100644
--- a/apps/ios/Info.plist
+++ b/apps/ios/Info.plist
@@ -8,6 +8,18 @@
NSCameraUsageDescription
Take a photo to put on a page.
+ NSUbiquitousContainers
+
+ iCloud.net.paperclover.snowbound
+
+ NSUbiquitousContainerIsDocumentScopePublic
+
+ NSUbiquitousContainerName
+ Snowbound
+ NSUbiquitousContainerSupportedFolderLevels
+ Any
+
+
NSLocalNetworkUsageDescription
Snowbound opens notebooks on file servers on your network.
UIApplicationSceneManifest
diff --git a/apps/ios/Snowbound.entitlements b/apps/ios/Snowbound.entitlements
new file mode 100644
index 0000000000000000000000000000000000000000..201297119e45e3839763982c3fa8c3e7e85b0a7b
--- /dev/null
+++ b/apps/ios/Snowbound.entitlements
@@ -0,0 +1,18 @@
+
+
+
+
+ com.apple.developer.icloud-container-identifiers
+
+ iCloud.net.paperclover.snowbound
+
+ com.apple.developer.icloud-services
+
+ CloudDocuments
+
+ com.apple.developer.ubiquity-container-identifiers
+
+ iCloud.net.paperclover.snowbound
+
+
+
diff --git a/apps/ios/Snowbound.xcodeproj/project.pbxproj b/apps/ios/Snowbound.xcodeproj/project.pbxproj
index 7d83a972b8732bc7904b5361fa1deea4c1950680..21806b54565e4cbfbb00ff930e63953437c9e447 100644
--- a/apps/ios/Snowbound.xcodeproj/project.pbxproj
+++ b/apps/ios/Snowbound.xcodeproj/project.pbxproj
@@ -198,6 +198,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
+ CODE_SIGN_ENTITLEMENTS = Snowbound.entitlements;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../crates/mobile/include";
@@ -219,7 +220,7 @@
"-framework",
CoreText,
);
- PRODUCT_BUNDLE_IDENTIFIER = dev.clover.snowbound;
+ PRODUCT_BUNDLE_IDENTIFIER = net.paperclover.snowbound;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SWIFT_EMIT_LOC_STRINGS = NO;
@@ -233,6 +234,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
+ CODE_SIGN_ENTITLEMENTS = Snowbound.entitlements;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../crates/mobile/include";
@@ -254,7 +256,7 @@
"-framework",
CoreText,
);
- PRODUCT_BUNDLE_IDENTIFIER = dev.clover.snowbound;
+ PRODUCT_BUNDLE_IDENTIFIER = net.paperclover.snowbound;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SWIFT_EMIT_LOC_STRINGS = NO;
diff --git a/apps/ios/Snowbound/App.swift b/apps/ios/Snowbound/App.swift
index d536d95c80df1c3ac722916bb0dc81ff58a1c92e..35753ed3d7871e21d337fb6f9211b7543d9bf944 100644
--- a/apps/ios/Snowbound/App.swift
+++ b/apps/ios/Snowbound/App.swift
@@ -19,6 +19,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
_ application: UIApplication, didFinishLaunchingWithOptions options: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
sb_set_coordinator(coordinate)
+ ICloud.start()
sb_set_sync_wake { DispatchQueue.main.async { NotificationCenter.default.post(name: Sync.changed, object: nil) } }
#if DEBUG
Presenter.watch()
@@ -45,7 +46,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
/// Where the reader was, reopened on the next launch as Notes reopens its last note.
private struct Place: Codable {
- let notebook: UUID
+ let notebook: String
let section: String
let page: String?
@@ -90,6 +91,11 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, UISplitViewContro
self?.restore(notebook)
}
}
+ // iCloud Drive's notebooks list once its folder is found, and again when the account
+ // changes.
+ NotificationCenter.default.addObserver(forName: ICloud.changed, object: nil, queue: .main) { [weak self] _ in
+ self?.notebooks.rescan { self?.restore($0) }
+ }
}
/// Reopens the section and page shown last, or the scripted one.
@@ -171,6 +177,15 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, UISplitViewContro
Place.saved = Place(notebook: section.notebook.id, section: section.tab.path, page: page)
}
+ /// Returns to the list from any section of `notebook` shown, as before its folder moves.
+ func close(_ notebook: Notebook) {
+ guard pages.section?.notebook === notebook else { return }
+ pages.clear()
+ showingPage = false
+ split.setViewController(UIViewController(), for: .secondary)
+ split.show(.primary)
+ }
+
/// Adds a page to the open section and opens it, its title ready for typing.
func newPage(subpage: Bool = false) {
guard let section = pages.section else { return }
@@ -194,6 +209,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, UISplitViewContro
/// Composition ends and every edit is stored and published while the system allows.
func sceneDidEnterBackground(_ scene: UIScene) {
NotificationCenter.default.post(name: PageViewController.leaving, object: nil)
+ for notebook in Notebooks.all { notebook.pause() }
let sections = Section.all
guard !sections.isEmpty, background == .invalid else { return }
background = UIApplication.shared.beginBackgroundTask(withName: "Saving") { [weak self] in
@@ -211,8 +227,16 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, UISplitViewContro
background = .invalid
}
+ /// Someone moving to another device finds their edits there: they publish now rather than
+ /// after a pause in typing.
+ func sceneWillResignActive(_ scene: UIScene) {
+ for section in Section.all { section.wake() }
+ }
+
/// Changes made elsewhere while away show at once.
func sceneWillEnterForeground(_ scene: UIScene) {
+ for notebook in Notebooks.all { notebook.resume() }
+ notebooks.rescan()
for section in Section.all { section.wake() }
}
}
diff --git a/apps/ios/Snowbound/CanvasView.swift b/apps/ios/Snowbound/CanvasView.swift
index ac0f2420af601edb0eb0be8080611197038f7219..584ee4abb5346049c6b9e4c8bc5d7cfd0ad91f11 100644
--- a/apps/ios/Snowbound/CanvasView.swift
+++ b/apps/ios/Snowbound/CanvasView.swift
@@ -628,20 +628,25 @@ final class CanvasView: UIScrollView, UIScrollViewDelegate, UITextInput, UITextI
}
}
- /// The Pencil, or a drawing finger, comes down at `point` in the scroll view's bounds.
- func inkPressed(_ point: CGPoint) {
+ /// The Pencil, or a drawing finger, comes down at `sample`'s point in the scroll view's bounds.
+ func inkPressed(_ sample: InkSample) {
guard let handle else { return }
// Drawing puts the keyboard away, as Notes does.
if isFirstResponder { _ = resignFirstResponder() }
use(inkTool)
editMenu.dismissMenu()
- let point = visible(point)
+ let point = visible(sample.point)
+ sb_view_pressure(handle, sample.pressure)
edit { sb_view_press(handle, Float(point.x), Float(point.y)) }
}
- func inkMoved(_ points: ArraySlice) {
+ func inkMoved(_ samples: ArraySlice) {
guard let handle else { return }
- for point in points.map(visible) { _ = sb_view_drag(handle, Float(point.x), Float(point.y)) }
+ for sample in samples {
+ let point = visible(sample.point)
+ sb_view_pressure(handle, sample.pressure)
+ _ = sb_view_drag(handle, Float(point.x), Float(point.y))
+ }
dirty = true
}
@@ -664,7 +669,10 @@ final class CanvasView: UIScrollView, UIScrollViewDelegate, UITextInput, UITextI
_ interaction: UIEditMenuInteraction, menuFor configuration: UIEditMenuConfiguration,
suggestedActions: [UIMenuElement]
) -> UIMenu? {
- guard configuration.identifier as? NSString == Self.inkMenu else { return UIMenu(children: suggestedActions) }
+ guard configuration.identifier as? NSString == Self.inkMenu else {
+ return selectedTextRange.flatMap { editMenu(for: $0, suggestedActions: suggestedActions) }
+ ?? UIMenu(children: suggestedActions)
+ }
return UIMenu(children: [
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) { [weak self] _ in
self?.deleteInk()
@@ -828,7 +836,32 @@ final class CanvasView: UIScrollView, UIScrollViewDelegate, UITextInput, UITextI
self?.apply(10)
}, at: 0)
}
- return UIMenu(children: suggestedActions + [UIMenu(options: .displayInline, children: extra)])
+ return UIMenu(
+ children: spellingActions() + suggestedActions + [UIMenu(options: .displayInline, children: extra)])
+ }
+
+ private struct Correction: Decodable {
+ let word: String
+ let suggestions: [String]
+ let repeated: Bool
+ }
+
+ /// OneNote's corrections for the marked word at the selection, first in the menu.
+ private func spellingActions() -> [UIMenuElement] {
+ guard let handle, let correction = decode(Correction.self, sb_view_correction(handle)) else { return [] }
+ let correct = { [weak self] (command: UInt8, text: String?) in
+ guard let self, let handle = self.handle else { return }
+ self.edit(external: true) { sb_view_correct(handle, command, text) }
+ }
+ let replacements =
+ correction.repeated
+ ? [UIAction(title: "Delete Repeated Word") { _ in correct(0, "") }]
+ : correction.suggestions.map { word in UIAction(title: word) { _ in correct(0, word) } }
+ let ignore = UIAction(title: "Ignore") { _ in correct(1, nil) }
+ let learn = UIAction(title: "Add to Dictionary") { _ in correct(2, nil) }
+ return [
+ UIMenu(options: .displayInline, children: replacements + (correction.repeated ? [ignore] : [ignore, learn]))
+ ]
}
// MARK: Page
diff --git a/apps/ios/Snowbound/ICloud.swift b/apps/ios/Snowbound/ICloud.swift
new file mode 100644
index 0000000000000000000000000000000000000000..233bfdd1fea102b542cb6dbcfa0727b038604993
--- /dev/null
+++ b/apps/ios/Snowbound/ICloud.swift
@@ -0,0 +1,80 @@
+import Foundation
+
+/// Lists the conflict versions iCloud Drive keeps beside a section file, as it keeps another
+/// device's commit that lost; the library merges each into the file.
+private let listVersions: sb_versions = { path, found, context in
+ guard let path, let found else { return }
+ let url = URL(fileURLWithPath: String(cString: path))
+ for version in NSFileVersion.unresolvedConflictVersionsOfItem(at: url) ?? [] {
+ version.url.path.withCString { id in
+ guard let device = version.localizedNameOfSavingComputer else { return found(context, id, nil) }
+ device.withCString { found(context, id, $0) }
+ }
+ }
+}
+
+/// Resolves and removes a version the library merged, first keeping it beside the file as
+/// “Name (Device).one” when it is another section. A version already gone, as another device
+/// resolved it, is done.
+private let retireVersion: sb_retire = { path, id, keep in
+ guard let path, let id else { return false }
+ let url = URL(fileURLWithPath: String(cString: path))
+ let named = String(cString: id)
+ guard let version = NSFileVersion.unresolvedConflictVersionsOfItem(at: url)?.first(where: { $0.url.path == named })
+ else { return true }
+ var retired = false
+ var error: NSError?
+ NSFileCoordinator().coordinate(writingItemAt: url, options: .forMerging, error: &error) { url in
+ if keep {
+ let device = version.localizedNameOfSavingComputer ?? "another device"
+ let stem = url.deletingPathExtension().lastPathComponent
+ let folder = url.deletingLastPathComponent()
+ let kept = (1...).lazy.map { n in
+ folder.appendingPathComponent(n == 1 ? "\(stem) (\(device)).one" : "\(stem) (\(device) \(n)).one")
+ }.first { !FileManager.default.fileExists(atPath: $0.path) }
+ guard let kept, (try? FileManager.default.copyItem(at: version.url, to: kept)) != nil else { return }
+ }
+ version.isResolved = true
+ retired = (try? version.remove()) != nil
+ }
+ return retired
+}
+
+/// Snowbound's folder in iCloud Drive: its container's Documents, which Files shows as iCloud
+/// Drive's Snowbound folder.
+enum ICloud {
+ /// Sent on the main thread when the folder was looked up again.
+ static let changed = Notification.Name("ICloudChanged")
+ private static let identifier = "iCloud.net.paperclover.snowbound"
+
+ /// The folder, once looked up; nil while iCloud Drive is off, signed out, or the app lacks
+ /// the container.
+ private(set) static var documents: URL?
+
+ /// Whether iCloud is signed in with iCloud Drive on, container or not.
+ static var signedIn: Bool { FileManager.default.ubiquityIdentityToken != nil }
+
+ /// Has the library merge conflict versions, and follows the account; call once at launch.
+ static func start() {
+ sb_set_versions(listVersions, retireVersion)
+ NotificationCenter.default.addObserver(
+ forName: .NSUbiquityIdentityDidChange, object: nil, queue: .main
+ ) { _ in lookUp() }
+ lookUp()
+ }
+
+ /// Looks the folder up off the main thread, as asking iCloud can take a while.
+ static func lookUp() {
+ background({ () -> URL? in
+ guard
+ let container = FileManager.default.url(forUbiquityContainerIdentifier: identifier)?
+ .appendingPathComponent("Documents", isDirectory: true)
+ else { return nil }
+ try? FileManager.default.createDirectory(at: container, withIntermediateDirectories: true)
+ return container
+ }) { found in
+ documents = found
+ NotificationCenter.default.post(name: changed, object: nil)
+ }
+ }
+}
diff --git a/apps/ios/Snowbound/Ink.swift b/apps/ios/Snowbound/Ink.swift
index 0643d2c14fdbf0590c7624848120d85e11562fb3..da9714374545ef9406937d2822af136a25d20952 100644
--- a/apps/ios/Snowbound/Ink.swift
+++ b/apps/ios/Snowbound/Ink.swift
@@ -43,19 +43,28 @@ struct Pen {
}
}
+/// A point a touch passed, in the view's bounds, and the Pencil's pressure there from 0 to its
+/// greatest, or -1 for a finger, whose strokes keep their pen's width.
+typealias InkSample = (point: CGPoint, pressure: Float)
+
/// Follows one touch from the moment it lands, gathering every point the hardware sampled,
/// for the canvas's pens, eraser and lasso. A second finger cancels a finger's stroke, so two
/// fingers scroll; a hand resting beside the Pencil is ignored.
final class InkGesture: UIGestureRecognizer {
- /// Points the touch passed since the action last took them, in the view's bounds.
- var points: [CGPoint] = []
+ /// Points the touch passed since the action last took them.
+ var points: [InkSample] = []
private var tracked: UITouch?
+ private func sample(_ touch: UITouch) -> InkSample {
+ let pressure = touch.type == .pencil ? Float(touch.force / touch.maximumPossibleForce) : -1
+ return (touch.preciseLocation(in: view), pressure)
+ }
+
override func touchesBegan(_ touches: Set, with event: UIEvent) {
for touch in touches {
if tracked == nil {
tracked = touch
- points = [touch.preciseLocation(in: view)]
+ points = [sample(touch)]
state = .began
} else if tracked?.type == .direct {
state = .cancelled
@@ -67,13 +76,13 @@ final class InkGesture: UIGestureRecognizer {
override func touchesMoved(_ touches: Set, with event: UIEvent) {
guard let tracked, touches.contains(tracked) else { return }
- points += (event.coalescedTouches(for: tracked) ?? [tracked]).map { $0.preciseLocation(in: view) }
+ points += (event.coalescedTouches(for: tracked) ?? [tracked]).map(sample)
state = .changed
}
override func touchesEnded(_ touches: Set, with event: UIEvent) {
guard let tracked, touches.contains(tracked) else { return }
- points.append(tracked.preciseLocation(in: view))
+ points.append(sample(tracked))
state = .ended
}
diff --git a/apps/ios/Snowbound/Lists.swift b/apps/ios/Snowbound/Lists.swift
index 11597dcb29136324d96d479f375634578adf3c5d..1cc494ef877c504d61a24d0ce15068e8697d76dc 100644
--- a/apps/ios/Snowbound/Lists.swift
+++ b/apps/ios/Snowbound/Lists.swift
@@ -1,21 +1,40 @@
import UIKit
import UniformTypeIdentifiers
-/// Every open notebook with its sections, as Notes lists each account's folders.
-final class NotebooksViewController: UITableViewController, UIDocumentPickerDelegate {
- private enum Item {
- case group(String, depth: Int)
- case section(Tab, depth: Int)
- case opening
- case problem(String)
+/// The places notebooks are kept, each listing its notebooks with their sections, as Files
+/// lists its locations and Notes each account's folders.
+final class NotebooksViewController: UICollectionViewController, UIDocumentPickerDelegate {
+ private enum Location: Hashable {
+ /// Snowbound's folder in iCloud Drive, where new notebooks go while iCloud Drive is on.
+ case icloud
+ /// Snowbound's Documents, which Files shows as Snowbound's folder.
+ case onDevice
+ /// Notebooks opened from Files or a server.
+ case elsewhere
}
- private var items: [[Item]] = []
- private var selected: (notebook: UUID, path: String)?
+ private enum Item: Hashable {
+ case location(Location)
+ case notebook(String)
+ /// A section group, by its `/`-separated path.
+ case group(notebook: String, path: String)
+ case section(notebook: String, path: String)
+ /// Opening, or why the notebook cannot be.
+ case status(notebook: String)
+ case newNotebook, openFolder, connect
+ /// New Notebook in iCloud Drive, and the way to it while iCloud Drive is off.
+ case newInCloud, turnOnICloud
+ }
+
+ private var dataSource: UICollectionViewDiffableDataSource!
+ private var collapsed: Set- = []
+ private var selected: Item?
var onOpen: ((Tab, Notebook) -> Void)?
+ private static let device = "On My \(UIDevice.current.model)"
+
init() {
- super.init(style: .insetGrouped)
+ super.init(collectionViewLayout: UICollectionViewFlowLayout())
title = "Notebooks"
navigationItem.largeTitleDisplayMode = .always
}
@@ -24,23 +43,79 @@ final class NotebooksViewController: UITableViewController, UIDocumentPickerDele
override func viewDidLoad() {
super.viewDidLoad()
- tableView.register(UITableViewCell.self, forCellReuseIdentifier: "row")
+ collectionView.collectionViewLayout = UICollectionViewCompositionalLayout { [weak self] _, environment in
+ let compact = environment.traitCollection.horizontalSizeClass == .compact
+ var list = UICollectionLayoutListConfiguration(appearance: compact ? .insetGrouped : .sidebar)
+ list.headerMode = .firstItemInSection
+ list.trailingSwipeActionsConfigurationProvider = { indexPath in
+ guard let self, let item = self.dataSource.itemIdentifier(for: indexPath) else { return nil }
+ if case .notebook(let id) = item, let notebook = self.notebook(id) {
+ return UISwipeActionsConfiguration(actions: self.swipeActions(for: notebook, at: indexPath))
+ }
+ guard item == .location(.onDevice) else { return nil }
+ let hide = UIContextualAction(style: .normal, title: "Hide") { [weak self] _, _, done in
+ self?.showOnDevice(false)
+ done(true)
+ }
+ hide.image = UIImage(systemName: "eye.slash")
+ return UISwipeActionsConfiguration(actions: [hide])
+ }
+ return NSCollectionLayoutSection.list(using: list, layoutEnvironment: environment)
+ }
+ let cell = UICollectionView.CellRegistration { [weak self] cell, _, item in
+ self?.configure(cell, item)
+ }
+ dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { view, indexPath, item in
+ view.dequeueConfiguredReusableCell(using: cell, for: indexPath, item: item)
+ }
+ dataSource.sectionSnapshotHandlers.willCollapseItem = { [weak self] in self?.collapsed.insert($0) }
+ dataSource.sectionSnapshotHandlers.willExpandItem = { [weak self] in self?.collapsed.remove($0) }
+
let add = UIMenu(children: [
- UIAction(title: "Open from Files…", image: UIImage(systemName: "folder")) { [weak self] _ in
- self?.openFromFiles()
- },
- UIAction(title: "Connect to Server…", image: UIImage(systemName: "server.rack")) { [weak self] _ in
- self?.connect()
- },
- UIAction(title: "Personalize…", image: UIImage(systemName: "person.crop.circle")) { [weak self] _ in
- guard let self else { return }
- Author.ask(from: self) {}
- },
+ UIDeferredMenuElement.uncached { [weak self] provide in
+ guard let self else { return provide([]) }
+ var actions: [UIMenuElement] = []
+ if ICloud.documents != nil || Notebooks.showsOnDevice {
+ actions.append(
+ UIAction(title: "New Notebook…", image: UIImage(systemName: "plus")) { [weak self] _ in
+ self?.newNotebook(inCloud: ICloud.documents != nil)
+ })
+ }
+ actions += [
+ UIAction(title: "Open Folder…", image: UIImage(systemName: "folder")) { [weak self] _ in
+ self?.openFolder()
+ },
+ UIAction(title: "Connect to Server…", image: UIImage(systemName: "server.rack")) { [weak self] _ in
+ self?.connect()
+ },
+ ]
+ var more: [UIMenuElement] = []
+ if !Notebooks.showsOnDevice {
+ more.append(
+ UIAction(title: "Show \(Self.device)", image: UIImage(systemName: "eye")) { [weak self] _ in
+ self?.showOnDevice(true)
+ })
+ }
+ more.append(
+ UIAction(title: "Personalize…", image: UIImage(systemName: "person.crop.circle")) { [weak self] _ in
+ guard let self else { return }
+ Author.ask(from: self) {}
+ })
+ provide(actions + [UIMenu(options: .displayInline, children: more)])
+ }
])
navigationItem.rightBarButtonItem = UIBarButtonItem(
title: "Add Notebook", image: UIImage(systemName: "plus"), menu: add)
navigationItem.searchController = SearchViewController.controller()
toolbarItems = [.flexibleSpace(), UIBarButtonItem(customView: SyncIndicator()), .flexibleSpace()]
+ NotificationCenter.default.addObserver(forName: Notebook.listed, object: nil, queue: .main) { [weak self] _ in
+ guard let self else { return }
+ reload()
+ var shown = dataSource.snapshot()
+ shown.reconfigureItems(shown.itemIdentifiers)
+ dataSource.apply(shown, animatingDifferences: false)
+ }
+ reload()
}
override func viewWillAppear(_ animated: Bool) {
@@ -49,47 +124,403 @@ final class NotebooksViewController: UITableViewController, UIDocumentPickerDele
navigationController?.setToolbarHidden(false, animated: false)
}
+ private func notebook(_ id: String) -> Notebook? { Notebooks.all.first { $0.id == id } }
+
func reload() {
- items = Notebooks.all.map { notebook in
- if notebook.handle == nil {
- return [notebook.problem.map(Item.problem) ?? .opening]
- }
- var rows: [Item] = []
- var group = ""
- for tab in notebook.tabs {
- if tab.group != group {
- // Each group level not yet shown gets its own row.
- let parts = tab.group.split(separator: "/").map(String.init)
- let shown = group.split(separator: "/").map(String.init)
- let common = zip(parts, shown).prefix { $0 == $1 }.count
- for depth in common..()
+ sections.appendSections(locations.map(\.0))
+ dataSource.apply(sections, animatingDifferences: false)
+ for (location, notebooks, actions) in locations {
+ var list = NSDiffableDataSourceSectionSnapshot
- ()
+ let header = Item.location(location)
+ list.append([header])
+ list.append(notebooks.map { .notebook($0.id) } + actions, to: header)
+ for notebook in notebooks {
+ let parent = Item.notebook(notebook.id)
+ guard notebook.handle != nil else {
+ list.append([.status(notebook: notebook.id)], to: parent)
+ continue
+ }
+ for tab in notebook.tabs {
+ var parent = parent
+ var path = ""
+ for part in tab.group.split(separator: "/") {
+ path += (path.isEmpty ? "" : "/") + part
+ let group = Item.group(notebook: notebook.id, path: path)
+ if !list.contains(group) { list.append([group], to: parent) }
+ parent = group
+ }
+ list.append([.section(notebook: notebook.id, path: tab.path)], to: parent)
}
- rows.append(.section(tab, depth: tab.group.split(separator: "/").count))
}
- return rows
+ list.expand(list.items.filter { !collapsed.contains($0) })
+ dataSource.apply(list, to: location, animatingDifferences: false)
}
- tableView.reloadData()
showSelection()
- var empty = UIContentUnavailableConfiguration.empty()
- empty.text = "No Notebooks"
- empty.secondaryText = "Open a OneNote notebook from Files or a server."
- contentUnavailableConfiguration = items.isEmpty ? empty : nil
+ }
+
+ /// Lists Documents and iCloud Drive again and opens the notebooks new there; `opened` runs
+ /// as each opens.
+ func rescan(opened: ((Notebook) -> Void)? = nil) {
+ for notebook in Notebooks.scanICloud() + Notebooks.scan() {
+ notebook.open { [weak self] in
+ self?.reload()
+ opened?(notebook)
+ }
+ }
+ reload()
+ }
+
+ private func showOnDevice(_ shown: Bool) {
+ Notebooks.showsOnDevice = shown
+ rescan()
}
func select(_ tab: Tab, of notebook: Notebook) {
- selected = (notebook.id, tab.path)
+ selected = .section(notebook: notebook.id, path: tab.path)
showSelection()
}
/// Marks the open section, as the sidebar of a wide window keeps it.
private func showSelection() {
- guard let selected, let section = Notebooks.all.firstIndex(where: { $0.id == selected.notebook }),
- let row = items[section].firstIndex(where: {
- if case .section(let tab, _) = $0 { tab.path == selected.path } else { false }
- })
+ guard let selected, let indexPath = dataSource.indexPath(for: selected) else { return }
+ collectionView.selectItem(at: indexPath, animated: false, scrollPosition: [])
+ }
+
+ private func configure(_ cell: UICollectionViewListCell, _ item: Item) {
+ var content = cell.defaultContentConfiguration()
+ var accessories: [UICellAccessory] = []
+ switch item {
+ case .location(let location):
+ content.text =
+ switch location {
+ case .icloud: "iCloud Drive"
+ case .onDevice: Self.device
+ case .elsewhere: "Other Locations"
+ }
+ accessories = [.outlineDisclosure(options: .init(style: .header))]
+ case .notebook(let id):
+ guard let notebook = notebook(id) else { break }
+ content.text = notebook.name
+ content.image = UIImage(systemName: "book.closed")
+ if case .server(let server) = notebook.source { content.secondaryText = server.host }
+ let more = UIButton(type: .system)
+ more.setImage(UIImage(systemName: "ellipsis.circle"), for: .normal)
+ more.accessibilityLabel = "More"
+ more.showsMenuAsPrimaryAction = true
+ more.menu = menu(for: notebook)
+ accessories = [
+ .customView(configuration: .init(customView: more, placement: .trailing(displayed: .always))),
+ .outlineDisclosure(options: .init(style: .cell)),
+ ]
+ case .group(_, let path):
+ content.text = path.split(separator: "/").last.map(String.init)
+ content.image = UIImage(systemName: "folder")
+ content.textProperties.color = .secondaryLabel
+ accessories = [.outlineDisclosure(options: .init(style: .cell))]
+ case .section(let id, let path):
+ guard let tab = notebook(id)?.tabs.first(where: { $0.path == path }) else { break }
+ content.text = tab.name
+ content.image = UIImage(
+ systemName: tab.readable ? "rectangle.portrait.fill" : tab.downloading ? "icloud.and.arrow.down" : "lock.fill")
+ content.imageProperties.tintColor = tab.uiColor
+ if !tab.readable {
+ content.secondaryText = tab.downloading ? "Downloading…" : tab.copy.map { "Copy of “\($0)”" } ?? tab.problem ?? "Can’t be opened here"
+ content.textProperties.color = .secondaryLabel
+ }
+ case .status(let id):
+ if let problem = notebook(id)?.problem {
+ content.text = "Can’t Open Notebook"
+ content.secondaryText = problem
+ content.image = UIImage(systemName: "exclamationmark.triangle")
+ content.imageProperties.tintColor = .systemOrange
+ let retry = UIImageView(image: UIImage(systemName: "arrow.clockwise"))
+ accessories = [.customView(configuration: .init(customView: retry, placement: .trailing()))]
+ } else {
+ content.text = "Opening…"
+ content.textProperties.color = .secondaryLabel
+ let spinner = UIActivityIndicatorView(style: .medium)
+ spinner.startAnimating()
+ accessories = [.customView(configuration: .init(customView: spinner, placement: .trailing()))]
+ }
+ case .turnOnICloud:
+ content.text = "Turn On iCloud Drive"
+ content.secondaryText = "Keep notebooks in iCloud to use them on all your devices."
+ content.image = UIImage(systemName: "icloud")
+ content.textProperties.color = .tintColor
+ case .newInCloud:
+ content.text = "New Notebook…"
+ content.image = UIImage(systemName: "plus")
+ content.textProperties.color = .tintColor
+ case .newNotebook, .openFolder, .connect:
+ content.text =
+ item == .newNotebook ? "New Notebook…" : item == .openFolder ? "Open Folder…" : "Connect to Server…"
+ content.image = UIImage(
+ systemName: item == .newNotebook ? "plus" : item == .openFolder ? "folder" : "server.rack")
+ content.textProperties.color = .tintColor
+ }
+ cell.contentConfiguration = content
+ cell.accessories = accessories
+ }
+
+ private func menu(for notebook: Notebook) -> UIMenu {
+ var actions = [
+ UIAction(title: "New Section…", image: UIImage(systemName: "plus.rectangle.portrait")) {
+ [weak self] _ in self?.newSection(in: notebook)
+ },
+ UIAction(title: "Tags Summary", image: UIImage(systemName: "tag")) { [weak self] _ in
+ guard let self else { return }
+ (view.window?.windowScene?.delegate as? SceneDelegate)?.showTags(of: notebook, from: self)
+ },
+ ]
+ // A notebook On My iPhone is its folder there, handled as Files handles a folder.
+ guard let folder = folder(of: notebook) else {
+ let image = UIImage(systemName: "xmark.circle")
+ let close = UIAction(title: "Close Notebook", image: image, attributes: .destructive) { [weak self] _ in
+ Notebooks.remove(notebook)
+ self?.reload()
+ }
+ return UIMenu(children: actions + [close])
+ }
+ let file = [
+ UIAction(title: "Rename…", image: UIImage(systemName: "pencil")) { [weak self] _ in
+ self?.rename(folder, of: notebook)
+ },
+ UIAction(title: "Duplicate", image: UIImage(systemName: "plus.square.on.square")) { [weak self] _ in
+ self?.duplicate(folder, of: notebook)
+ },
+ UIAction(title: "Share…", image: UIImage(systemName: "square.and.arrow.up")) { [weak self] _ in
+ self?.share(folder, from: notebook)
+ },
+ UIAction(title: "Show in Files", image: UIImage(systemName: "folder")) { _ in
+ // Files opens the folder a `shareddocuments` URL names.
+ if let url = URL(string: "shareddocuments://" + folder.path) { UIApplication.shared.open(url) }
+ },
+ ]
+ let delete = UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
+ [weak self] _ in self?.delete(folder, of: notebook)
+ }
+ return UIMenu(children: [
+ UIMenu(options: .displayInline, children: actions), UIMenu(options: .displayInline, children: file), delete,
+ ])
+ }
+
+ private func swipeActions(for notebook: Notebook, at indexPath: IndexPath) -> [UIContextualAction] {
+ guard let folder = folder(of: notebook) else {
+ let close = UIContextualAction(style: .destructive, title: "Close") { [weak self] _, _, done in
+ Notebooks.remove(notebook)
+ self?.reload()
+ done(true)
+ }
+ close.image = UIImage(systemName: "xmark.circle")
+ return [close]
+ }
+ let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, done in
+ self?.delete(folder, of: notebook)
+ done(true)
+ }
+ delete.image = UIImage(systemName: "trash")
+ let share = UIContextualAction(style: .normal, title: "Share") { [weak self] _, _, done in
+ self?.share(folder, from: notebook)
+ done(true)
+ }
+ share.image = UIImage(systemName: "square.and.arrow.up")
+ share.backgroundColor = .systemBlue
+ return [delete, share]
+ }
+
+ /// The notebook's folder or section file On My iPhone; nil for one opened elsewhere.
+ private func folder(of notebook: Notebook) -> URL? {
+ guard case .documents(let path) = notebook.source else { return nil }
+ return documentsDirectory.appendingPathComponent(path)
+ }
+
+ /// Publishes the notebook's edits and lets go of it, closing any section of it shown,
+ /// then runs `act`; refuses with why while an edit can't be published, as moving the
+ /// folder then would strand it.
+ private func close(_ notebook: Notebook, refusing title: String, then act: @escaping () -> Void) {
+ for scene in UIApplication.shared.connectedScenes {
+ (scene.delegate as? SceneDelegate)?.close(notebook)
+ }
+ guard let handle = notebook.handle else { return act() }
+ let pointer = Int(bitPattern: handle)
+ background({ () -> String? in
+ var error: UnsafeMutablePointer?
+ let closed = sb_library_close(OpaquePointer(bitPattern: pointer), 10, &error)
+ let problem = take(error)
+ return closed ? nil : problem ?? ""
+ }) { [weak self] problem in
+ if let problem {
+ self?.refuse(title, problem)
+ return
+ }
+ notebook.pause()
+ act()
+ }
+ }
+
+ private func rename(_ folder: URL, of notebook: Notebook) {
+ let alert = UIAlertController(title: "Rename", message: nil, preferredStyle: .alert)
+ let isFile = folder.pathExtension.lowercased() == "one"
+ let rename = UIAlertAction(title: "Rename", style: .default) { [weak self, weak alert] _ in
+ let name = alert?.textFields?.first?.text?.trimmingCharacters(in: .whitespaces) ?? ""
+ let target = folder.deletingLastPathComponent().appendingPathComponent(
+ isFile ? name + "." + folder.pathExtension : name)
+ guard target != folder else { return }
+ guard !FileManager.default.fileExists(atPath: target.path) else {
+ self?.refuse("“\(name)” Already Exists", "Choose a different name.")
+ return
+ }
+ self?.close(notebook, refusing: "Can’t Rename") {
+ do {
+ try FileManager.default.moveItem(at: folder, to: target)
+ _ = sb_notebook_moved(cacheDirectory.path, folder.path, target.path, nil)
+ } catch {
+ self?.refuse("Can’t Rename", error.localizedDescription)
+ }
+ self?.rescan()
+ }
+ }
+ alert.addTextField { field in
+ field.text = folder.deletingPathExtension().lastPathComponent
+ field.autocapitalizationType = .words
+ field.clearButtonMode = .whileEditing
+ NotificationCenter.default.addObserver(
+ forName: UITextField.textDidChangeNotification, object: field, queue: .main
+ ) { _ in
+ let name = (field.text ?? "").trimmingCharacters(in: .whitespaces)
+ rename.isEnabled = !name.isEmpty && !name.hasPrefix(".") && !name.contains("/")
+ }
+ }
+ alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+ alert.addAction(rename)
+ alert.preferredAction = rename
+ present(alert, animated: true)
+ }
+
+ /// Copies the notebook beside itself, named as Files names a duplicate.
+ private func duplicate(_ folder: URL, of notebook: Notebook) {
+ // The copy takes what the open sections have stored.
+ for section in Section.all where section.notebook === notebook && !section.flush(10) {
+ return refuse("Can’t Duplicate", "Some changes haven’t been saved to the notebook yet.")
+ }
+ let base = folder.deletingPathExtension().lastPathComponent
+ let ext = folder.pathExtension
+ var copy = folder
+ for n in 2... {
+ let name = base + " \(n)"
+ copy = folder.deletingLastPathComponent().appendingPathComponent(ext.isEmpty ? name : name + "." + ext)
+ if !FileManager.default.fileExists(atPath: copy.path) { break }
+ }
+ let target = copy
+ background({ () -> String? in
+ do { try FileManager.default.copyItem(at: folder, to: target) } catch { return error.localizedDescription }
+ return nil
+ }) { [weak self] problem in
+ if let problem { self?.refuse("Can’t Duplicate", problem) }
+ self?.rescan()
+ }
+ }
+
+ private func share(_ folder: URL, from notebook: Notebook) {
+ let sheet = UIActivityViewController(activityItems: [folder], applicationActivities: nil)
+ if let popover = sheet.popoverPresentationController {
+ if let indexPath = dataSource.indexPath(for: .notebook(notebook.id)),
+ let cell = collectionView.cellForItem(at: indexPath)
+ {
+ popover.sourceView = cell
+ popover.sourceRect = cell.bounds
+ } else {
+ popover.sourceView = view
+ }
+ }
+ present(sheet, animated: true)
+ }
+
+ /// Moves the notebook to Recently Deleted, or, where the system keeps none, removes it
+ /// once confirmed.
+ private func delete(_ folder: URL, of notebook: Notebook) {
+ close(notebook, refusing: "Can’t Delete") { [weak self] in self?.remove(folder, of: notebook) }
+ }
+
+ private func remove(_ folder: URL, of notebook: Notebook) {
+ if (try? FileManager.default.trashItem(at: folder, resultingItemURL: nil)) != nil {
+ return rescan()
+ }
+ let name = folder.deletingPathExtension().lastPathComponent
+ let alert = UIAlertController(
+ title: "Delete “\(name)”?", message: "This notebook will be deleted immediately. You can’t undo this action.",
+ preferredStyle: .alert)
+ alert.addAction(UIAlertAction(title: "Cancel", style: .cancel) { [weak self] _ in
+ notebook.open { self?.reload() }
+ })
+ alert.addAction(UIAlertAction(title: "Delete", style: .destructive) { [weak self] _ in
+ do { try FileManager.default.removeItem(at: folder) } catch {
+ self?.refuse("Can’t Delete", error.localizedDescription)
+ }
+ self?.rescan()
+ })
+ present(alert, animated: true)
+ }
+
+ override func collectionView(
+ _ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint
+ ) -> UIContextMenuConfiguration? {
+ guard indexPaths.count == 1, case .notebook(let id) = dataSource.itemIdentifier(for: indexPaths[0]),
+ let notebook = notebook(id)
+ else { return nil }
+ return UIContextMenuConfiguration(actionProvider: { [weak self] _ in self?.menu(for: notebook) })
+ }
+
+ override func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+ guard let item = dataSource.itemIdentifier(for: indexPath) else { return false }
+ switch item {
+ case .section(let id, let path):
+ return notebook(id)?.tabs.first(where: { $0.path == path })?.readable == true
+ case .status(let id):
+ guard let notebook = notebook(id), notebook.problem != nil else { return false }
+ let spinner = UIActivityIndicatorView(style: .medium)
+ spinner.startAnimating()
+ (collectionView.cellForItem(at: indexPath) as? UICollectionViewListCell)?.accessories = [
+ .customView(configuration: .init(customView: spinner, placement: .trailing()))
+ ]
+ notebook.open { [weak self] in self?.reload() }
+ case .notebook, .group:
+ // The row opens and closes, as a folder of Files' sidebar does.
+ guard let location = dataSource.sectionIdentifier(for: indexPath.section) else { return false }
+ var list = dataSource.snapshot(for: location)
+ if list.isExpanded(item) {
+ list.collapse([item])
+ collapsed.insert(item)
+ } else {
+ list.expand([item])
+ collapsed.remove(item)
+ }
+ dataSource.apply(list, to: location)
+ case .newNotebook: newNotebook(inCloud: false)
+ case .newInCloud: newNotebook(inCloud: true)
+ case .turnOnICloud:
+ if let settings = URL(string: UIApplication.openSettingsURLString) { UIApplication.shared.open(settings) }
+ case .openFolder: openFolder()
+ case .connect: connect()
+ case .location: break
+ }
+ return false
+ }
+
+ override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+ guard case .section(let id, let path) = dataSource.itemIdentifier(for: indexPath), let notebook = notebook(id),
+ let tab = notebook.tabs.first(where: { $0.path == path })
else { return }
- tableView.selectRow(at: IndexPath(row: row, section: section), animated: false, scrollPosition: .none)
+ onOpen?(tab, notebook)
}
private func add(_ notebook: Notebook) {
@@ -102,7 +533,66 @@ final class NotebooksViewController: UITableViewController, UIDocumentPickerDele
}
}
- private func openFromFiles() {
+ /// Creates a notebook in iCloud Drive or On My iPhone, as OneNote's New Notebook does, and
+ /// opens it.
+ private func newNotebook(inCloud: Bool) {
+ guard let author = Author.name else {
+ return Author.ask(from: self) { [weak self] in self?.newNotebook(inCloud: inCloud) }
+ }
+ let alert = UIAlertController(title: "New Notebook", message: nil, preferredStyle: .alert)
+ let create = UIAlertAction(title: "Create", style: .default) { [weak self, weak alert] _ in
+ let name = alert?.textFields?.first?.text?.trimmingCharacters(in: .whitespaces) ?? ""
+ self?.create(name, by: author, inCloud: inCloud)
+ }
+ create.isEnabled = false
+ alert.addTextField { field in
+ field.placeholder = "Name"
+ field.autocapitalizationType = .words
+ NotificationCenter.default.addObserver(
+ forName: UITextField.textDidChangeNotification, object: field, queue: .main
+ ) { _ in
+ let name = (field.text ?? "").trimmingCharacters(in: .whitespaces)
+ create.isEnabled = !name.isEmpty && !name.hasPrefix(".") && !name.contains("/")
+ }
+ }
+ alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+ alert.addAction(create)
+ alert.preferredAction = create
+ present(alert, animated: true)
+ }
+
+ private func create(_ name: String, by author: String, inCloud: Bool) {
+ let place = inCloud ? ICloud.documents : documentsDirectory
+ guard let folder = place?.appendingPathComponent(name) else { return }
+ guard !FileManager.default.fileExists(atPath: folder.path) else {
+ return refuse("“\(name)” Already Exists", "Choose a different name.")
+ }
+ let (date, time) = titleDate()
+ background({ () -> String? in
+ var error: UnsafeMutablePointer?
+ let made = sb_notebook_create(folder.path, cacheDirectory.path, author, date, time, &error)
+ let problem = take(error)
+ return made ? nil : problem ?? ""
+ }) { [weak self] problem in
+ guard let self else { return }
+ if let problem { return refuse("Can’t Create Notebook", problem) }
+ if !inCloud && !Notebooks.showsOnDevice { Notebooks.showsOnDevice = true }
+ rescan { [weak self] notebook in
+ guard notebook.source == (inCloud ? .icloud(path: name) : .documents(path: name)),
+ let tab = notebook.tabs.first(where: \.readable)
+ else { return }
+ self?.onOpen?(tab, notebook)
+ }
+ }
+ }
+
+ private func refuse(_ title: String, _ message: String) {
+ let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+ alert.addAction(UIAlertAction(title: "OK", style: .default))
+ present(alert, animated: true)
+ }
+
+ private func openFolder() {
let picker = UIDocumentPickerViewController(
forOpeningContentTypes: [.folder, UTType(filenameExtension: "one") ?? .data])
picker.delegate = self
@@ -145,109 +635,6 @@ final class NotebooksViewController: UITableViewController, UIDocumentPickerDele
})
present(alert, animated: true)
}
-
- override func numberOfSections(in tableView: UITableView) -> Int { items.count }
-
- override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
- items[section].count
- }
-
- override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
- let notebook = Notebooks.all[section]
- var title = UIButton.Configuration.plain()
- title.title = notebook.name
- title.image = UIImage(systemName: "ellipsis.circle")
- title.imagePlacement = .trailing
- title.imagePadding = 6
- title.contentInsets = NSDirectionalEdgeInsets(top: 8, leading: 4, bottom: 4, trailing: 4)
- title.baseForegroundColor = .label
- title.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer {
- var attributes = $0
- attributes.font = UIFont.preferredFont(forTextStyle: .title3).withTraits(.traitBold)
- return attributes
- }
- let button = UIButton(configuration: title)
- button.contentHorizontalAlignment = .leading
- button.showsMenuAsPrimaryAction = true
- button.menu = UIMenu(children: [
- UIAction(title: "New Section…", image: UIImage(systemName: "plus.rectangle.portrait")) {
- [weak self] _ in self?.newSection(in: notebook)
- },
- UIAction(title: "Tags Summary", image: UIImage(systemName: "tag")) { [weak self] _ in
- guard let self else { return }
- (view.window?.windowScene?.delegate as? SceneDelegate)?.showTags(of: notebook, from: self)
- },
- UIAction(title: "Close Notebook", image: UIImage(systemName: "xmark.circle"), attributes: .destructive) {
- [weak self] _ in
- Notebooks.remove(notebook)
- self?.reload()
- },
- ])
- return button
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = tableView.dequeueReusableCell(withIdentifier: "row", for: indexPath)
- var content = cell.defaultContentConfiguration()
- cell.accessoryType = .none
- cell.selectionStyle = .none
- cell.accessoryView = nil
- switch items[indexPath.section][indexPath.row] {
- case .group(let name, let depth):
- content.text = name
- content.image = UIImage(systemName: "folder")
- content.textProperties.color = .secondaryLabel
- content.directionalLayoutMargins.leading += CGFloat(depth) * 20
- case .section(let tab, let depth):
- content.text = tab.name
- content.image = UIImage(systemName: tab.readable ? "rectangle.portrait.fill" : "lock.fill")
- content.imageProperties.tintColor = tab.uiColor
- content.directionalLayoutMargins.leading += CGFloat(depth) * 20
- if tab.readable {
- cell.accessoryType = .disclosureIndicator
- cell.selectionStyle = .default
- } else {
- content.secondaryText = "Can’t be opened here"
- content.textProperties.color = .secondaryLabel
- }
-
- case .opening:
- content.text = "Opening…"
- content.textProperties.color = .secondaryLabel
- let spinner = UIActivityIndicatorView(style: .medium)
- spinner.startAnimating()
- cell.accessoryView = spinner
- case .problem(let problem):
- content.text = "Can’t Open Notebook"
- content.secondaryText = problem
- content.image = UIImage(systemName: "exclamationmark.triangle")
- content.imageProperties.tintColor = .systemOrange
- cell.accessoryView = UIImageView(image: UIImage(systemName: "arrow.clockwise"))
- cell.selectionStyle = .default
- }
- cell.contentConfiguration = content
- return cell
- }
-
- override func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
- switch items[indexPath.section][indexPath.row] {
- case .section(let tab, _): tab.readable ? indexPath : nil
- case .problem: indexPath
- default: nil
- }
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let notebook = Notebooks.all[indexPath.section]
- switch items[indexPath.section][indexPath.row] {
- case .section(let tab, _): onOpen?(tab, notebook)
- case .problem:
- items[indexPath.section] = [.opening]
- tableView.reloadSections([indexPath.section], with: .none)
- notebook.open { [weak self] in self?.reload() }
- default: break
- }
- }
}
extension UIFont {
@@ -308,6 +695,16 @@ final class PagesViewController: UITableViewController {
navigationController?.setToolbarHidden(true, animated: false)
}
+ /// Lets go of the section shown, as when its notebook goes.
+ func clear() {
+ section = nil
+ items = []
+ title = nil
+ tableView.reloadData()
+ contentUnavailableConfiguration = nil
+ navigationController?.setToolbarHidden(true, animated: false)
+ }
+
func failed(_ tab: Tab, _ problem: String?) {
var empty = UIContentUnavailableConfiguration.empty()
empty.text = "Can’t Open Section"
diff --git a/apps/ios/Snowbound/Notebooks.swift b/apps/ios/Snowbound/Notebooks.swift
index b5d364c00d259efd0e411d0f5f82a5fce993db43..dd3ffcc6b8dd515facf23b2db79ade74ca685020 100644
--- a/apps/ios/Snowbound/Notebooks.swift
+++ b/apps/ios/Snowbound/Notebooks.swift
@@ -109,6 +109,8 @@ enum Source: Codable, Equatable {
case files(bookmark: Data)
/// A folder in the app's Documents, which Files shows as Snowbound's.
case documents(path: String)
+ /// A folder in Snowbound's folder in iCloud Drive (`ICloud.documents`).
+ case icloud(path: String)
/// A notebook folder on an SMB share, opened through Snowbound's own client.
case server(Server)
/// A folder or section at an absolute path, for scripted runs.
@@ -124,6 +126,12 @@ struct Tab: Decodable, Equatable {
let group: String
let color: [UInt8]
let readable: Bool
+ /// Not on this device yet; `Notebook` asks iCloud Drive for it.
+ let downloading: Bool
+ /// The section this file copies, which opens instead.
+ let copy: String?
+ /// Why the file could not be read, where retrying or repair may help.
+ let problem: String?
var uiColor: UIColor {
UIColor(red: CGFloat(color[0]) / 255, green: CGFloat(color[1]) / 255, blue: CGFloat(color[2]) / 255, alpha: 1)
@@ -150,7 +158,8 @@ let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .
/// An open notebook: its Rust library and the sections it lists.
final class Notebook {
- let id: UUID
+ /// A UUID, or `Documents/` and the folder's name for a notebook On My iPhone.
+ let id: String
let source: Source
private(set) var name: String
private(set) var handle: OpaquePointer?
@@ -161,8 +170,12 @@ final class Notebook {
private var accessed: URL?
/// Reports other apps' changes to a folder on this device to the library.
private var presenter: FolderPresenter?
+ /// Lists the sections again while iCloud Drive downloads some.
+ private var recheck: DispatchWorkItem?
+ /// Posted on the main thread when the sections list again on their own.
+ static let listed = Notification.Name("NotebookListed")
- init(id: UUID = UUID(), name: String, source: Source) {
+ init(id: String = UUID().uuidString, name: String, source: Source) {
self.id = id
self.name = name
self.source = source
@@ -205,6 +218,16 @@ final class Notebook {
let url = documentsDirectory.appendingPathComponent(path)
let library = sb_library_open(url.path, cacheDirectory.path, true, &error)
return (library, nil, take(error), url)
+ case .icloud(let path):
+ guard let url = ICloud.documents?.appendingPathComponent(path) else {
+ return (nil, nil, "Turn on iCloud Drive in Settings to open this notebook.", nil)
+ }
+ var library: OpaquePointer?
+ var coordination: NSError?
+ NSFileCoordinator().coordinate(readingItemAt: url, options: [], error: &coordination) { url in
+ library = sb_library_open(url.path, cacheDirectory.path, false, &error)
+ }
+ return (library, nil, take(error) ?? coordination?.localizedDescription, url)
case .path(let path):
let url = URL(fileURLWithPath: path)
let local = onThisDevice(url)
@@ -233,7 +256,8 @@ final class Notebook {
var location: String {
switch source {
case .files: "In Files"
- case .documents: "On this \(UIDevice.current.model), in Snowbound’s folder"
+ case .documents: "On My \(UIDevice.current.model), in Snowbound’s folder"
+ case .icloud: "In iCloud Drive"
case .server(let server):
"smb://\(server.host)/\([server.share, server.root].filter { !$0.isEmpty }.joined(separator: "/"))"
case .path(let path): path
@@ -249,9 +273,51 @@ final class Notebook {
let pointer = Int(bitPattern: handle)
background({ decode([Tab].self, sb_library_sections(OpaquePointer(bitPattern: pointer))) }) { [self] tabs in
if let tabs { self.tabs = tabs }
+ download()
done()
}
}
+
+ /// Asks iCloud Drive for the notebook files it keeps elsewhere, which iOS lists as
+ /// `.Name.icloud`, and lists the sections again until they arrive.
+ private func download() {
+ let folder: URL? =
+ switch source {
+ case .files: accessed
+ case .documents(let path): documentsDirectory.appendingPathComponent(path)
+ case .icloud(let path): ICloud.documents?.appendingPathComponent(path)
+ case .path(let path): URL(fileURLWithPath: path)
+ case .server: nil
+ }
+ guard let folder, recheck == nil,
+ let files = FileManager.default.enumerator(at: folder, includingPropertiesForKeys: nil)
+ else { return }
+ var waiting = false
+ for case let stub as URL in files where stub.lastPathComponent.hasPrefix(".") && stub.pathExtension == "icloud" {
+ let name = String(stub.deletingPathExtension().lastPathComponent.dropFirst())
+ let file = stub.deletingLastPathComponent().appendingPathComponent(name)
+ try? FileManager.default.startDownloadingUbiquitousItem(at: file)
+ waiting = true
+ }
+ guard waiting else { return }
+ let recheck = DispatchWorkItem { [weak self] in
+ self?.recheck = nil
+ self?.reload { NotificationCenter.default.post(name: Self.listed, object: self) }
+ }
+ self.recheck = recheck
+ DispatchQueue.main.asyncAfter(deadline: .now() + 5, execute: recheck)
+ }
+
+ /// Stops hearing other apps' writes while in the background, where a suspended presenter
+ /// can deadlock their coordinated writes.
+ func pause() { presenter?.stop() }
+
+ /// Hears other apps' writes again, and checks the sections and their list for those
+ /// missed meanwhile.
+ func resume() {
+ presenter?.resume()
+ reload { NotificationCenter.default.post(name: Self.listed, object: self) }
+ }
}
/// Whether `url` is kept on this device, rather than by a file provider that keeps it elsewhere
@@ -281,7 +347,12 @@ final class FolderPresenter: NSObject, NSFilePresenter {
NSFileCoordinator.addFilePresenter(self)
}
- /// Stops reporting, before the library goes.
+ func resume() {
+ NSFileCoordinator.addFilePresenter(self)
+ touched("")
+ }
+
+ /// Stops reporting, before the library goes or the app leaves the foreground.
func stop() {
NSFileCoordinator.removeFilePresenter(self)
presentedItemOperationQueue.waitUntilAllOperationsAreFinished()
@@ -290,6 +361,8 @@ final class FolderPresenter: NSObject, NSFilePresenter {
func presentedItemDidChange() { touched("") }
func presentedSubitemDidChange(at url: URL) { touched(url) }
func presentedSubitemDidAppear(at url: URL) { touched(url) }
+ /// Another device's commit that lost in iCloud Drive, which changes no file.
+ func presentedSubitem(at url: URL, didGain version: NSFileVersion) { touched(url) }
func presentedSubitem(at oldURL: URL, didMoveTo newURL: URL) {
touched(oldURL)
touched(newURL)
@@ -309,59 +382,132 @@ final class FolderPresenter: NSObject, NSFilePresenter {
}
}
-/// The notebooks the list shows, kept across launches.
+/// The notebooks the list shows: those in Documents, and those opened from elsewhere, kept
+/// across launches.
enum Notebooks {
private struct Entry: Codable {
- let id: UUID
+ let id: String
let name: String
let source: Source
}
private static let key = "notebooks"
- private(set) static var all: [Notebook] = []
+ private static let hidden = "hidesOnDevice"
+ private static let scripted = ProcessInfo.processInfo.environment["SNOWBOUND_NOTEBOOK"]
+ /// The folders and sections in Documents, as On My iPhone lists them.
+ private(set) static var onDevice: [Notebook] = []
+ /// The folders in Snowbound's folder in iCloud Drive.
+ private(set) static var inCloud: [Notebook] = []
+ private(set) static var elsewhere: [Notebook] = []
+ static var all: [Notebook] { inCloud + onDevice + elsewhere }
- /// The kept notebooks, or on first launch a copy of the bundled sample in Documents.
+ /// Whether the list shows On My iPhone, as Files lets a location be hidden.
+ static var showsOnDevice: Bool {
+ get { scripted == nil && !UserDefaults.standard.bool(forKey: hidden) }
+ set { UserDefaults.standard.set(!newValue, forKey: hidden) }
+ }
+
+ /// The kept notebooks and those in Documents, where the bundled sample goes on first launch.
static func load() {
- if let path = ProcessInfo.processInfo.environment["SNOWBOUND_NOTEBOOK"] {
- all = [Notebook(name: URL(fileURLWithPath: path).deletingPathExtension().lastPathComponent, source: .path(path))]
+ if let scripted {
+ elsewhere = [
+ Notebook(
+ name: URL(fileURLWithPath: scripted).deletingPathExtension().lastPathComponent,
+ source: .path(scripted))
+ ]
return
}
if let data = UserDefaults.standard.data(forKey: key),
let entries = try? JSONDecoder().decode([Entry].self, from: data)
{
- all = entries.map { Notebook(id: $0.id, name: $0.name, source: $0.source) }
- return
+ elsewhere = entries.compactMap { entry in
+ switch entry.source {
+ case .documents, .icloud: return nil
+ default: break
+ }
+ return Notebook(id: entry.id, name: entry.name, source: entry.source)
+ }
+ } else {
+ let sample = documentsDirectory.appendingPathComponent("Sample")
+ if !FileManager.default.fileExists(atPath: sample.path),
+ let bundled = Bundle.main.url(forResource: "notebook", withExtension: nil)
+ {
+ try? FileManager.default.copyItem(at: bundled, to: sample)
+ }
+ // The notebook the first version remembered from Files.
+ if let bookmark = UserDefaults.standard.data(forKey: "notebook") {
+ var stale = false
+ let name = (try? URL(resolvingBookmarkData: bookmark, bookmarkDataIsStale: &stale))?
+ .deletingPathExtension().lastPathComponent
+ elsewhere.append(Notebook(name: name ?? "Notebook", source: .files(bookmark: bookmark)))
+ }
+ save()
}
- let sample = documentsDirectory.appendingPathComponent("Sample")
- if !FileManager.default.fileExists(atPath: sample.path),
- let bundled = Bundle.main.url(forResource: "notebook", withExtension: nil)
- {
- try? FileManager.default.copyItem(at: bundled, to: sample)
+ scan()
+ }
+
+ /// Lists Documents again, keeping the notebooks still there; returns those new to the list.
+ @discardableResult
+ static func scan() -> [Notebook] {
+ guard showsOnDevice else {
+ onDevice = []
+ return []
}
- all = [Notebook(name: "Sample", source: .documents(path: "Sample"))]
- // The notebook the first version remembered from Files.
- if let bookmark = UserDefaults.standard.data(forKey: "notebook") {
- var stale = false
- let name = (try? URL(resolvingBookmarkData: bookmark, bookmarkDataIsStale: &stale))?
- .deletingPathExtension().lastPathComponent
- all.append(Notebook(name: name ?? "Notebook", source: .files(bookmark: bookmark)))
+ var added: [Notebook] = []
+ onDevice = notebooks(in: documentsDirectory).map { name in
+ if let kept = onDevice.first(where: { $0.id == "Documents/" + name }) { return kept }
+ let notebook = Notebook(
+ id: "Documents/" + name, name: (name as NSString).deletingPathExtension, source: .documents(path: name))
+ added.append(notebook)
+ return notebook
}
- save()
+ return added
+ }
+
+ /// Lists Snowbound's folder in iCloud Drive again, as `scan` lists Documents; none while
+ /// iCloud Drive is off.
+ @discardableResult
+ static func scanICloud() -> [Notebook] {
+ guard let folder = ICloud.documents, scripted == nil else {
+ inCloud = []
+ return []
+ }
+ var added: [Notebook] = []
+ inCloud = notebooks(in: folder).map { name in
+ if let kept = inCloud.first(where: { $0.id == "iCloud/" + name }) { return kept }
+ let notebook = Notebook(
+ id: "iCloud/" + name, name: (name as NSString).deletingPathExtension, source: .icloud(path: name))
+ added.append(notebook)
+ return notebook
+ }
+ return added
+ }
+
+ /// The notebook folders and section files in `folder`, by name, as Files orders them.
+ private static func notebooks(in folder: URL) -> [String] {
+ let listed = try? FileManager.default.contentsOfDirectory(
+ at: folder, includingPropertiesForKeys: [.isDirectoryKey], options: .skipsHiddenFiles)
+ return (listed ?? []).filter { url in
+ (try? url.resourceValues(forKeys: [.isDirectoryKey]).isDirectory) == true
+ || url.pathExtension.lowercased() == "one"
+ }
+ .map(\.lastPathComponent)
+ .sorted { $0.localizedStandardCompare($1) == .orderedAscending }
}
static func add(_ notebook: Notebook) {
- all.append(notebook)
+ elsewhere.append(notebook)
save()
}
static func remove(_ notebook: Notebook) {
- all.removeAll { $0 === notebook }
+ elsewhere.removeAll { $0 === notebook }
save()
}
private static func save() {
- guard ProcessInfo.processInfo.environment["SNOWBOUND_NOTEBOOK"] == nil else { return }
- let entries = all.map { Entry(id: $0.id, name: $0.name, source: $0.source) }
+ guard scripted == nil else { return }
+ let entries = elsewhere.map { Entry(id: $0.id, name: $0.name, source: $0.source) }
UserDefaults.standard.set(try? JSONEncoder().encode(entries), forKey: key)
}
}
diff --git a/apps/ios/Snowbound/Script.swift b/apps/ios/Snowbound/Script.swift
index 0a482a79748dbc4750e11cc6a71d7eaa0aa0eea4..e48f4e36679deea2b141ec39aed7a3daceab0ed8 100644
--- a/apps/ios/Snowbound/Script.swift
+++ b/apps/ios/Snowbound/Script.swift
@@ -38,9 +38,11 @@ extension CanvasView {
let values = argument.split(separator: ",").compactMap { Double($0) }
tap(at: CGPoint(x: values[0] + contentOffset.x, y: values[1] + contentOffset.y))
case "pencil":
+ // Points as `x,y`, or `x,y,pressure` for the Pencil's pressure from 0 to 1.
let points = argument.split(separator: ";").map {
let values = $0.split(separator: ",").compactMap { Double($0) }
- return CGPoint(x: values[0] + contentOffset.x, y: values[1] + contentOffset.y)
+ let point = CGPoint(x: values[0] + contentOffset.x, y: values[1] + contentOffset.y)
+ return (point, values.count > 2 ? Float(values[2]) : -1) as InkSample
}
inkPressed(points[0])
inkMoved(points.dropFirst())
@@ -80,6 +82,12 @@ extension CanvasView {
case "rotate":
let orientation: UIInterfaceOrientationMask = argument == "portrait" ? .portrait : .landscapeRight
window?.windowScene?.requestGeometryUpdate(.iOS(interfaceOrientations: orientation))
+ case "menu":
+ guard let range = selectedTextRange,
+ let menu = interactions.lazy.compactMap({ $0 as? UIEditMenuInteraction }).first(where: { $0.delegate === self })
+ else { break }
+ let caret = caretRect(for: range.start)
+ menu.presentEditMenu(with: UIEditMenuConfiguration(identifier: nil, sourcePoint: CGPoint(x: caret.midX, y: caret.minY)))
case "done": _ = resignFirstResponder()
case "selectall": selectAll(nil)
case "format": apply(UInt8(argument) ?? 0)
diff --git a/apps/ios/Snowbound/Sync.swift b/apps/ios/Snowbound/Sync.swift
index cfa00d2b66d77a6bce55ab999f586967638f25be..6aa4f2e6b783952d0964f578acdd170ae7b5f3ba 100644
--- a/apps/ios/Snowbound/Sync.swift
+++ b/apps/ios/Snowbound/Sync.swift
@@ -3,7 +3,7 @@ import UIKit
/// A section's sync status from `sb_library_sync_status`.
struct SectionSync: Decodable {
enum State: UInt8, Decodable, Comparable {
- case upToDate, syncing, inUse, notConnected, readOnly, failed
+ case upToDate, syncing, inUse, notConnected, readOnly, protected, unreadable, failed
static func < (a: State, b: State) -> Bool { a.rawValue < b.rawValue }
}
@@ -55,6 +55,8 @@ enum Sync {
case .syncing: "Syncing…"
case .inUse: "Section in use"
case .notConnected: "Not connected"
+ case .protected: "Password protected"
+ case .unreadable: "Can’t read this section"
case .readOnly, .failed: "Unable to sync"
}
}
@@ -65,7 +67,8 @@ enum Sync {
case .upToDate: "checkmark.circle"
case .syncing, .inUse: "arrow.triangle.2.circlepath"
case .notConnected: "wifi.slash"
- case .readOnly, .failed: "exclamationmark.triangle"
+ case .protected: "lock"
+ case .readOnly, .unreadable, .failed: "exclamationmark.triangle"
}
}
@@ -77,6 +80,7 @@ enum Sync {
case .readOnly: "You can’t change this notebook where it’s stored. Changes stay on this \(device)."
case .inUse: "Someone else is saving this section. Sync continues when they finish."
case .notConnected: "Changes stay on this \(device) and sync when the notebook is back."
+ case .protected: "Snowbound can’t open password-protected sections yet."
default: nil
}
}
diff --git a/arc/canvas.md b/arc/canvas.md
index d9649cde3a02bdc6d6abf5e91cd1f7d695164361..32c122e2ec6ef4a68d23f648437bec0d57f3eac1 100644
--- a/arc/canvas.md
+++ b/arc/canvas.md
@@ -106,15 +106,40 @@ on the page itself, as OneNote 2010 places it: the same column at the caret's
grid point, outside any outline. It selects, drags on the grid, deletes and
moves with Insert Space as a picture does, and opens and saves as above.
+An outline holding only pictures or files takes a paragraph after them where a
+click beside them lands, as OneNote 2010 adds one when typing there. It is
+stored with the first edit that reaches it, and undoing back to it empty takes it
+out again (`corpus/object-outline`).
+
+A file printout's pages are pictures whose stored data is the printout's XPS
+package. The page draws the PNG OneNote rendered of each
+(WebPictureContainer14), framed in grey as OneNote frames them, and moves them as
+pictures. Snowbound does not write XPS, so a printout page deleted and brought
+back by undo returns as that picture (`corpus/printout`).
+
## Recordings
-Record Audio works as OneNote 2010's does. The caret's paragraph splits around
-a line saying when recording started, in OneNote's grey `cite` style, and the
-caret goes on below it. Text written while recording links to the moment it
-was written. On Stop, the file goes in above that line, named after the page.
-Hovering a linked note or a recording shows OneNote's blue play button in the
-margin, and a click asks the host to play from that moment. The host records a
-16 kHz WAV and stores it as IMA ADPCM, which OneNote plays.
+Record Audio and Record Video work as OneNote 2010's do. The caret's paragraph
+splits around a line saying when recording started, in OneNote's grey `cite`
+style, and the caret goes on below it. Text written while recording links to
+the moment it was written; text written while paused links to nothing, and the
+pause is left out of later moments. On Stop, the file goes in above that line,
+named after the page. Hovering a linked note or a recording shows OneNote's blue
+play button in the margin, and a click asks the host to play from five seconds
+before that moment, OneNote's default rewind. While a recording plays, See
+Playback highlights the note linked last at or before the moment playing,
+scrolling it into view when it changes.
+
+The host records audio as 16 kHz WAV and stores it as IMA ADPCM, and video as
+AVI of Motion JPEG at 320 by 240 and 15 pictures a second with PCM sound, both
+of which OneNote plays (`corpus/recording/video`). GStreamer writes that AVI
+directly; on macOS a capture session records a movie that `AVAssetReader` reads
+back into it off the main thread after Stop, the transport saying so and the page
+editable meanwhile. Mac OS X 10.6, without AVFoundation, opens recordings in the
+system's player and does not record. Snowbound plays both itself: the sound through the platform's
+player, decoded from IMA ADPCM first, and a video's pictures in the transport
+over the page, which also carries OneNote's Pause, Stop, ten-second and
+ten-minute skips, Seek To and See Playback.
## Drawing
@@ -133,6 +158,23 @@ click on ink picks it. The default pen draws in the open section's accent at
the light theme's shade, so a stroke stores one real colour and shows it in both
themes.
+A pen that reports pressure (a tablet on macOS, the Apple Pencil) draws and stores it as
+OneNote 2010 does with pressure sensitivity on: each point's width is the pen's times
+0.25 plus 1.5 times the pressure, and the stroke keeps NormalPressure beside X and Y
+(`corpus/ink-pressure`). A mouse or finger draws at the pen's width.
+
+## Tables and selections across them
+
+Note tags on a table sit in the tag column centred on it, and a click checks its
+box (`corpus/table-tags`). A selection crossing a table's edge deletes as
+OneNote 2010 deletes one: nothing joins across the edge, cells inside are
+emptied, and where the selection runs on past the table its rows inside go, the
+table with them when all do. What replaces the selection goes in at its start
+(`corpus/cross-container`). Tab and Link leave such a selection alone, and
+Shift+Enter a caret inside a link, as OneNote's do; Alt+= across paragraphs
+makes each paragraph's part an equation, and a deletion between two equations
+joins them where neither seam lies inside an object (`corpus/equation-join`).
+
## Content the editor doesn't understand
Nothing is lost for being unfamiliar. A paragraph the canvas can't draw
@@ -158,8 +200,24 @@ editable text area, whose runs carry the canvas's real line boxes and
character positions, so a screen reader's caret and selection land where the
eye does. Native selection and replacement actions go through the editor's
history like any other edit. The tree updates only while an assistive client
-is listening, and never for a caret blink. The interface kit around the page
-doesn't have a tree yet.
+is listening, and never for a caret blink. The interface's own tree holds it at
+the page's box (see [the interface kit](ui.md#accessibility-and-the-keyboard)).
+
+## Spelling
+
+Spelling is checked as OneNote 2010 checks it with its default proofing
+options. Words in capitals, words with digits, and Internet and file addresses
+go unchecked, and a word repeating the one before it is marked as repeated.
+Each run is checked in the language it stores, so a French paragraph takes the
+French dictionary and an equation none. The host supplies the dictionary;
+`canvas::spelling` checks each paragraph on a thread of its own when it first
+comes into view, and keeps the result by the paragraph's text, so drawing never
+waits on it. Marked words carry OneNote's red zigzag, one pixel thick at any
+zoom and laid on the device's pixel grid so a 1× screen shows OneNote's exact
+pixels, except the word still being typed. The context menu (the edit menu on
+iOS) offers the dictionary's corrections, Ignore and Add to Dictionary, and the
+Spelling pane (F7) walks the page's marked words. A correction is an ordinary
+edit, one revision. Nothing about spelling is stored in the page.
## Search, dates, conflicts
diff --git a/arc/file-format.md b/arc/file-format.md
index 93c4b0a6ad1a24a6a439e9cd114793bf46c97ca3..2b85e489fb14427f56db24b84f9fc0dba0be1098 100644
--- a/arc/file-format.md
+++ b/arc/file-format.md
@@ -169,9 +169,12 @@ MS-ONESTORE and MS-ONE are good, but they are not the whole truth:
note to a moment in a recording. Ink and math were reverse-engineered, each
against an independent oracle. For ink, the stroke extents from OneNote's own
export, and for the Draw tab's pens, highlighters and shapes, the objects
- OneNote stored while drawing them in the lab (`corpus/ink-tools`). For math, the MathML it exports, matched byte for byte. Recordings
+ OneNote stored while drawing them in the lab (`corpus/ink-tools`), and for pressure,
+ its PDF export of strokes it took in from ISF (`corpus/ink-pressure`). For math, the MathML it exports, matched byte for byte. Recordings
and their links follow what OneNote stored while recording in the lab, read
- back through its XML export (`corpus/recording`). Embedded objects are read
+ back through its XML export (`corpus/recording`); OneNote lists attached
+ .avi, .mpg and .wmv files as video recordings but not .mp4 or .mov, so video
+ is stored as Motion JPEG AVI, which it plays. Embedded objects are read
and kept, but never authored.
Readers stay tolerant (files in the wild are older, odder, or written by other
diff --git a/arc/platforms.md b/arc/platforms.md
index 60ab0848199c82f66a7c3e2a7ba8e80145b410f2..f16b196bb09af1475dcc24ce19e86da7006bfb52 100644
--- a/arc/platforms.md
+++ b/arc/platforms.md
@@ -22,7 +22,8 @@ page inside it. `snowbound` picks a platform module at compile time
(`macos.rs` or `linux.rs`, both mounted as `platform`), and everything else
in the crate is shared: library and settings, the sidebar, menus, page and
section management, templates, and screenshot and replay support.
-Accessibility for the page goes through AccessKit's winit adapter on both.
+Accessibility goes through AccessKit's winit adapter on both: the interface's
+tree, with the page's grafted into it.
`commands.rs` is the one table of commands: each one's title, its chords on
macOS and elsewhere, when it is enabled or checked, and what it does. The
keyboard, the toolbar and the macOS menu bar all run commands from it.
@@ -41,13 +42,16 @@ keyboard, the toolbar and the macOS menu bar all run commands from it.
sidebar take the system's desktop tint, appearance and focus state exactly.
- AppKit supplies the open and save panels, alerts, the date picker, date
formatting for new page titles and conflict labels, the account's full name
- (used as the author, as OneNote uses Office's user name), and the caret and
- selection colours.
+ (used as the author, as OneNote uses Office's user name), the caret and
+ selection colours, and the spell checker, `NSSpellChecker`, which the
+ spelling thread calls on the main thread (10.6 has it too).
- Frames present inside Core Animation's transaction, so a resize pairs each
frame with the window's new size instead of stretching the last one.
- A notebook on a mounted SMB share is opened through the embedded SMB client,
signed in with the password the keychain keeps for that mount (see
- [sync](sync.md) for why the mount itself isn't enough).
+ [sync](sync.md) for why the mount itself isn't enough). Open Notebook from Server… reaches one
+ by address instead, and keeps a password it asks to remember as the Finder does, an
+ SMB internet password.
- The menu bar (`menubar.rs`) is laid out as OneNote for Mac's. Its items are
the command table's, validated from the statuses each frame publishes, and
their key equivalents are the table's chords, so AppKit takes a chord the
@@ -75,11 +79,20 @@ keyboard, the toolbar and the macOS menu bar all run commands from it.
The desktop is read once from `XDG_CURRENT_DESKTOP`; elsewhere the kit's own.
- zenity or kdialog provide the pickers and alerts. The XDG settings portal
provides the colour scheme. Text conventions come from the C library's
- locale. Fontconfig is loaded at run time, so builds need no headers for it.
+ locale. Fontconfig is loaded at run time, so builds need no headers for it,
+ and so is Enchant, which checks spelling with whatever dictionaries its
+ providers have; without it, words go unmarked.
- Wayland's clipboard goes through the window's own connection, since not every
compositor offers a clipboard to clients without a window.
-- `crates/snowbound/linux` packages a tarball, plus an installer that adds the
- launcher entry the Wayland desktop needs to find the icon.
+- The executable carries its desktop entry and icon (`desktop_linux.rs`). The
+ window is `net.paperclover.snowbound` to Wayland and X11 alike. Where a
+ Wayland compositor lacks xdg-toplevel-icon, as GNOME's does, it finds the
+ icon only through an entry of that name, so a run that isn't installed
+ writes a hidden one pointing at an icon in the runtime folder, marked with
+ its process ID, and removes both on exit or at the next start after a crash.
+ KWin takes the icon from the window. Install on the welcome copies the
+ executable to `~/.local/bin` and writes the visible entry under the same
+ name, so the menu never lists two; Uninstall in Options removes it.
### Windows and older macOS
@@ -114,7 +127,8 @@ owns everything around the page:
No `ui` crate ships on iOS. Everything below the view is the desktop's code:
`notebook::session` with its replica and background publishing, the embedded
SMB client (credentials kept in the Keychain, as Files keeps its own), conflict
-pages, search, and page management through the same ops. Notebooks from Files
+pages, search, spelling (through `UITextChecker`), and page management through
+the same ops. Notebooks from Files
are read and written under `NSFileCoordinator`, so file providers see every
change.
diff --git a/arc/sync.md b/arc/sync.md
index 2af29a078d9b78b3e5099a8606311ff3d5a7ace6..930a6a91e0de20580f30a54ce0b8e2c3e0dbe5de 100644
--- a/arc/sync.md
+++ b/arc/sync.md
@@ -159,6 +159,13 @@ A notebook on a share that macOS has mounted is opened through the embedded
client with the account the system keeps for that mount. It falls back to the
mount only when it can't sign in that way.
+A notebook can also be opened from its server's address, with no mount at all (File ▸
+Open Notebook from Server…), which is how Mac OS X 10.6 reaches a server that no longer
+speaks SMB1, the only version its Finder has. The notebook is kept by that address
+(`smb://[domain;]user@server/share/folder`), never with a password; the password lives in
+the keychain (the Secret Service on Linux) when the user asks to remember it, and
+otherwise the sign-in asks again at the next launch.
+
A file's identity is its root object space, not its server file ID, which
changes when maintenance replaces the file. A check opens by path each time
for the same reason.
@@ -228,6 +235,46 @@ copies and learns of other apps' writes through file coordination (`NSFilePresen
file provider keeps elsewhere, as iCloud Drive does, keeps copies and is checked every 15
seconds. Closing a notebook deletes its copies, except any with edits still waiting.
+## iCloud Drive
+
+A cloud drive syncs whole files with no lock and no compare-and-swap. The stamp check still runs
+before each append, but only against this device's copy; when two devices append to the same
+base, iCloud keeps one as the file and the other beside it as a **conflict version**
+(`NSFileVersion`), on every device. A conflict version is a stamp check that failed after the
+fact, and each sync step merges the versions it finds before anything else:
+
+```text
+for each version V the remote lists (Remote::versions)
+ C := the file, read coordinated
+ per space of V: a := its newest revision C holds, or holds merged
+ ancestor := V opened at those revisions (Section::open_at)
+ ops := lower_page(ancestor[S], V[S]) per page V changed, V's new pages imported under their
+ identities, its deletions, moves and conflict pages
+ replay ops on C through merge.rs (conflict pages where they clash), seal_as the named
+ revisions, publish on C's stamp; then retire V (resolved, removed)
+```
+
+Each revision the merge writes is named after the version's revision it merged (a hash of it),
+so "holds merged" is a lookup by revision identity. A version merged once, by this device or
+another, merges as nothing the next time; two devices merging one version at once write the
+same names, and the merge of their two results finds everything held. Any device merges any
+version at once; nothing waits for the device that wrote it. A version of another section, or
+one that cannot be read, is kept beside the file as `Name (Device).one` instead.
+
+On a cloud drive every read and write of a section file runs under `NSFileCoordinator`, so the
+iCloud daemon never swaps a file between the stamp check and the append. A file iCloud evicted is
+asked for and read later; the replica serves it meanwhile. Each publication is an upload and a
+chance to conflict, so edits wait for a 3 second pause in typing (at most 30 seconds,
+`Section::set_pause`), and publish at once when the app leaves the foreground, the screen locks,
+the Mac's window loses focus or the app quits. A folder presenter reports other devices'
+changes and conflict versions, which change no file, and every section is checked every 15
+seconds besides. Signing out of iCloud closes its notebooks; replicas holding edits stay.
+
+`crates/notebook/tests/cloud.rs` runs devices against a fake iCloud (uploads without
+compare-and-swap, either side of a race winning, late deliveries, offline spans) and checks that
+every device ends on the same file with each typed string once. OneNote 2010 cold-opens a
+merged section with its conflict page as its own (`corpus/icloud-merge`).
+
## Notebook structure
Sections, groups and the notebook's own colour live in the `.onetoc2` files,
@@ -237,6 +284,13 @@ parent TOC's identity and a CRC of the file's name). Without them OneNote
treats the file as a stranger and re-identifies it. Deleting sends sections and
pages to `OneNote_RecycleBin`, as OneNote does.
+What only Snowbound reads lives in the notebook's `.snowbound` folder, which carries the
+Windows hidden attribute so that OneNote never makes a section group of it. Its files are
+plain files, not revision stores: pictures named by their content, and small JSON
+mappings that every writer merges before replacing. The first is tag art: a tag keeps
+OneNote's definition and a fallback symbol on the page, and `tags.json` maps its name and
+symbol to a picture that Snowbound draws in the symbol's place.
+
## Recovery and migration
`export_recovery` snapshots a replica into a single read-only archive: base and
diff --git a/arc/ui.md b/arc/ui.md
index 8c9749f5a91599285930b57b5f6b42f8a3fa1215..0003b469f76087a3996f7a1d86046b92de3a68d8 100644
--- a/arc/ui.md
+++ b/arc/ui.md
@@ -25,8 +25,9 @@ frame-rate independent, a retargeted animation continues smoothly from where
it is, and it settles fast. Popups open and close on short timed curves,
slow enough to follow: a menu swings out of the pointer or its button as it
fades in, a combo's field widens into its list, and a dialog swings up into
-place over a dimmed window, as Windows opens a window; the command palette swings
-in the same way near the window's top. On GNOME and KDE, menus instead
+place near the window's top over a dimmed window, as Windows opens a window; the
+command palette swings in the same way, undimmed. A filtered list shows its new
+results at once. On GNOME and KDE, menus instead
look and move as the desktop's own (see [platforms](platforms.md)).
## Why not native widgets
@@ -85,7 +86,7 @@ frame N
are built each frame and the solver picks, so a group folds in the frame the
window narrows, with no widths remembered or worked out by the app. A folded
group is a dropdown of the same command-table rows, and a gallery it lists
- opens under it, since a folded-away box takes its group's rectangle. The
+ opens beside its row as a submenu, on hover, Right or a click. The
section tabs scroll sideways past the row's room, fading out where cut.
- **Nothing runs while nothing changes.** The kit reports whether it wants
another frame (queued input, an animation still settling) and when a timed
@@ -106,6 +107,51 @@ has the OneNote-specific controls: section tabs and compact toolbar buttons.
The kit doesn't know what a notebook is. `snowbound` assembles the window from
these parts.
+## Accessibility and the keyboard
+
+The interface presents itself to assistive technology as an AccessKit tree
+built from the same boxes as the frame. A box with a `Spec::role` is a node;
+the kit's widgets choose their own, and `Ui::access` adds states, values and
+names to any box. A box without a role lets its children through, and its
+text reads as a label.
+
+- **Names come from what a sighted user reads.** A control without one is
+ named by its text and its children's, or by its tooltip: the title names
+ it, the chord becomes its shortcut, and the description its description.
+ An icon button's command-table title is its name, and a split button's arrow
+ is that name with "Options", so no two toolbar controls share one.
+- **Popups are menus and dialogs.** A menu's highlighted row is the focus
+ within it, so arrows read as they move; a palette is a dialog whose field
+ keeps the focus while its list's selection moves. Opening a popup moves the
+ focus into it, and closing it gives the focus back. A command menu opens at
+ its top with nothing highlighted; a value picker (fonts, sizes, a combo's
+ list) opens on its current value.
+- **Actions are input.** A press or a new value from assistive technology
+ arrives as an event and is answered next frame, as a click would be.
+- **Only changes are sent**, and only while something listens.
+
+The page keeps its own tree (see [canvas](canvas.md#accessibility)). The
+host grafts it at the page's box, sending the interface's tree first, since
+it holds the graft, then the page's.
+
+```text
+Window
+├─ Toolbar buttons named by their tooltips, combos with their values
+├─ TabList section tabs
+├─ Group "Page" the page's own tree, grafted
+├─ TabList page tabs
+└─ Menu | Dialog open popups
+```
+
+The keyboard reaches the same controls. Tab steps through them, within an
+open popup or across the window; a toolbar, tab list or tree is one step,
+entered at its selected control, and arrows move within it. F6 steps between
+those groups and the page, as Windows and GTK step between panes, and on
+macOS Control-F5 goes to the toolbar. Space or Enter presses, Escape closes a
+popup or returns the focus to where the keyboard took it from, and the
+focused control wears a ring until the pointer is used. The page keeps Tab
+for itself, so F6 leaves it.
+
## `draw`: the renderer
`draw` is a small wgpu renderer. A frame is a list of layers, each with its
@@ -142,6 +188,7 @@ repaint, cache eviction and a new renderer must all produce identical pixels.
A covered window gets no redraws, so interaction is scripted.
`SNOWBOUND_REPLAY` feeds the app a file of pointer, key, wait and snapshot
-steps. `--screenshot` draws the whole window offscreen in each appearance
+steps, and `accessibility` steps that write the whole window's tree as text, so a
+hidden window's tree can be checked without a screen reader. `--screenshot` draws the whole window offscreen in each appearance
(the README's screenshots are made this way). `ui`'s own tests build frames
headlessly and assert on layout, routing and signals.
diff --git a/corpus/cross-container/README.md b/corpus/cross-container/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..855e37f653acbf01ddae973d57a410e1a8458f6e
--- /dev/null
+++ b/corpus/cross-container/README.md
@@ -0,0 +1,20 @@
+# Deleting across a table's edge
+
+`native/` is OneNote 2010 authoring `tools/native/pages.ps1` input: four pages in
+`Cross.one`, each "Before text", a two-by-two table and "After text".
+
+`keys/` is `tools/native_cross_container.py` pressing the same keys in OneNote 2010 on
+that notebook: a selection from "Before" into the first cell deleted, one from the
+second cell out to "After" deleted and "X" typed, one from "Before" over the first row
+into "Beta one" typed over with "Y", and one from "Before" over the whole table deleted.
+OneNote joins nothing across the table's edge, empties cells inside the selection, and
+where the selection runs on past the table removes its rows inside, and the table when
+all of them are.
+
+`candidate/` is the output of `deleting_across_a_tables_edge_keeps_each_side` in
+`crates/canvas/tests/cross_container.rs`, the same edits through the editor, each
+published as its own revision; `cold/` is a fresh OneNote 2010 read of it, whose pages
+read as `keys/` does. `tools/test_cross_container.py` checks this without a VM.
+Regenerate with `SNOWBOUND_CROSS_CONTAINER_EXPORT` set to a new absolute directory while
+running the test, then cold-open it with
+`tools/native_runner.py OUTPUT COLD --expected-pages 4 --collect-notebook --screenshots`.
diff --git a/corpus/cross-container/candidate/Cross.one b/corpus/cross-container/candidate/Cross.one
new file mode 100644
index 0000000000000000000000000000000000000000..0a08c2c77bbeffb5deda86f156e796bd66197f4d
Binary files /dev/null and b/corpus/cross-container/candidate/Cross.one differ
diff --git a/corpus/cross-container/candidate/Open Notebook.onetoc2 b/corpus/cross-container/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..65283aaf76a0f783f269c7ca5523837d5bc4521c
Binary files /dev/null and b/corpus/cross-container/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/cross-container/cold/commands.jsonl b/corpus/cross-container/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..458a6c58e6be3b7984f242c326decb22d0d0f58e
--- /dev/null
+++ b/corpus/cross-container/cold/commands.jsonl
@@ -0,0 +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-CE2F338C -ExpectedPages 4 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 4 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/cross-container/cold/machine.json b/corpus/cross-container/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..c2cb152b1c1c46d2f07504b3b7e53c97ebd85fac
--- /dev/null
+++ b/corpus/cross-container/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-ce2f338c", "hostname": "ONE-M6-CE2F338C"}
diff --git a/corpus/cross-container/cold/notebook/Cross.one b/corpus/cross-container/cold/notebook/Cross.one
new file mode 100644
index 0000000000000000000000000000000000000000..b2a370707f31115b9c571c4fbf249dc06ba8f7f2
Binary files /dev/null and b/corpus/cross-container/cold/notebook/Cross.one differ
diff --git a/corpus/cross-container/cold/notebook/Open Notebook.onetoc2 b/corpus/cross-container/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..ef5ab08cf26a74cfaa67557174fa169a44eddf61
Binary files /dev/null and b/corpus/cross-container/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/cross-container/cold/read/environment.json b/corpus/cross-container/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed7670ea8665885ec1ef8487b2e1979cbc1e9df4
--- /dev/null
+++ b/corpus/cross-container/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-CE2F338C",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/cross-container/cold/read/hierarchy.xml b/corpus/cross-container/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce6f50600cc71313d8c82a903654a62ce2d2656f
--- /dev/null
+++ b/corpus/cross-container/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/cold/read/page-000.navigation.json b/corpus/cross-container/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb1f9c3957987bccacb1d9028cbeeb66f5ba7c8c
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete a whole table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/cold/read/page-000.png b/corpus/cross-container/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c9c5581d9a9fbef9d62d2fb0ecbe0069eeec0fb
Binary files /dev/null and b/corpus/cross-container/cold/read/page-000.png differ
diff --git a/corpus/cross-container/cold/read/page-000.xml b/corpus/cross-container/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12cca3a770268dbab5cf836affac50dbe4a1d099
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/cold/read/page-001.navigation.json b/corpus/cross-container/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..cd1c5e98266d1d9e59b5eac98957dac7a2a7b8dc
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Type over a row - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/cold/read/page-001.png b/corpus/cross-container/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1200e24688f87bdd6f8ab0661dd241101e720ba
Binary files /dev/null and b/corpus/cross-container/cold/read/page-001.png differ
diff --git a/corpus/cross-container/cold/read/page-001.xml b/corpus/cross-container/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c357be3f300f68d16b99a814b055abb397ecc727
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/cold/read/page-002.navigation.json b/corpus/cross-container/cold/read/page-002.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..c290d163970aa32a6e9af2b27353a0d97f37e9e0
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-002.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete into a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/cold/read/page-002.png b/corpus/cross-container/cold/read/page-002.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1677f1a1609064a96bc636cc86e8495e10696f6
Binary files /dev/null and b/corpus/cross-container/cold/read/page-002.png differ
diff --git a/corpus/cross-container/cold/read/page-002.xml b/corpus/cross-container/cold/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e715d96a728021587b0341a19d18350e4f4245e
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/cold/read/page-003.navigation.json b/corpus/cross-container/cold/read/page-003.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3f5eaba4943cb1eb03f5e8198e76b8b08215a6f
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-003.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete out of a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/cold/read/page-003.png b/corpus/cross-container/cold/read/page-003.png
new file mode 100644
index 0000000000000000000000000000000000000000..934c2ff1ed177176d836044773cb21e807fb8dfe
Binary files /dev/null and b/corpus/cross-container/cold/read/page-003.png differ
diff --git a/corpus/cross-container/cold/read/page-003.xml b/corpus/cross-container/cold/read/page-003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6fcc3e6952a198edd56a3469536f43cfd21dbac
--- /dev/null
+++ b/corpus/cross-container/cold/read/page-003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/cold/read/payloads.json b/corpus/cross-container/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/cross-container/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/cross-container/cold/run.json b/corpus/cross-container/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8e882026e2e92f351855b3d8db58c074d1336a0
--- /dev/null
+++ b/corpus/cross-container/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/cross-candidate",
+ "expected_pages": 4,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/cross-container/cold/scripts/cold.ps1 b/corpus/cross-container/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/cross-container/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/cross-container/cold/scripts/read.ps1 b/corpus/cross-container/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/cross-container/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/cross-container/cold/source.json b/corpus/cross-container/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..614bd2f45ebe0258917a1cd43d257ca81648409b
--- /dev/null
+++ b/corpus/cross-container/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Cross.one",
+ "bytes": 36880,
+ "sha256": "c799433c13b9d28d6b302e70c50a5cfaad91ed1ad6324ee288ac4394a4f4b749",
+ "mtime_ns": 1790741247924484176
+ },
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "335f7cd71e022c2f7447d6369ff1cad37aaba9294b3942850f8e1ca739cb9dd7",
+ "mtime_ns": 1790741247924820969
+ }
+]
diff --git a/corpus/cross-container/cold/teardown.json b/corpus/cross-container/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/cross-container/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/cross-container/keys/before-read/environment.json b/corpus/cross-container/keys/before-read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..cd3d47ff72d297c4ca81b2af23d8fe284d8488f9
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-407884AD",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/cross-container/keys/before-read/hierarchy.xml b/corpus/cross-container/keys/before-read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5a064dbae9213a6e15351f2befbf320720e7cb0
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/page-000.xml b/corpus/cross-container/keys/before-read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..390ce5d979769a6830add2d171a119707560901b
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/page-001.xml b/corpus/cross-container/keys/before-read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9532172dccd5829e59dae269741a2630097ab759
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/page-002.xml b/corpus/cross-container/keys/before-read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..847da2a48bc87e50c875a40fa22dc37ef5fb0656
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/page-003.xml b/corpus/cross-container/keys/before-read/page-003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42f4aa1371be5f24fb43af2e5f8588e5dd72e57b
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/page-003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/page-004.xml b/corpus/cross-container/keys/before-read/page-004.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817e8c0a7a85e4ce82c267b7a48d295b3e79f9b2
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/page-004.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/before-read/payloads.json b/corpus/cross-container/keys/before-read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/cross-container/keys/before-read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/cross-container/keys/commands.jsonl b/corpus/cross-container/keys/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..59bf83bd407f6f6ca633ddd8f2a20a409c349a11
--- /dev/null
+++ b/corpus/cross-container/keys/commands.jsonl
@@ -0,0 +1,6 @@
+{"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-407884AD -ExpectedPages -1 -KeepOpen", "exit": 0, "stdout": "Read 2 sections and 5 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}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "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-407884AD -UseCurrentCache -ExpectedPages -1", "exit": 0, "stdout": "Read 2 sections and 5 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/cross-container/keys/delete-a-whole-table.ahk b/corpus/cross-container/keys/delete-a-whole-table.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..7ccdb11d0020c9cfbc576f669f0dbd4038a3a7ce
--- /dev/null
+++ b/corpus/cross-container/keys/delete-a-whole-table.ahk
@@ -0,0 +1,15 @@
+ComObject("OneNote.Application").NavigateTo("{244ECF19-31A6-09AC-0E75-6B09C5A98D32}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+Click(160, 236)
+Sleep(500)
+Send("{Home}{Right 6}")
+Sleep(300)
+Send("+{Right 49}")
+Sleep(500)
+Send("{Delete}")
+Sleep(2000)
diff --git a/corpus/cross-container/keys/delete-a-whole-table.json b/corpus/cross-container/keys/delete-a-whole-table.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb1f9c3957987bccacb1d9028cbeeb66f5ba7c8c
--- /dev/null
+++ b/corpus/cross-container/keys/delete-a-whole-table.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete a whole table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/keys/delete-a-whole-table.png b/corpus/cross-container/keys/delete-a-whole-table.png
new file mode 100644
index 0000000000000000000000000000000000000000..29f5b5b2b15de3e82386a4fa89069731dd0851e5
Binary files /dev/null and b/corpus/cross-container/keys/delete-a-whole-table.png differ
diff --git a/corpus/cross-container/keys/delete-into-a-table.ahk b/corpus/cross-container/keys/delete-into-a-table.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..8bf951fc03b970bf8309993566318fffe66dc2ec
--- /dev/null
+++ b/corpus/cross-container/keys/delete-into-a-table.ahk
@@ -0,0 +1,15 @@
+ComObject("OneNote.Application").NavigateTo("{559E950C-23E1-0225-2FE4-0B4CE99F3B33}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+Click(160, 236)
+Sleep(500)
+Send("{Home}{Right 6}")
+Sleep(300)
+Send("+{Right 11}")
+Sleep(500)
+Send("{Delete}")
+Sleep(2000)
diff --git a/corpus/cross-container/keys/delete-into-a-table.json b/corpus/cross-container/keys/delete-into-a-table.json
new file mode 100644
index 0000000000000000000000000000000000000000..c290d163970aa32a6e9af2b27353a0d97f37e9e0
--- /dev/null
+++ b/corpus/cross-container/keys/delete-into-a-table.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete into a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/keys/delete-into-a-table.png b/corpus/cross-container/keys/delete-into-a-table.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5771b10a366e8a06d0428db19657b140f7349a
Binary files /dev/null and b/corpus/cross-container/keys/delete-into-a-table.png differ
diff --git a/corpus/cross-container/keys/delete-out-of-a-table.ahk b/corpus/cross-container/keys/delete-out-of-a-table.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..887f90db611d36f6efdd8d2c1eaf5e93bc48132b
--- /dev/null
+++ b/corpus/cross-container/keys/delete-out-of-a-table.ahk
@@ -0,0 +1,17 @@
+ComObject("OneNote.Application").NavigateTo("{ACACC717-6A3B-0805-30CA-3CFD22E4E788}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+Click(250, 260)
+Sleep(500)
+Send("{Home}{Right 5}")
+Sleep(300)
+Send("+{Right 28}")
+Sleep(500)
+Send("{Delete}")
+Sleep(500)
+SendText("X")
+Sleep(2000)
diff --git a/corpus/cross-container/keys/delete-out-of-a-table.json b/corpus/cross-container/keys/delete-out-of-a-table.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3f5eaba4943cb1eb03f5e8198e76b8b08215a6f
--- /dev/null
+++ b/corpus/cross-container/keys/delete-out-of-a-table.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete out of a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/keys/delete-out-of-a-table.png b/corpus/cross-container/keys/delete-out-of-a-table.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9b150d8d9bcd4e20b20a967f044736eb1b0890
Binary files /dev/null and b/corpus/cross-container/keys/delete-out-of-a-table.png differ
diff --git a/corpus/cross-container/keys/machine.json b/corpus/cross-container/keys/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..93000cb2885f392e6f9d78e13001bbf2322c9875
--- /dev/null
+++ b/corpus/cross-container/keys/machine.json
@@ -0,0 +1 @@
+{"name": "m6-407884ad", "hostname": "ONE-M6-407884AD"}
diff --git a/corpus/cross-container/keys/notebook/Cross.one b/corpus/cross-container/keys/notebook/Cross.one
new file mode 100644
index 0000000000000000000000000000000000000000..791d0cf408951e3c5b3df0b34253cdd377f40719
Binary files /dev/null and b/corpus/cross-container/keys/notebook/Cross.one differ
diff --git a/corpus/cross-container/keys/notebook/Open Notebook.onetoc2 b/corpus/cross-container/keys/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..ca240337153bb01012080f129258a6f736046f19
Binary files /dev/null and b/corpus/cross-container/keys/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/cross-container/keys/notebook/fixture.json b/corpus/cross-container/keys/notebook/fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..03dc309779f1612431bba1c1c210294778a3b743
--- /dev/null
+++ b/corpus/cross-container/keys/notebook/fixture.json
@@ -0,0 +1,23 @@
+{
+ "sections": [
+ "Cross.one"
+ ],
+ "pages": [
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/corpus/cross-container/keys/notebook/synthetic.one b/corpus/cross-container/keys/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..0828a11acf7ea1c65579afe0c3111335fc0b7c7a
Binary files /dev/null and b/corpus/cross-container/keys/notebook/synthetic.one differ
diff --git a/corpus/cross-container/keys/read/environment.json b/corpus/cross-container/keys/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..b436dbda4826141b17f62aaecf542a99daebd996
--- /dev/null
+++ b/corpus/cross-container/keys/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-407884AD",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/cross-container/keys/read/hierarchy.xml b/corpus/cross-container/keys/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3daacbc2f3bba6852632c69ca3ccc36085a59451
--- /dev/null
+++ b/corpus/cross-container/keys/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/page-000.xml b/corpus/cross-container/keys/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c87d5c84d8f043cc03034d81d2944dbc61bb1596
--- /dev/null
+++ b/corpus/cross-container/keys/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/page-001.xml b/corpus/cross-container/keys/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69883ecd85374c7feb8773a7ed1fc55b48159601
--- /dev/null
+++ b/corpus/cross-container/keys/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/page-002.xml b/corpus/cross-container/keys/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c0c238639db56bce97a3398ac0e0e0376795d579
--- /dev/null
+++ b/corpus/cross-container/keys/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/page-003.xml b/corpus/cross-container/keys/read/page-003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c69c3ac7f7a77f656dd52321950ed9bed7428e59
--- /dev/null
+++ b/corpus/cross-container/keys/read/page-003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/page-004.xml b/corpus/cross-container/keys/read/page-004.xml
new file mode 100644
index 0000000000000000000000000000000000000000..659839ce1be09ff5badfc4b1e99fbbe9fa1ff5a8
--- /dev/null
+++ b/corpus/cross-container/keys/read/page-004.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/keys/read/payloads.json b/corpus/cross-container/keys/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/cross-container/keys/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/cross-container/keys/run.json b/corpus/cross-container/keys/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..42fcc169ff4172c4c2448d70f84a4ebdac416e17
--- /dev/null
+++ b/corpus/cross-container/keys/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/Users/clo/dev/one/corpus/cross-container/native/notebook",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/cross-container/keys/scripts/cold.ps1 b/corpus/cross-container/keys/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/cross-container/keys/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/cross-container/keys/scripts/read.ps1 b/corpus/cross-container/keys/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/cross-container/keys/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/cross-container/keys/source.json b/corpus/cross-container/keys/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..dab624e1e554442483b8ae6acf56e6ccbc6ed101
--- /dev/null
+++ b/corpus/cross-container/keys/source.json
@@ -0,0 +1,26 @@
+[
+ {
+ "path": "Cross.one",
+ "bytes": 29944,
+ "sha256": "4610b5a0fe24c60532f34b804f7c8f4e8117d408683bfc5a34bec3ef8e011dc9",
+ "mtime_ns": 1790740956459211068
+ },
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 3900,
+ "sha256": "a47b71ad4f6ab62f9b36a503047304ef787ba51344a52f4ca6b0f9de69912c4a",
+ "mtime_ns": 1790740956459627153
+ },
+ {
+ "path": "fixture.json",
+ "bytes": 4461,
+ "sha256": "f5b2f03775b73d8359d05549134e795cb66f8930990922495003add1a786821c",
+ "mtime_ns": 1790740956454514170
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 3348,
+ "sha256": "2500c5736a2d146b6355e15247705cf3605c465f95d28eb2d74477f4d7b57806",
+ "mtime_ns": 1790740956459996238
+ }
+]
diff --git a/corpus/cross-container/keys/teardown.json b/corpus/cross-container/keys/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/cross-container/keys/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/cross-container/keys/type-over-a-row.ahk b/corpus/cross-container/keys/type-over-a-row.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..2d22692ef17af48665957d2d4be4d743df061e6d
--- /dev/null
+++ b/corpus/cross-container/keys/type-over-a-row.ahk
@@ -0,0 +1,15 @@
+ComObject("OneNote.Application").NavigateTo("{4377D8AC-9263-01FA-0E6A-D7E0B436542E}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+Click(160, 236)
+Sleep(500)
+Send("{Home}{Right 6}")
+Sleep(300)
+Send("+{Right 30}")
+Sleep(500)
+SendText("Y")
+Sleep(2000)
diff --git a/corpus/cross-container/keys/type-over-a-row.json b/corpus/cross-container/keys/type-over-a-row.json
new file mode 100644
index 0000000000000000000000000000000000000000..cd1c5e98266d1d9e59b5eac98957dac7a2a7b8dc
--- /dev/null
+++ b/corpus/cross-container/keys/type-over-a-row.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Type over a row - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/cross-container/keys/type-over-a-row.png b/corpus/cross-container/keys/type-over-a-row.png
new file mode 100644
index 0000000000000000000000000000000000000000..f393cff21695c2f8d0ff773c1863728901540c18
Binary files /dev/null and b/corpus/cross-container/keys/type-over-a-row.png differ
diff --git a/corpus/cross-container/native/commands.jsonl b/corpus/cross-container/native/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..71d5dbdb2ccf807fb096786d630a2dcd1b7913e4
--- /dev/null
+++ b/corpus/cross-container/native/commands.jsonl
@@ -0,0 +1,4 @@
+{"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\\author.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-13E867D1", "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-13E867D1 -ExpectedPages 5 -UseCurrentCache", "exit": 0, "stdout": "Read 2 sections and 5 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/cross-container/native/machine.json b/corpus/cross-container/native/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..81e7e878ebe052306797a156c874d6655d84a85f
--- /dev/null
+++ b/corpus/cross-container/native/machine.json
@@ -0,0 +1 @@
+{"name": "m6-13e867d1", "hostname": "ONE-M6-13E867D1"}
diff --git a/corpus/cross-container/native/notebook/Cross.one b/corpus/cross-container/native/notebook/Cross.one
new file mode 100644
index 0000000000000000000000000000000000000000..e1ad05043ac89949ef40d592743012837bc33dda
Binary files /dev/null and b/corpus/cross-container/native/notebook/Cross.one differ
diff --git a/corpus/cross-container/native/notebook/Open Notebook.onetoc2 b/corpus/cross-container/native/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..ca240337153bb01012080f129258a6f736046f19
Binary files /dev/null and b/corpus/cross-container/native/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/cross-container/native/notebook/fixture.json b/corpus/cross-container/native/notebook/fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..03dc309779f1612431bba1c1c210294778a3b743
--- /dev/null
+++ b/corpus/cross-container/native/notebook/fixture.json
@@ -0,0 +1,23 @@
+{
+ "sections": [
+ "Cross.one"
+ ],
+ "pages": [
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ },
+ {
+ "section": "Cross.one",
+ "xml": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/corpus/cross-container/native/notebook/synthetic.one b/corpus/cross-container/native/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..c88a78fc3ceea793ec2aeea30370f50b305e0753
Binary files /dev/null and b/corpus/cross-container/native/notebook/synthetic.one differ
diff --git a/corpus/cross-container/native/read/environment.json b/corpus/cross-container/native/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fbc9c1443dc7a926187c67ef95f50136f06cef9
--- /dev/null
+++ b/corpus/cross-container/native/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-13E867D1",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/cross-container/native/read/hierarchy.xml b/corpus/cross-container/native/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2107ebfd6681e9d7bac918e2ad1a2768011fe99e
--- /dev/null
+++ b/corpus/cross-container/native/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/page-000.xml b/corpus/cross-container/native/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c6802b779e70fdb5ecf2c50b70870b2469f66e2
--- /dev/null
+++ b/corpus/cross-container/native/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/page-001.xml b/corpus/cross-container/native/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e690342ffb60c036d172ddcabd34e26c95ec8234
--- /dev/null
+++ b/corpus/cross-container/native/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/page-002.xml b/corpus/cross-container/native/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3fc32b5ec84d211f5d0e5a56800bde72ab75fa9
--- /dev/null
+++ b/corpus/cross-container/native/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/page-003.xml b/corpus/cross-container/native/read/page-003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4078b0c61129dc553d476470d31021a9e826d688
--- /dev/null
+++ b/corpus/cross-container/native/read/page-003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/page-004.xml b/corpus/cross-container/native/read/page-004.xml
new file mode 100644
index 0000000000000000000000000000000000000000..776ac8c089d651fccee7bb66f737654110c910c8
--- /dev/null
+++ b/corpus/cross-container/native/read/page-004.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/cross-container/native/read/payloads.json b/corpus/cross-container/native/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/cross-container/native/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/cross-container/native/run.json b/corpus/cross-container/native/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f0a24205c01498bfafb8bd2cedda1a2f1d33eef
--- /dev/null
+++ b/corpus/cross-container/native/run.json
@@ -0,0 +1,19 @@
+{
+ "notebook": "/private/tmp/unsup-lab/cross-input/notebook",
+ "expected_pages": 5,
+ "author": "tools/native/pages.ps1",
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "author.ps1": "dfbf0e016aa4c8486ecea9f39768c633de05ac0db8214139052ca2e9c43bbd02",
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/cross-container/native/scripts/author.ps1 b/corpus/cross-container/native/scripts/author.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..8e428618e3452caa35da88687293b520c273b6c6
--- /dev/null
+++ b/corpus/cross-container/native/scripts/author.ps1
@@ -0,0 +1,42 @@
+param([Parameter(Mandatory=$true)][string]$Root, [Parameter(Mandatory=$true)][string]$CloneHost)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+& "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost
+$fixture = Get-Content (Join-Path $Root 'notebook\fixture.json') -Raw -Encoding UTF8 | ConvertFrom-Json
+$inputs = Join-Path $Root 'inputs'
+New-Item -ItemType Directory -Path $inputs | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+try {
+ $app.OpenHierarchy((Join-Path $Root 'notebook'), '', [ref]$notebookId, 0)
+ $sections = @{}
+ foreach ($path in $fixture.sections) {
+ $parts = $path.Split('/')
+ if (@($parts | Where-Object { $_ -in @('', '.', '..') -or $_.Contains('\') -or $_.Contains(':') }).Count) { throw 'Invalid fixture section path.' }
+ $parent = $notebookId
+ for ($index = 0; $index -lt $parts.Count; $index++) {
+ $id = ''
+ $app.OpenHierarchy($parts[$index], $parent, [ref]$id, $(if ($index -eq $parts.Count - 1) {3} else {2}))
+ $parent = $id
+ }
+ $sections[$path] = $id
+ }
+ $index = 0
+ foreach ($item in $fixture.pages) {
+ $pageId = ''
+ $app.CreateNewPage($sections[$item.section], [ref]$pageId, 0)
+ [xml]$xml = $item.xml.Replace('__ASSETS__', [Security.SecurityElement]::Escape((Join-Path $Root 'notebook\fixture-data')))
+ $xml.DocumentElement.SetAttribute('ID', $pageId)
+ [IO.File]::WriteAllText((Join-Path $inputs ('page-{0:d3}.xml' -f $index)), $xml.OuterXml, [Text.Encoding]::UTF8)
+ $app.UpdatePageContent($xml.OuterXml, [DateTime]::MinValue, 1, $true)
+ $index++
+ }
+ $app.SyncHierarchy($notebookId)
+ $app.CloseNotebook($notebookId, $false)
+ $notebookId = ''
+} finally {
+ if ($notebookId) { $app.CloseNotebook($notebookId, $false) }
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+}
diff --git a/corpus/cross-container/native/scripts/cold.ps1 b/corpus/cross-container/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/cross-container/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/cross-container/native/scripts/read.ps1 b/corpus/cross-container/native/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/cross-container/native/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/cross-container/native/source.json b/corpus/cross-container/native/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3bf5d0fcff1a9c80feecedcbadf682adabdf8d1
--- /dev/null
+++ b/corpus/cross-container/native/source.json
@@ -0,0 +1,20 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1612,
+ "sha256": "fafa5dcb3cd827c7edd30c8ea2fbc957a59fb4d2a8b28b667a3c551c8261ab86",
+ "mtime_ns": 1790740542526906926
+ },
+ {
+ "path": "fixture.json",
+ "bytes": 4461,
+ "sha256": "f5b2f03775b73d8359d05549134e795cb66f8930990922495003add1a786821c",
+ "mtime_ns": 1790740700488051772
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 3348,
+ "sha256": "b0662387c3fdc256d8dbe809e3b8f73b3586559696467fb1fff8f589095fa797",
+ "mtime_ns": 1790740542527105843
+ }
+]
diff --git a/corpus/cross-container/native/teardown.json b/corpus/cross-container/native/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/cross-container/native/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/custom-art/README.md b/corpus/custom-art/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..005ff859a0e06cd178683bcd778e68b965bcd0f8
--- /dev/null
+++ b/corpus/custom-art/README.md
@@ -0,0 +1,19 @@
+# Tags with Snowbound's art
+
+`candidate/` is the notebook `tags_with_art_keep_it_beside_the_page` in
+`crates/snowbound/src/tags.rs` writes: one page whose paragraphs carry "Launch" (a PNG
+chosen for it, OneNote's Yellow Star, 13), "Ship it" (Snowbound's Rocket, OneNote's Plane,
+127), "Done" (the Rocket over a Blue Check Box, 3, checked) and OneNote's own "Important".
+The page stores OneNote definitions only; `.snowbound/tags.json` maps each tag's name and
+symbol to its picture in `.snowbound/tags/`, named by SHA-256.
+
+`cold/` is `tools/native_custom_art.py` in a fresh OneNote 2010 clone: its author script
+gives `.snowbound` the hidden attribute Snowbound sets (the transfer archive drops it),
+`before-read/` is the cold read, which shows each fallback symbol under the tag's name and
+no `.snowbound` section group (`before-read/page-000.png`). OneNote then edits the page
+through COM (`scripts/custom-art-edit.ps1`: new text on "Launch day", "Done" unchecked)
+and syncs; `read/` is the page after, `edited.png` its render, and `sidecar.json` what
+OneNote left of the folder: still hidden, every file as written, no table of contents.
+`tools/test_custom_art.py` and `art_outlasts_onenote_editing_the_page` check this without
+a VM. Regenerate with `SNOWBOUND_CUSTOM_ART_EXPORT` set to a new absolute directory while
+running the test, then `tools/native_custom_art.py OUTPUT COLD`.
diff --git a/corpus/custom-art/candidate/.snowbound/tags.json b/corpus/custom-art/candidate/.snowbound/tags.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d668cee6609727e0b84371b93ef9de7b65857ff
--- /dev/null
+++ b/corpus/custom-art/candidate/.snowbound/tags.json
@@ -0,0 +1,20 @@
+[
+ {
+ "name": "Launch",
+ "shape": 13,
+ "art": "d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png",
+ "mapped": 134352249571937330
+ },
+ {
+ "name": "Ship it",
+ "shape": 127,
+ "art": "6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg",
+ "mapped": 134352249571944730
+ },
+ {
+ "name": "Done",
+ "shape": 3,
+ "art": "6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg",
+ "mapped": 134352249571951950
+ }
+]
\ No newline at end of file
diff --git a/corpus/custom-art/candidate/.snowbound/tags/6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg b/corpus/custom-art/candidate/.snowbound/tags/6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cae23e60726a3a53e36ce9b2c05dfb4bd0e1cc5c
--- /dev/null
+++ b/corpus/custom-art/candidate/.snowbound/tags/6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg
@@ -0,0 +1,13 @@
+
diff --git a/corpus/custom-art/candidate/.snowbound/tags/d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png b/corpus/custom-art/candidate/.snowbound/tags/d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ce05fee7e020e67a47c9ac44e22d82be1d4494
Binary files /dev/null and b/corpus/custom-art/candidate/.snowbound/tags/d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png differ
diff --git a/corpus/custom-art/candidate/Custom art.one b/corpus/custom-art/candidate/Custom art.one
new file mode 100644
index 0000000000000000000000000000000000000000..76726f5f4d21c2eeaa0779d75bd196b333d0c239
Binary files /dev/null and b/corpus/custom-art/candidate/Custom art.one differ
diff --git a/corpus/custom-art/candidate/Open Notebook.onetoc2 b/corpus/custom-art/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..740faf943872391d89c0df030062802b2130838c
Binary files /dev/null and b/corpus/custom-art/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/custom-art/cold/before-read/environment.json b/corpus/custom-art/cold/before-read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b6077fb5a3f84eb1955a660c1b4cc5fef5130ee
--- /dev/null
+++ b/corpus/custom-art/cold/before-read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-FFFFC1C2",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/custom-art/cold/before-read/hierarchy.xml b/corpus/custom-art/cold/before-read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..84d200ac2f78fe70776431b28976730d9ccb0625
--- /dev/null
+++ b/corpus/custom-art/cold/before-read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/custom-art/cold/before-read/page-000.navigation.json b/corpus/custom-art/cold/before-read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f30211c1d306bac53ce0fe70f6bb5a8255cd724f
--- /dev/null
+++ b/corpus/custom-art/cold/before-read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Launch day - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/custom-art/cold/before-read/page-000.png b/corpus/custom-art/cold/before-read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd9b99f2c3cfff66aaa475bd50474cd1616bab7b
Binary files /dev/null and b/corpus/custom-art/cold/before-read/page-000.png differ
diff --git a/corpus/custom-art/cold/before-read/page-000.xml b/corpus/custom-art/cold/before-read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13cdaad67e5b1c85f9820daf064f601e410d37ac
--- /dev/null
+++ b/corpus/custom-art/cold/before-read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/custom-art/cold/before-read/payloads.json b/corpus/custom-art/cold/before-read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/custom-art/cold/before-read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/custom-art/cold/commands.jsonl b/corpus/custom-art/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..4c65bbc88da14d63ecf2a1de94788f84319b0e47
--- /dev/null
+++ b/corpus/custom-art/cold/commands.jsonl
@@ -0,0 +1,8 @@
+{"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\\author.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-FFFFC1C2", "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-FFFFC1C2 -ExpectedPages 1 -UseCurrentCache -KeepOpen", "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}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\custom-art-edit.ps1 -Root C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "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-FFFFC1C2 -UseCurrentCache -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/custom-art/cold/edited.png b/corpus/custom-art/cold/edited.png
new file mode 100644
index 0000000000000000000000000000000000000000..973ac7b9d1c29f52b3a9320068f565c9e96481e9
Binary files /dev/null and b/corpus/custom-art/cold/edited.png differ
diff --git a/corpus/custom-art/cold/machine.json b/corpus/custom-art/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..83bb1ffa1eae37ab6988c447ec249924e184f9f7
--- /dev/null
+++ b/corpus/custom-art/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-ffffc1c2", "hostname": "ONE-M6-FFFFC1C2"}
diff --git a/corpus/custom-art/cold/notebook/Custom art.one b/corpus/custom-art/cold/notebook/Custom art.one
new file mode 100644
index 0000000000000000000000000000000000000000..a397b0b93c285f1b467293e0f10b048e991fa1c7
Binary files /dev/null and b/corpus/custom-art/cold/notebook/Custom art.one differ
diff --git a/corpus/custom-art/cold/notebook/Open Notebook.onetoc2 b/corpus/custom-art/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..6b1f45400d76ffd8b2389e3fb315d6a827e14276
Binary files /dev/null and b/corpus/custom-art/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/custom-art/cold/read/environment.json b/corpus/custom-art/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b6077fb5a3f84eb1955a660c1b4cc5fef5130ee
--- /dev/null
+++ b/corpus/custom-art/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-FFFFC1C2",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/custom-art/cold/read/hierarchy.xml b/corpus/custom-art/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6bc468fc197c482e647fe5e05ce6546b89f43acd
--- /dev/null
+++ b/corpus/custom-art/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/custom-art/cold/read/page-000.xml b/corpus/custom-art/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d8d5b09a1761a18fa5c063eaa8b2462c6cd7cb5
--- /dev/null
+++ b/corpus/custom-art/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/custom-art/cold/read/payloads.json b/corpus/custom-art/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/custom-art/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/custom-art/cold/run.json b/corpus/custom-art/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..fbc7a11ede7cfc87589ba7d89202ef737fa5163f
--- /dev/null
+++ b/corpus/custom-art/cold/run.json
@@ -0,0 +1,19 @@
+{
+ "notebook": "/private/tmp/snowbound-custom-art/candidate",
+ "expected_pages": 1,
+ "author": "/Users/clo/dev/one/tools/native/custom-art.ps1",
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "author.ps1": "fee6de8f8db4c294d9b39f5cf6428fa6031b52b9158470a3f0aeaf82ef64bfa8",
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/custom-art/cold/scripts/author.ps1 b/corpus/custom-art/cold/scripts/author.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..efba77f99a1621c369f3cc3637b8845fd4f225ea
--- /dev/null
+++ b/corpus/custom-art/cold/scripts/author.ps1
@@ -0,0 +1,7 @@
+param([Parameter(Mandatory=$true)][string]$Root, [Parameter(Mandatory=$true)][string]$CloneHost)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+& "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost
+# Snowbound makes its folder hidden, which the transfer's archive does not keep.
+$sidecar = Get-Item -LiteralPath (Join-Path $Root 'notebook\.snowbound') -Force
+$sidecar.Attributes = $sidecar.Attributes -bor [IO.FileAttributes]::Hidden
diff --git a/corpus/custom-art/cold/scripts/cold.ps1 b/corpus/custom-art/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/custom-art/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/custom-art/cold/scripts/custom-art-edit.ps1 b/corpus/custom-art/cold/scripts/custom-art-edit.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..e51bb0b91045ebde096e18f56aec15392d6b5538
--- /dev/null
+++ b/corpus/custom-art/cold/scripts/custom-art-edit.ps1
@@ -0,0 +1,45 @@
+param([Parameter(Mandatory=$true)][string]$Root)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$notebook = Join-Path $Root 'notebook'
+$app = New-Object -ComObject OneNote.Application
+try {
+ $hierarchy = ''
+ $app.GetHierarchy('', 4, [ref]$hierarchy, 1)
+ [xml]$tree = $hierarchy
+ $page = $tree.SelectSingleNode('//*[local-name()="Notebook"][@path="' + $notebook + '"]//*[local-name()="Page"]')
+ if (-not $page) { throw 'The notebook has no page open.' }
+ $content = ''
+ $app.GetPageContent($page.GetAttribute('ID'), [ref]$content, 0, 1)
+ [IO.File]::WriteAllText((Join-Path $Root 'before.xml'), $content, [Text.Encoding]::UTF8)
+ [xml]$xml = $content
+ # OneNote edits the tagged paragraphs: new text on one, the check box of another cleared.
+ foreach ($oe in $xml.SelectNodes('//*[local-name()="OE"]')) {
+ $text = $oe.SelectSingleNode('*[local-name()="T"]')
+ if (-not $text) { continue }
+ if ($text.InnerText -eq 'Launch day') { $text.InnerXml = '' }
+ if ($text.InnerText -eq 'Checked off') {
+ foreach ($tag in $oe.SelectNodes('*[local-name()="Tag"]')) { $tag.SetAttribute('completed', 'false') }
+ }
+ }
+ [IO.File]::WriteAllText((Join-Path $Root 'update.xml'), $xml.OuterXml, [Text.Encoding]::UTF8)
+ $app.UpdatePageContent($xml.OuterXml, [DateTime]::MinValue, 1, $false)
+ $id = $tree.SelectSingleNode('//*[local-name()="Notebook"][@path="' + $notebook + '"]').GetAttribute('ID')
+ $app.SyncHierarchy($id)
+ Start-Sleep -Seconds 5
+} finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+}
+# What OneNote left of Snowbound's folder: its attribute, and each file with its hash.
+$folder = Get-Item -LiteralPath (Join-Path $notebook '.snowbound') -Force
+$files = @(Get-ChildItem -LiteralPath $folder.FullName -Recurse -Force | ForEach-Object {
+ $hash = $null
+ if (-not $_.PSIsContainer) { $hash = (Get-FileHash -Algorithm SHA256 -LiteralPath $_.FullName).Hash.ToLower() }
+ @{ path = $_.FullName.Substring($folder.FullName.Length + 1).Replace('\', '/');
+ attributes = $_.Attributes.ToString(); sha256 = $hash }
+})
+@{ attributes = $folder.Attributes.ToString(); files = $files;
+ notebook = @(Get-ChildItem -LiteralPath $notebook -Force | ForEach-Object { $_.Name }) } |
+ ConvertTo-Json -Depth 4 | Set-Content (Join-Path $Root 'sidecar.json') -Encoding UTF8
diff --git a/corpus/custom-art/cold/scripts/read.ps1 b/corpus/custom-art/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/custom-art/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/custom-art/cold/sidecar.json b/corpus/custom-art/cold/sidecar.json
new file mode 100644
index 0000000000000000000000000000000000000000..6687b065ead02c70cdfc81776b28244bc094f032
--- /dev/null
+++ b/corpus/custom-art/cold/sidecar.json
@@ -0,0 +1,30 @@
+{
+ "attributes": "Hidden, Directory",
+ "files": [
+ {
+ "path": "tags",
+ "attributes": "Directory",
+ "sha256": null
+ },
+ {
+ "path": "tags.json",
+ "attributes": "Archive",
+ "sha256": "297cb1a778848dca82e207fedb0d57ca60baa19add18e5e613eeb9252020b45f"
+ },
+ {
+ "path": "tags/6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg",
+ "attributes": "Archive",
+ "sha256": "6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9"
+ },
+ {
+ "path": "tags/d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png",
+ "attributes": "Archive",
+ "sha256": "d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92"
+ }
+ ],
+ "notebook": [
+ ".snowbound",
+ "Custom art.one",
+ "Open Notebook.onetoc2"
+ ]
+}
diff --git a/corpus/custom-art/cold/source.json b/corpus/custom-art/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..b9fca3f819eaf0679ff8c9bc99c2ffc299f39c07
--- /dev/null
+++ b/corpus/custom-art/cold/source.json
@@ -0,0 +1,32 @@
+[
+ {
+ "path": ".snowbound/tags/6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9.svg",
+ "bytes": 1207,
+ "sha256": "6dd10fabf6733354f911effb092fda9bfbbc9c1f3739576a18937093288767a9",
+ "mtime_ns": 1790751357201384901
+ },
+ {
+ "path": ".snowbound/tags/d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92.png",
+ "bytes": 377,
+ "sha256": "d5cf52aa0db673980ffdd0481ecaa2cae00216c8ee9c288510cf68dc3d803e92",
+ "mtime_ns": 1790751357201807401
+ },
+ {
+ "path": ".snowbound/tags.json",
+ "bytes": 493,
+ "sha256": "297cb1a778848dca82e207fedb0d57ca60baa19add18e5e613eeb9252020b45f",
+ "mtime_ns": 1790751357202100985
+ },
+ {
+ "path": "Custom art.one",
+ "bytes": 8024,
+ "sha256": "db7099a6b0663436d14e11cbff66b2b1555cdd90d29191f41bcbc606f55783d3",
+ "mtime_ns": 1790751357200828150
+ },
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1612,
+ "sha256": "7ab2e99e22102099e12bec081dc1e99ada669fb7b00a596fd766ce4030060109",
+ "mtime_ns": 1790751357200618358
+ }
+]
diff --git a/corpus/custom-art/cold/teardown.json b/corpus/custom-art/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/custom-art/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/equation-join/README.md b/corpus/equation-join/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..04504ff197eb45265c7748e3dfa2e7d3451f8782
--- /dev/null
+++ b/corpus/equation-join/README.md
@@ -0,0 +1,17 @@
+# Deleting between equations
+
+`lab/` holds two COM reads of a disposable OneNote 2010 lab notebook.
+`equation-seam.xml` is two equations typed with Alt+=, "aa+bb" and "cc+dd" in
+paragraphs of their own, after a selection from "aa+|" into "cc|" was deleted:
+OneNote joins them into one equation, `aa++dd`. `equation-per-paragraph.xml` is
+Alt+= over a selection across two paragraphs: each paragraph's part becomes an
+equation of its own.
+
+`candidate/` is the output of `deleting_between_equations_joins_them` in
+`crates/canvas/tests/links_equations.rs` on the page of `corpus/link-edit/candidate`:
+the same equations typed and the same selection deleted through the editor, whose
+joined equation reads back as one. `cold/` is a fresh OneNote 2010 read of it, whose
+MathML is OneNote's own. `tools/test_equation_join.py` checks this without a VM.
+Regenerate with `CANVAS_EQUATION_JOIN_EXPORT` set to a new absolute directory while
+running the test, then cold-open it with
+`tools/native_runner.py OUTPUT COLD --expected-pages 1 --collect-notebook --screenshots`.
diff --git a/corpus/equation-join/candidate/Open Notebook.onetoc2 b/corpus/equation-join/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..8dd9580bf95258edc9028c15db610191bfc7406b
Binary files /dev/null and b/corpus/equation-join/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/equation-join/candidate/links.one b/corpus/equation-join/candidate/links.one
new file mode 100644
index 0000000000000000000000000000000000000000..08b52dd23c3e1480467256c5e6c7219bc1f6cd9b
Binary files /dev/null and b/corpus/equation-join/candidate/links.one differ
diff --git a/corpus/equation-join/cold/commands.jsonl b/corpus/equation-join/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..cbd8e5b1ff522f6982fa74469a5bac49ac405985
--- /dev/null
+++ b/corpus/equation-join/cold/commands.jsonl
@@ -0,0 +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-5366E305 -ExpectedPages 1 -KeepOpen", "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/equation-join/cold/machine.json b/corpus/equation-join/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..c128850694780ba381f550fad26a4ecda0056d79
--- /dev/null
+++ b/corpus/equation-join/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-5366e305", "hostname": "ONE-M6-5366E305"}
diff --git a/corpus/equation-join/cold/notebook/Open Notebook.onetoc2 b/corpus/equation-join/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..9ef20188bb494f684371b947443d5ca831a72172
Binary files /dev/null and b/corpus/equation-join/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/equation-join/cold/notebook/links.one b/corpus/equation-join/cold/notebook/links.one
new file mode 100644
index 0000000000000000000000000000000000000000..227454ee8da92593f8cf22afe10551ee5445ed87
Binary files /dev/null and b/corpus/equation-join/cold/notebook/links.one differ
diff --git a/corpus/equation-join/cold/read/environment.json b/corpus/equation-join/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..8cd3c9a6e4488f8755247d5bf6cf9188139553d3
--- /dev/null
+++ b/corpus/equation-join/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-5366E305",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/equation-join/cold/read/hierarchy.xml b/corpus/equation-join/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..134170399a68dc20d3c14d9b73516dc2a2245eb9
--- /dev/null
+++ b/corpus/equation-join/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/equation-join/cold/read/page-000.navigation.json b/corpus/equation-join/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..83fb4df3362bb2ac7e9fa657fe6db76614b54e31
--- /dev/null
+++ b/corpus/equation-join/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Read about Rust the Rust site - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/equation-join/cold/read/page-000.png b/corpus/equation-join/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdcfca0d84290a55b4c9100e7a4ebec712db4828
Binary files /dev/null and b/corpus/equation-join/cold/read/page-000.png differ
diff --git a/corpus/equation-join/cold/read/page-000.xml b/corpus/equation-join/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..433fc21858503cc03c0e20ff8e056746fd624b8e
--- /dev/null
+++ b/corpus/equation-join/cold/read/page-000.xml
@@ -0,0 +1,3 @@
+
+the Rust site]]>aa++dd ]]>
diff --git a/corpus/equation-join/cold/read/payloads.json b/corpus/equation-join/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/equation-join/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/equation-join/cold/run.json b/corpus/equation-join/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..8aaabba0e9b30ba4dc7955496706f31484b3e997
--- /dev/null
+++ b/corpus/equation-join/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/join-candidate",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/equation-join/cold/scripts/cold.ps1 b/corpus/equation-join/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/equation-join/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/equation-join/cold/scripts/read.ps1 b/corpus/equation-join/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/equation-join/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/equation-join/cold/source.json b/corpus/equation-join/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..5ae40622df828870d2635029cef87b2d9270c5a4
--- /dev/null
+++ b/corpus/equation-join/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "df162b4a61fdc7d40bcd8c86a57cd7b98021eb75f8d1251037aa1df03cf28f1f",
+ "mtime_ns": 1790747690894245805
+ },
+ {
+ "path": "links.one",
+ "bytes": 8176,
+ "sha256": "be93291735237f7ba9bdbeb88fee8b4a46b7269b9cca3c1ce96d69b0c5ee6096",
+ "mtime_ns": 1790747690894084845
+ }
+]
diff --git a/corpus/equation-join/cold/teardown.json b/corpus/equation-join/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/equation-join/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/equation-join/lab/equation-per-paragraph.xml b/corpus/equation-join/lab/equation-per-paragraph.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1fe49966d84cd5f5599a029ca75d1461ffb55bb
--- /dev/null
+++ b/corpus/equation-join/lab/equation-per-paragraph.xml
@@ -0,0 +1,5 @@
+
+One ]]>Three four]]>
+
diff --git a/corpus/equation-join/lab/equation-seam.xml b/corpus/equation-join/lab/equation-seam.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a4d0a180a4d57cd8f9d19d4a721330670fdc38c
--- /dev/null
+++ b/corpus/equation-join/lab/equation-seam.xml
@@ -0,0 +1,3 @@
+
+aa++dd ]]>
+
diff --git a/corpus/icloud-merge/README.md b/corpus/icloud-merge/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c64d4f35c88d514e47ba0c042a6d5a65ac3f257a
--- /dev/null
+++ b/corpus/icloud-merge/README.md
@@ -0,0 +1,13 @@
+# A conflict version merged
+
+`candidate` is `a_version_of_a_onenote_file_merges_into_it` in `crates/notebook/tests/cloud.rs`
+(`ONESTORE_ICLOUD_EXPORT`): two devices edit `conflict-page/native/initial` through a fake
+iCloud Drive. The Mac types "Mac: " at the start of the first paragraph; the iPhone, offline,
+types "iPhone: " at the same place, appends to the positioned outline and adds a page "From the
+iPhone" with a body. The iPhone's upload becomes a conflict version, which the Mac merges: the
+appended text and the new page replay, and the clashing edit becomes a conflict page.
+
+`cold` is OneNote 2010's fresh read in a disposable clone (`tools/native_runner.py`,
+`--screenshots`): both pages list, the first with its conflict mark and the yellow bar "This page
+has changes that could not be merged during synchronization", its positioned outline ending
+"(typed on the iPhone)", and "From the iPhone" holding "Written offline on the iPhone."
diff --git a/corpus/icloud-merge/candidate/Open Notebook.onetoc2 b/corpus/icloud-merge/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/icloud-merge/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/icloud-merge/candidate/synthetic.one b/corpus/icloud-merge/candidate/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..74af495a916f5f9d6f611eb9ebbbd50721cac846
Binary files /dev/null and b/corpus/icloud-merge/candidate/synthetic.one differ
diff --git a/corpus/icloud-merge/cold/commands.jsonl b/corpus/icloud-merge/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..2dc314e6972496392ce250e617d0199ce758cf55
--- /dev/null
+++ b/corpus/icloud-merge/cold/commands.jsonl
@@ -0,0 +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-7D90CFD6 -ExpectedPages -1 -KeepOpen", "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/icloud-merge/cold/machine.json b/corpus/icloud-merge/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..9e422b8b1199a1d16b0b2563c12c84d4e537405e
--- /dev/null
+++ b/corpus/icloud-merge/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-7d90cfd6", "hostname": "ONE-M6-7D90CFD6"}
diff --git a/corpus/icloud-merge/cold/notebook/Open Notebook.onetoc2 b/corpus/icloud-merge/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/icloud-merge/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/icloud-merge/cold/notebook/synthetic.one b/corpus/icloud-merge/cold/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..341046bb4a798dc5d625522d891e8a2dc733583f
Binary files /dev/null and b/corpus/icloud-merge/cold/notebook/synthetic.one differ
diff --git a/corpus/icloud-merge/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/icloud-merge/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/icloud-merge/cold/read/environment.json b/corpus/icloud-merge/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..7474e12b368b2c93a9c3b343b11bc37677440d81
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-7D90CFD6",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/icloud-merge/cold/read/hierarchy.xml b/corpus/icloud-merge/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04144036640aa932bacc1f5d88b2be0cd074c4ad
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/icloud-merge/cold/read/page-000.navigation.json b/corpus/icloud-merge/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..dec1111275d1a2b667ceeb8061a2a410672f8624
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "From the iPhone - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/icloud-merge/cold/read/page-000.png b/corpus/icloud-merge/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3a1d39ecbb6deff67928098262217fc6b9f797f
Binary files /dev/null and b/corpus/icloud-merge/cold/read/page-000.png differ
diff --git a/corpus/icloud-merge/cold/read/page-000.xml b/corpus/icloud-merge/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..90cae615da2d31bc687a09792df84a92d2da3e63
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/icloud-merge/cold/read/page-001.navigation.json b/corpus/icloud-merge/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..6cd4bb2182af13147155e35878ada4b490086d4c
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Mac: Fictitious: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/icloud-merge/cold/read/page-001.png b/corpus/icloud-merge/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..e17d47dabf535960ffd87fb626b9f44d4691919e
Binary files /dev/null and b/corpus/icloud-merge/cold/read/page-001.png differ
diff --git a/corpus/icloud-merge/cold/read/page-001.xml b/corpus/icloud-merge/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2abb629517e219f906dd42fbbd0cd1e3f71fc45c
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/page-001.xml
@@ -0,0 +1,26 @@
+
+Mac: Fictitious: café, 東京, مرحبا]]>AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/icloud-merge/cold/read/payloads.json b/corpus/icloud-merge/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a7cf679ab4e54b68e86e146fae5cdba530db78d
--- /dev/null
+++ b/corpus/icloud-merge/cold/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{9FDAFD7E-E3BC-49B7-93E7-A8052BA1831B}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{1695F938-3B7E-4A34-957E-6A5CA88D058E}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/icloud-merge/cold/run.json b/corpus/icloud-merge/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..36afe9e5f36c3917a9b94b9100de9004b859bea1
--- /dev/null
+++ b/corpus/icloud-merge/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/icloud-lab/candidate",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/icloud-merge/cold/scripts/cold.ps1 b/corpus/icloud-merge/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/icloud-merge/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/icloud-merge/cold/scripts/read.ps1 b/corpus/icloud-merge/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/icloud-merge/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/icloud-merge/cold/source.json b/corpus/icloud-merge/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a3ed2edbb42ffeca8c341d8a705e8a7598623b2
--- /dev/null
+++ b/corpus/icloud-merge/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4944,
+ "sha256": "36274ad5cc077c6b1ad51ee4c4b90d3b6798a45ce446cbfd7c9d7ac504776b28",
+ "mtime_ns": 1790473161215529077
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 48544,
+ "sha256": "8b733a304e4e3a2e3f137c188227b1fc80cb5527b04c76a941f9925262801120",
+ "mtime_ns": 1790750199560524829
+ }
+]
diff --git a/corpus/icloud-merge/cold/teardown.json b/corpus/icloud-merge/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/icloud-merge/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/ink-pressure/README.md b/corpus/ink-pressure/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0dbc16ab3ea5484daea1e68cf05281c20612de16
--- /dev/null
+++ b/corpus/ink-pressure/README.md
@@ -0,0 +1,45 @@
+# Pressure ink
+
+OneNote 2010 draws a pen's pressure but stores only what the pen reports. With a mouse, or
+with File > Options > Advanced > Pen > "Use pen pressure sensitivity" off (the default,
+`HKCU\Software\Microsoft\Office\14.0\OneNote\Options\Pen\InkPressure`), a pen's drawing
+attributes carry IgnorePressure (`0x08003411`) and its dimension table holds X and Y. With the
+option on, the attributes leave IgnorePressure out, and a pen that reports pressure adds it.
+The lab's Windows 7 has no digitizer, so the pressure strokes here come from ISF: WPF builds
+strokes with NormalPressure (and one with X and Y tilt) and OneNote takes each through
+`UpdatePageContent` (`tools/native/ink-pressure.ps1`).
+
+- `native` is that run: page "Levels" holds two drawings of nine 24 pt strokes at pressures 0
+ to 1 in eighths, one pen reporting 0..1023 and the other 0..255; "Strokes" a ramp from no to
+ full pressure, a wave, a pen ignoring the pressure it recorded, a stroke with tilt and a
+ 4 by 24 rectangular tip.
+
+What it shows, and `crates/onestore/tests/page_ink.rs` pins:
+
+- The dimension table (`0x1c00340a`) keeps every packet property the pen reported, each a
+ GUID, lower and upper limit, unit and resolution: X and Y, NormalPressure
+ (`7307502d-f9f4-4e18-b3f2-2ce1b1a3610c`), tilt and the rest. The stroke's path holds one
+ block of multi-byte first differences per dimension, in the table's order.
+- OneNote draws each point as a stamp of the pen's tip `0.25 + 1.5 * p` times its width and
+ height, where `p` is the pressure over the pen's range, `(value - lower) / (upper -
+ lower)`: a quarter of the pen at none, all of it at half, 1.75 times at full. Consecutive
+ stamps are joined by the quadrilateral across their ends. Tilt changes nothing drawn, and a
+ pen with IgnorePressure draws at its width whatever it recorded.
+
+Snowbound reads pressure the same way and draws it as OneNote does. A stroke drawn with a pen
+that reports pressure (a tablet on macOS, the Apple Pencil) stores X, Y and NormalPressure
+from 0 to 1023 without IgnorePressure, as OneNote does with the option on; a mouse's or a
+finger's stroke stays as OneNote's mouse ink.
+
+`candidate` is `pressure_ink_is_written_as_onenote_keeps_it_and_survives_edits` in
+`page_ink.rs` (`ONESTORE_INK_PRESSURE_EXPORT`): the native file with the first drawing's
+no-pressure stroke erased, four Snowbound drawings of a 500 HIMETRIC pen below it (none, half
+and full pressure, and a ramp), and on "Strokes" the ramp moved to (72, 108) and the wave
+deleted. `cold` is a fresh OneNote 2010 read: every width as drawn above, in its PDF export
+and `read/page-*.png`.
+
+`tools/test_ink_pressure.py` checks both from the PDF exports without a VM. Regenerate with
+`tools/native_runner.py EMPTY_DIRECTORY OUTPUT --author tools/native/ink-pressure.ps1
+--collect-notebook --screenshots --pdf`, and cold-open a candidate with
+`tools/native_runner.py CANDIDATE COLD --expected-pages 2 --collect-notebook --screenshots
+--pdf`.
diff --git a/corpus/ink-pressure/candidate/Open Notebook.onetoc2 b/corpus/ink-pressure/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..d30b00ee1224ca1eddf9c9844048f9f5985074b5
Binary files /dev/null and b/corpus/ink-pressure/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/ink-pressure/candidate/Pressure.one b/corpus/ink-pressure/candidate/Pressure.one
new file mode 100644
index 0000000000000000000000000000000000000000..5adfe5bfc4cd45504f7ce2ef84a491c9147a1bc2
Binary files /dev/null and b/corpus/ink-pressure/candidate/Pressure.one differ
diff --git a/corpus/ink-pressure/cold/commands.jsonl b/corpus/ink-pressure/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..8b38b105d360b4d996904d85826f2da9fb116c55
--- /dev/null
+++ b/corpus/ink-pressure/cold/commands.jsonl
@@ -0,0 +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-F2A75FD2 -ExpectedPages 2 -Pdf -KeepOpen", "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/ink-pressure/cold/machine.json b/corpus/ink-pressure/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..57adbce9813220779e01bcf838358e85f26d31f4
--- /dev/null
+++ b/corpus/ink-pressure/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-f2a75fd2", "hostname": "ONE-M6-F2A75FD2"}
diff --git a/corpus/ink-pressure/cold/notebook/Open Notebook.onetoc2 b/corpus/ink-pressure/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..0721630f2b32eff92ba9ee3178899e95f0a6ae2b
Binary files /dev/null and b/corpus/ink-pressure/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/ink-pressure/cold/notebook/Pressure.one b/corpus/ink-pressure/cold/notebook/Pressure.one
new file mode 100644
index 0000000000000000000000000000000000000000..2502bb49b0e6db6677a4d8e520421bfd5fbd4c95
Binary files /dev/null and b/corpus/ink-pressure/cold/notebook/Pressure.one differ
diff --git a/corpus/ink-pressure/cold/read/environment.json b/corpus/ink-pressure/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..731ed90d1469e3f70f06e151ad62d34774601c3c
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-F2A75FD2",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/ink-pressure/cold/read/hierarchy.xml b/corpus/ink-pressure/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a888616c9f4ee7c63396af5ab18616bc6265c276
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/ink-pressure/cold/read/page-000.navigation.json b/corpus/ink-pressure/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4959cb4814b6a5c8a0373716bf39f45322e67e2
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Levels - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/ink-pressure/cold/read/page-000.pdf b/corpus/ink-pressure/cold/read/page-000.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f53b1ad2c40e35fc13477035c8f3a183d0111c69
Binary files /dev/null and b/corpus/ink-pressure/cold/read/page-000.pdf differ
diff --git a/corpus/ink-pressure/cold/read/page-000.png b/corpus/ink-pressure/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22a989ddc95d0bd88c6afc75ca1b8be72014781
Binary files /dev/null and b/corpus/ink-pressure/cold/read/page-000.png differ
diff --git a/corpus/ink-pressure/cold/read/page-000.xml b/corpus/ink-pressure/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5476faa312e6fec1ce2aaf3406f2d681972b350c
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/page-000.xml
@@ -0,0 +1,30 @@
+
+AKkCHQSQAsAGARAqABofi0JwRYR1gL7QRdkEAxJIEEXPBhsCALP+Rs8GGwIAs/4FAzgLZBkFOAMA
+/gNkAxVGAEAKDwWCfwYMlIIAggADFUYAQAoYBYJ/BgyUgv4jQ/iNEIL8SfiUAAMVRgBAChgFgn8G
+DJSC/krz+SvQgvzJ+ZQAAxVGAEAKGAWCfwYMlIL+cqP5ypCC/Un6lAADFUYAQAoYBYJ/BgyUgv6a
+U/ppUIL9yfuUAAMVRgBAChkFgn8GDJSC/sID+wgQgv4Ai/gCMAMVRgBAChkFgn8GDJSC/umz+6bQ
+gv4Bi/gGMAMVRgBAChwFgn8GDJSC/wAIsf4AEWQAgv4Ci/gKMAMVRgBAChwFgn8GDJSC/wAcif4A
+ORQAgv4Di/gOMAMVRgBA
+AJQCHQSQAuYFARAqABofi0JwRYR1gL7QRdkEAxJIEEXPBhsCALP+Rs8GGwIAs/4FAzgLZGQDFUYA
+QAoYBYJ/BgyUgv4jQ/iNEIL9yfuUAAMVRgBAChkFgn8GDJSC/krz+SvQgv4Dk/gOUAMVRgBAChkF
+gn8GDJSC/nKj+cqQgv4Hk/geUAMVRgBAChkFgn8GDJSC/ppT+mlQgv4Lk/guUAMVRgBAChkFgn8G
+DJSC/sID+wgQgv4Pi/g+MAMVRgBAChkFgn8GDJSC/umz+6bQgv4Ti/hOMAMVRgBAChwFgn8GDJSC
+/wAIsf4AEWQAgv4Xi/heMAMVRgBAChwFgn8GDJSC/wAcif4AORQAgv4bi/huMAMVRgBA
+APMBHQOKAwoBYCoAGh+LQnBFhHWAvtBF2QT6h5Uy8uwXQbjAFr/zK/R63rsTi+Ves0icm6ElWrdR
+Er/scczMIrFBiQ67EyzueqFYz1SK5pfFT48G+LrS4ZsixGZtpw2yWEmaHU5ANAZsEAMNSBBEn7Tq
+A0X0A0b0AwUJOAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQApUA4L+I0P4jQCC
+/wCcaf4BONSCAAUURgBAAAAJBAUURgAAAAASABEguqhoBLnfiUiQN9dTlXSFBAoAESAAPBmUtFDd
+AQMVRgBACgARIDabTT+39GNB
+APgBHQOmAyYBYCoAGh+LQnBFhHWAvtBF2QT6h5Uy8uwXQbjAFr/zK/R63rsTi+Ves0icm6ElWrdR
+Er/scczMIrFBiQ67EyzueqFYz1SK5pfFT48G+LrS4ZsixGZtpw2yWEmaHU5ANAZsEAMNSBBEn7Tq
+A0X0A0b0AwUJOAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQApZA4L+I0P4jQCC
+/wCwQf4BYISC/guT+C5QBRRGAIAAAAkEBRRGAAAAABIAESC+dPnOv2otSZfb454We3N4CgARIAA8
+GZS0UN0BAxVGAEAKABEgNptNP7f0c0E=APgBHQPCA0IBYCoAGh+LQnBFhHWAvtBF2QT6h5Uy8uwXQbjAFr/zK/R63rsTi+Ves0icm6ElWrdR
+Er/scczMIrFBiQ67EyzueqFYz1SK5pfFT48G+LrS4ZsixGZtpw2yWEmaHU5ANAZsEAMNSBBEn7Tq
+A0X0A0b0AwUJOAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQApZA4L+I0P4jQCC
+/wDEGf4BiDSC/huL+G4wBRRGAMAAAAkEBRRGAAAAABIAESBAFhfWgEA7TLxtxXvme3CCCgARIAA8
+GZS0UN0BAxVGAEAKABEgNptNP1z6gUE=AJICHQOmBUIBYCoAGh+LQnBFhHWAvtBF2QT6h5Uy8uwXQbjAFr/zK/R63rsTi+Ves0icm6ElWrdR
+Er/scczMIrFBiQ67EyzueqFYz1SK5pfFT48G+LrS4ZsixGZtpw2yWEmaHU5ANAZsEAMNSBBEn7Tq
+A0X0A0b0AwUJOAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQApzKYL+I0P4cpsW
+LFixYsWLFixYsIL/AN6R/gG9JAAAAAAAgn4YsssWWWLLFlliyyxZZYAFFEYBAAAACQQFFEYAAAAA
+EgARIDlXT31MN1lIqRuN46Oag5AKABEgADwZlLRQ3QEDFUYAQAoAESA2m00/GaaMQQ==
diff --git a/corpus/ink-pressure/cold/read/page-001.navigation.json b/corpus/ink-pressure/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f362538fe065f12f0f1a0a2ef6890d867f25c32c
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Strokes - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/ink-pressure/cold/read/page-001.pdf b/corpus/ink-pressure/cold/read/page-001.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9a9b70a218b4e593b2047b96dcfaaf50832de374
Binary files /dev/null and b/corpus/ink-pressure/cold/read/page-001.pdf differ
diff --git a/corpus/ink-pressure/cold/read/page-001.png b/corpus/ink-pressure/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..596669114ad23621d1d9bcc5273fa682a5442104
Binary files /dev/null and b/corpus/ink-pressure/cold/read/page-001.png differ
diff --git a/corpus/ink-pressure/cold/read/page-001.xml b/corpus/ink-pressure/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47b4261561f46522c1cc9204be5629773079b349
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/page-001.xml
@@ -0,0 +1,8 @@
+
+AGYdA5AFHAEQKgAaH4tCcEWEdYC+0EXZBAMSSBBF1AEbAgCz/kbUARsCALP+BQM4C2RkAxVGAEAK
+LimCfwEZYsWLFixYsWLFixYAggAAAAAAAIJ+GLLLFlliyxZZYsssWWWAAxVGAEA=AGYdA5AFEAEQKgAaH4tCcEWEdYC+0EXZBAMSSBRF1AEbAgCz/kbUARsCALP+BQM4C2RkAxVGAEAK
+LimCfwEZYsWLFixYsWLFixYAggAAAAAAAIJ+GLLLFlliyxZZYsssWWWAAxVGAEA=AJgBHQOQBRgBECoAGh+LQnBFhHWAvtBF2QQDEkgQRdQBGwIAs/5G1AEbAgCz/gUFODs8C2QZGjsL
+0YwB0IwBAwAAyEI8C9GMAdCMAQMAAMhCZAMVRgBACkIpgn8BGWLFixYsWLFixYsWAIIAAAAAAACC
+/gH7+AXQAAlAAASggv6IN/o5wAAAAAAAgv5ZU/llUAAAAAAAAxVGAEA=AEkdA5gDVAEQKgAaH4tCcEWEdYC+0EXZBAMOSBBFahsCAFn/RwFG+wQFAzgLZGQDFUYAQAoVC4J/
+BgyUEIIAAIJ+sJUpKAMVRgBA
+
diff --git a/corpus/ink-pressure/cold/read/payloads.json b/corpus/ink-pressure/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/ink-pressure/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/ink-pressure/cold/run.json b/corpus/ink-pressure/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..672d158d9cc5fad3772e75718367961c5effb09f
--- /dev/null
+++ b/corpus/ink-pressure/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/snowbound-pressure/candidate",
+ "expected_pages": 2,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/ink-pressure/cold/scripts/cold.ps1 b/corpus/ink-pressure/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/ink-pressure/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/ink-pressure/cold/scripts/read.ps1 b/corpus/ink-pressure/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/ink-pressure/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/ink-pressure/cold/source.json b/corpus/ink-pressure/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..4bdc7de5458ed2cc5b15ae501c5051f4007c1b06
--- /dev/null
+++ b/corpus/ink-pressure/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "c2ac6e825447b9a3857eb9f2715f1ffbb12e1b0e091882f8b1d22b2edd28c83f",
+ "mtime_ns": 1790756440470950723
+ },
+ {
+ "path": "Pressure.one",
+ "bytes": 27360,
+ "sha256": "84c7e6af5c491b39c26e1f070056464af8cec8123e666f938a9aa066a17a60c7",
+ "mtime_ns": 1790756440470653265
+ }
+]
diff --git a/corpus/ink-pressure/cold/teardown.json b/corpus/ink-pressure/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/ink-pressure/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/ink-pressure/native/commands.jsonl b/corpus/ink-pressure/native/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..4ddf164813c9044d989b8344f03705bea84a57b5
--- /dev/null
+++ b/corpus/ink-pressure/native/commands.jsonl
@@ -0,0 +1,4 @@
+{"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\\author.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-29CD6F15", "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-29CD6F15 -ExpectedPages -1 -UseCurrentCache -Pdf -KeepOpen", "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/ink-pressure/native/machine.json b/corpus/ink-pressure/native/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..12aebf034da03dde568fdbe6f0a75d9b9b8d58d9
--- /dev/null
+++ b/corpus/ink-pressure/native/machine.json
@@ -0,0 +1 @@
+{"name": "m6-29cd6f15", "hostname": "ONE-M6-29CD6F15"}
diff --git a/corpus/ink-pressure/native/notebook/Open Notebook.onetoc2 b/corpus/ink-pressure/native/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..8c9c8c1849e451c5a8a182165747c06346df6ad9
Binary files /dev/null and b/corpus/ink-pressure/native/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/ink-pressure/native/notebook/Pressure.one b/corpus/ink-pressure/native/notebook/Pressure.one
new file mode 100644
index 0000000000000000000000000000000000000000..61f35be5003a948612bc9ce568b319286782cc43
Binary files /dev/null and b/corpus/ink-pressure/native/notebook/Pressure.one differ
diff --git a/corpus/ink-pressure/native/read/environment.json b/corpus/ink-pressure/native/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..839bf5ee389d74892a840275ede8f224162eb527
--- /dev/null
+++ b/corpus/ink-pressure/native/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-29CD6F15",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/ink-pressure/native/read/hierarchy.xml b/corpus/ink-pressure/native/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d961a41a4433ee8f8e68f8cb99f21b9a102869ea
--- /dev/null
+++ b/corpus/ink-pressure/native/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/ink-pressure/native/read/page-000.navigation.json b/corpus/ink-pressure/native/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f362538fe065f12f0f1a0a2ef6890d867f25c32c
--- /dev/null
+++ b/corpus/ink-pressure/native/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Strokes - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/ink-pressure/native/read/page-000.pdf b/corpus/ink-pressure/native/read/page-000.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3590d49b5587b2d332312b9fb13360ac4048ba97
Binary files /dev/null and b/corpus/ink-pressure/native/read/page-000.pdf differ
diff --git a/corpus/ink-pressure/native/read/page-000.png b/corpus/ink-pressure/native/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f3459a04b7e01b05d484abbc5966145e545759a
Binary files /dev/null and b/corpus/ink-pressure/native/read/page-000.png differ
diff --git a/corpus/ink-pressure/native/read/page-000.xml b/corpus/ink-pressure/native/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1968183ec2208bf0ff8bfa14eb40cb312406f1bb
--- /dev/null
+++ b/corpus/ink-pressure/native/read/page-000.xml
@@ -0,0 +1,11 @@
+
+AGYdA5AFHAEQKgAaH4tCcEWEdYC+0EXZBAMSSBBF1AEbAgCz/kbUARsCALP+BQM4C2RkAxVGAEAK
+LimCfwEZYsWLFixYsWLFixYAggAAAAAAAIJ+GLLLFlliyxZZYsssWWWAAxVGAEA=AKwBHQOMBVgBECoAGh+LQnBFhHWAvtBF2QQDEEgQRWobAgBZ/0ZqGwIAWf8FAzgLZGQDFUYAQAp2
+KYJ/ARlixYsWLFixYsWLFgCHaEh8fls1ntBoM5mcni8JgkYkUunk8oU6nUqkEQgUPjcrm87n9DnM
+1lMZhcEiQIfifuG1gsRisbkcjlMnk8lj8bicNgsAhESikgkEklEmk0gkEWiUIgUDhsRjsdkcpkoD
+FUYAQA==AGYdA5AFEAEQKgAaH4tCcEWEdYC+0EXZBAMSSBRF1AEbAgCz/kbUARsCALP+BQM4C2RkAxVGAEAK
+LimCfwEZYsWLFixYsWLFixYAggAAAAAAAIJ+GLLLFlliyxZZYsssWWWAAxVGAEA=AJgBHQOQBRgBECoAGh+LQnBFhHWAvtBF2QQDEkgQRdQBGwIAs/5G1AEbAgCz/gUFODs8C2QZGjsL
+0YwB0IwBAwAAyEI8C9GMAdCMAQMAAMhCZAMVRgBACkIpgn8BGWLFixYsWLFixYsWAIIAAAAAAACC
+/gH7+AXQAAlAAASggv6IN/o5wAAAAAAAgv5ZU/llUAAAAAAAAxVGAEA=AEkdA5gDVAEQKgAaH4tCcEWEdYC+0EXZBAMOSBBFahsCAFn/RwFG+wQFAzgLZGQDFUYAQAoVC4J/
+BgyUEIIAAIJ+sJUpKAMVRgBA
+
diff --git a/corpus/ink-pressure/native/read/page-001.navigation.json b/corpus/ink-pressure/native/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4959cb4814b6a5c8a0373716bf39f45322e67e2
--- /dev/null
+++ b/corpus/ink-pressure/native/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Levels - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/ink-pressure/native/read/page-001.pdf b/corpus/ink-pressure/native/read/page-001.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..98021ccd71d4e5cc93f9857526fa0a62b0ff3d9b
Binary files /dev/null and b/corpus/ink-pressure/native/read/page-001.pdf differ
diff --git a/corpus/ink-pressure/native/read/page-001.png b/corpus/ink-pressure/native/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2c48effc03306b6ccd148d87bbf8c9adf496b4
Binary files /dev/null and b/corpus/ink-pressure/native/read/page-001.png differ
diff --git a/corpus/ink-pressure/native/read/page-001.xml b/corpus/ink-pressure/native/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..076f215cb2fa1a29df6512f4d8ea2ebfd0709307
--- /dev/null
+++ b/corpus/ink-pressure/native/read/page-001.xml
@@ -0,0 +1,13 @@
+
+AKUCHQSQAsAGARAqABofi0JwRYR1gL7QRdkEAxJIEEXPBhsCALP+Rs8GGwIAs/4FAzgLZGQDFUYA
+QAoPBYJ/BgyUggCCAAMVRgBAChgFgn8GDJSC/iND+I0Qgv3J+5QAAxVGAEAKGQWCfwYMlIL+SvP5
+K9CC/gOT+A5QAxVGAEAKGQWCfwYMlIL+cqP5ypCC/geT+B5QAxVGAEAKGQWCfwYMlIL+mlP6aVCC
+/guT+C5QAxVGAEAKGQWCfwYMlIL+wgP7CBCC/g+L+D4wAxVGAEAKGQWCfwYMlIL+6bP7ptCC/hOL
++E4wAxVGAEAKHAWCfwYMlIL/AAix/gARZACC/heL+F4wAxVGAEAKHAWCfwYMlIL/AByJ/gA5FACC
+/huL+G4wAxVGAEA=AKkCHQSQAsAGARAqABofi0JwRYR1gL7QRdkEAxJIEEXPBhsCALP+Rs8GGwIAs/4FAzgLZBkFOAMA
+/gNkAxVGAEAKDwWCfwYMlIIAggADFUYAQAoYBYJ/BgyUgv4jQ/iNEIL8SfiUAAMVRgBAChgFgn8G
+DJSC/krz+SvQgvzJ+ZQAAxVGAEAKGAWCfwYMlIL+cqP5ypCC/Un6lAADFUYAQAoYBYJ/BgyUgv6a
+U/ppUIL9yfuUAAMVRgBAChkFgn8GDJSC/sID+wgQgv4Ai/gCMAMVRgBAChkFgn8GDJSC/umz+6bQ
+gv4Bi/gGMAMVRgBAChwFgn8GDJSC/wAIsf4AEWQAgv4Ci/gKMAMVRgBAChwFgn8GDJSC/wAcif4A
+ORQAgv4Di/gOMAMVRgBA
+
diff --git a/corpus/ink-pressure/native/read/payloads.json b/corpus/ink-pressure/native/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/ink-pressure/native/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/ink-pressure/native/run.json b/corpus/ink-pressure/native/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..8b89ed7d98344779b0ecdccc7d251bb74b58767c
--- /dev/null
+++ b/corpus/ink-pressure/native/run.json
@@ -0,0 +1,19 @@
+{
+ "notebook": "/private/tmp/snowbound-pressure/empty-notebook",
+ "expected_pages": -1,
+ "author": "tools/native/ink-pressure.ps1",
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "author.ps1": "bff822c61e6773daba010d89000dee2326282259161a252b65df2ce8acf275c9",
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/ink-pressure/native/scripts/author.ps1 b/corpus/ink-pressure/native/scripts/author.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..7aabbc30a20e31e2b732cdbf9031fe367d5ac2b4
--- /dev/null
+++ b/corpus/ink-pressure/native/scripts/author.ps1
@@ -0,0 +1,108 @@
+param([Parameter(Mandatory=$true)][string]$Root, [Parameter(Mandatory=$true)][string]$CloneHost)
+# Pressure ink as OneNote 2010 keeps it: WPF writes strokes with NormalPressure (and one with
+# tilt) as ISF, and OneNote takes each through UpdatePageContent into a section of its own.
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+& "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost
+Add-Type -AssemblyName PresentationCore, WindowsBase
+$P = [System.Windows.Input.StylusPointProperties]
+$U = [System.Windows.Input.StylusPointPropertyUnit]
+
+function Info($property, $min, $max, $unit, $resolution) {
+ if ($null -eq $min) { return New-Object System.Windows.Input.StylusPointPropertyInfo($property) }
+ New-Object System.Windows.Input.StylusPointPropertyInfo($property, $min, $max, $unit, $resolution)
+}
+
+# A stroke through `points` of [x, y, pressure 0..1, extra values...] in WPF units (1/96 inch).
+function Stroke($points, $width, $height, [switch]$Ignore, [switch]$Rectangle, $infos) {
+ if (-not $infos) { $infos = @((Info $P::X), (Info $P::Y), (Info $P::NormalPressure)) }
+ $description = New-Object System.Windows.Input.StylusPointDescription(,[System.Windows.Input.StylusPointPropertyInfo[]]$infos)
+ $pressure = $infos[2]
+ $collection = New-Object System.Windows.Input.StylusPointCollection(,$description)
+ foreach ($p in $points) {
+ $extra = [int[]]@($p | Select-Object -Skip 3)
+ $collection.Add((New-Object System.Windows.Input.StylusPoint($p[0], $p[1], [single]0.5, $description, $extra)))
+ $point = $collection[$collection.Count - 1]
+ $point.SetPropertyValue([System.Windows.Input.StylusPointProperties]::NormalPressure,
+ [int][Math]::Round($pressure.Minimum + $p[2] * ($pressure.Maximum - $pressure.Minimum)))
+ $collection[$collection.Count - 1] = $point
+ }
+ $stroke = New-Object System.Windows.Ink.Stroke -ArgumentList (,$collection)
+ $stroke.DrawingAttributes.Width = $width
+ $stroke.DrawingAttributes.Height = $height
+ $stroke.DrawingAttributes.IgnorePressure = [bool]$Ignore
+ $stroke.DrawingAttributes.FitToCurve = $false
+ if ($Rectangle) { $stroke.DrawingAttributes.StylusTip = [System.Windows.Ink.StylusTip]::Rectangle }
+ $stroke
+}
+
+function Isf($strokes) {
+ $collection = New-Object System.Windows.Ink.StrokeCollection
+ foreach ($stroke in $strokes) { $collection.Add([System.Windows.Ink.Stroke]$stroke) }
+ $stream = New-Object IO.MemoryStream
+ $collection.Save($stream, $true)
+ [Convert]::ToBase64String($stream.ToArray())
+}
+
+function Line($x, $y, $pressure, $count, $step) {
+ $points = @()
+ for ($i = 0; $i -lt $count; $i++) { $points += ,@(($x + $i * $step), $y, $pressure) }
+ ,$points
+}
+
+# "Levels": one drawing of nine 24-point strokes at pressures 0 to 1 in eighths, and one of
+# the same levels on a pen reporting 0..255.
+$levels = @(); $coarse = @()
+$narrow = @((Info $P::X), (Info $P::Y), (Info $P::NormalPressure 0 255 $U::None 1))
+for ($i = 0; $i -le 8; $i++) {
+ $levels += Stroke (Line 0 ($i * 48) ($i / 8) 5 20) 32 32
+ $coarse += Stroke (Line 0 ($i * 48) ($i / 8) 5 20) 32 32 -infos $narrow
+}
+# "Strokes": a rising ramp, a wave, a pen ignoring the pressure it recorded, a stroke with
+# tilt, and a rectangular tip, each a drawing of its own.
+$ramp = @(); $wave = @(); $flat = @(); $tilt = @(); $block = @()
+for ($i = 0; $i -le 40; $i++) {
+ $ramp += ,@(($i * 8), 0, ($i / 40))
+ $wave += ,@(($i * 8), (20 * [Math]::Sin($i / 4)), (0.5 + 0.5 * [Math]::Sin($i / 5)))
+ $flat += ,@(($i * 8), 0, ($i / 40))
+ $tilt += ,@(($i * 8), 0, (0.2 + $i / 60), (-4500 + $i * 200), 3000)
+}
+for ($i = 0; $i -le 10; $i++) { $block += ,@(($i * 20), 0, ($i / 10)) }
+$tilted = @((Info $P::X), (Info $P::Y), (Info $P::NormalPressure),
+ (Info $P::XTiltOrientation -9000 9000 $U::Degrees 100), (Info $P::YTiltOrientation -9000 9000 $U::Degrees 100))
+$pages = [ordered]@{
+ 'Levels' = @(@(36, 90, (Isf $levels)), @(252, 90, (Isf $coarse)))
+ 'Strokes' = @(
+ @(36, 90, (Isf @(Stroke $ramp 8 8))),
+ @(36, 150, (Isf @(Stroke $wave 4 4))),
+ @(36, 220, (Isf @(Stroke $flat 8 8 -Ignore))),
+ @(36, 270, (Isf @(Stroke $tilt 8 8 -infos $tilted))),
+ @(36, 320, (Isf @(Stroke $block 4 24 -Rectangle))))
+}
+
+$namespace = 'http://schemas.microsoft.com/office/onenote/2010/onenote'
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+try {
+ $app.OpenHierarchy((Join-Path $Root 'notebook'), '', [ref]$notebookId, 0)
+ $sectionId = ''
+ $app.OpenHierarchy('Pressure.one', $notebookId, [ref]$sectionId, 3)
+ foreach ($name in $pages.Keys) {
+ $pageId = ''
+ $app.CreateNewPage($sectionId, [ref]$pageId, 0)
+ $drawings = ($pages[$name] | ForEach-Object {
+ "$($_[2])"
+ }) -join ''
+ $xml = "$drawings"
+ [IO.File]::WriteAllText((Join-Path $Root "author-$name.xml"), $xml, [Text.Encoding]::UTF8)
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ $app.SyncHierarchy($notebookId)
+ $app.CloseNotebook($notebookId, $false)
+ $notebookId = ''
+} finally {
+ if ($notebookId) { $app.CloseNotebook($notebookId, $false) }
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+}
diff --git a/corpus/ink-pressure/native/scripts/cold.ps1 b/corpus/ink-pressure/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/ink-pressure/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/ink-pressure/native/scripts/read.ps1 b/corpus/ink-pressure/native/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/ink-pressure/native/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/ink-pressure/native/source.json b/corpus/ink-pressure/native/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..fe51488c7066f6687ef680d6bfaa4f7768ef205c
--- /dev/null
+++ b/corpus/ink-pressure/native/source.json
@@ -0,0 +1 @@
+[]
diff --git a/corpus/ink-pressure/native/teardown.json b/corpus/ink-pressure/native/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/ink-pressure/native/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/object-outline/README.md b/corpus/object-outline/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4522c254ee4f9654bad55e5f4f174d203ea3721d
--- /dev/null
+++ b/corpus/object-outline/README.md
@@ -0,0 +1,17 @@
+# Typing beside a picture or file alone in its outline
+
+`native/` is OneNote 2010 authoring `tools/native/pages.ps1` input: two pages in
+`Alone.one`, one an outline holding only a text file, the other only a picture.
+
+`keys/` is `tools/native_object_outline.py` clicking beside each object inside its
+outline in OneNote 2010 and typing "abc": OneNote adds a paragraph after the object
+holding the text, and undoing removes that paragraph again.
+
+`candidate/` is the output of `typing_beside_an_outlines_only_object_adds_a_paragraph`
+in `crates/canvas/tests/object_outlines.rs`: the editor shows each outline with a
+paragraph after its object that is stored only once typed in, and the typing, its undo
+and its redo are published as revisions; `cold/` is a fresh OneNote 2010 read of it,
+whose pages read as `keys/` does. `tools/test_object_outline.py` checks this without a
+VM. Regenerate with `SNOWBOUND_OBJECT_OUTLINE_EXPORT` set to a new absolute directory
+while running the test, then cold-open it with
+`tools/native_runner.py OUTPUT COLD --expected-pages 2 --collect-notebook --screenshots`.
diff --git a/corpus/object-outline/candidate/Alone.one b/corpus/object-outline/candidate/Alone.one
new file mode 100644
index 0000000000000000000000000000000000000000..4aa42e68b535934ea8be212d109730c377d651e1
Binary files /dev/null and b/corpus/object-outline/candidate/Alone.one differ
diff --git a/corpus/object-outline/candidate/Open Notebook.onetoc2 b/corpus/object-outline/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..f0716c8f06f2b897b6c4d509045c8bed120d5ddd
Binary files /dev/null and b/corpus/object-outline/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/cold/commands.jsonl b/corpus/object-outline/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..5c08072dc0659dac911231068d67ae1834ca09e0
--- /dev/null
+++ b/corpus/object-outline/cold/commands.jsonl
@@ -0,0 +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-9223BC24 -ExpectedPages 2 -KeepOpen", "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/object-outline/cold/machine.json b/corpus/object-outline/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0fbbde039bb643be8788312ff6e49d5763277f2
--- /dev/null
+++ b/corpus/object-outline/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-9223bc24", "hostname": "ONE-M6-9223BC24"}
diff --git a/corpus/object-outline/cold/notebook/Alone.one b/corpus/object-outline/cold/notebook/Alone.one
new file mode 100644
index 0000000000000000000000000000000000000000..54a4ffdad5720019849dfc1e6cf126979785a822
Binary files /dev/null and b/corpus/object-outline/cold/notebook/Alone.one differ
diff --git a/corpus/object-outline/cold/notebook/Open Notebook.onetoc2 b/corpus/object-outline/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..6d009857fe5a4767d950bfc96b8dde5347b4677c
Binary files /dev/null and b/corpus/object-outline/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/cold/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment b/corpus/object-outline/cold/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/cold/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/cold/read/environment.json b/corpus/object-outline/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..cdcd7157cb46e0d1955bd172295b161373a9f269
--- /dev/null
+++ b/corpus/object-outline/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-9223BC24",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/object-outline/cold/read/hierarchy.xml b/corpus/object-outline/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e44dace2ec57e4853be7255d588dbe87cf747a1
--- /dev/null
+++ b/corpus/object-outline/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/cold/read/page-000.navigation.json b/corpus/object-outline/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed3fd2785575612f4661f5cdc5e5a8f5201a9e93
--- /dev/null
+++ b/corpus/object-outline/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "File alone - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/object-outline/cold/read/page-000.png b/corpus/object-outline/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea9aa6560b9aa50f35adebaf14a78bc0ceca7558
Binary files /dev/null and b/corpus/object-outline/cold/read/page-000.png differ
diff --git a/corpus/object-outline/cold/read/page-000.xml b/corpus/object-outline/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1f71296031fcbad203b1b54c63f1c35d6aacd39
--- /dev/null
+++ b/corpus/object-outline/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/cold/read/page-001.navigation.json b/corpus/object-outline/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..aca8aeba4ad53dbc8917f48caa5943126d869f67
--- /dev/null
+++ b/corpus/object-outline/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Picture alone - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/object-outline/cold/read/page-001.png b/corpus/object-outline/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..487311013f085c17d36f3d925bad161b3158c07e
Binary files /dev/null and b/corpus/object-outline/cold/read/page-001.png differ
diff --git a/corpus/object-outline/cold/read/page-001.xml b/corpus/object-outline/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa99cc94f3cdf65fe2cf6b5650868a5f8e750517
--- /dev/null
+++ b/corpus/object-outline/cold/read/page-001.xml
@@ -0,0 +1,5 @@
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7A
+oYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8h
+iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO
+4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII=
diff --git a/corpus/object-outline/cold/read/payloads.json b/corpus/object-outline/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..e65c7d119cf0a1dca1b6ea68a6c189ad0ceae60d
--- /dev/null
+++ b/corpus/object-outline/cold/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "name": "notes.txt",
+ "object": "{0667B952-4A41-0044-27AE-6ABA17C71F9C}{24}{B0}",
+ "kind": "InsertedFile",
+ "page": "{066E2411-379B-069C-05F5-B4C764463F16}{1}{B0}",
+ "bytes": 23
+ }
+]
\ No newline at end of file
diff --git a/corpus/object-outline/cold/run.json b/corpus/object-outline/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3382dfe997c67a7b1b4c09af2abaf62e69d509d
--- /dev/null
+++ b/corpus/object-outline/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/alone-candidate",
+ "expected_pages": 2,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/object-outline/cold/scripts/cold.ps1 b/corpus/object-outline/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/object-outline/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/object-outline/cold/scripts/read.ps1 b/corpus/object-outline/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/object-outline/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/object-outline/cold/source.json b/corpus/object-outline/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a80cb36fdff9e59a3da9a9fcd12a2fadbeb3436
--- /dev/null
+++ b/corpus/object-outline/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Alone.one",
+ "bytes": 23784,
+ "sha256": "640df8294a0321ab33d8bea926027385c7e741ca6614190dccdbd9d094f8b499",
+ "mtime_ns": 1790745185101431771
+ },
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "25817d6bf13a331f77563bac871208b831b5b2d7b6f9a4f3e916cc672dc8617c",
+ "mtime_ns": 1790745185101625391
+ }
+]
diff --git a/corpus/object-outline/cold/teardown.json b/corpus/object-outline/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/object-outline/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/object-outline/keys/before-read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment b/corpus/object-outline/keys/before-read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/keys/before-read/environment.json b/corpus/object-outline/keys/before-read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..07a1d30abfedb1d7e9da2f1c5eb65613f08d3649
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-2BB9C6C4",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/object-outline/keys/before-read/hierarchy.xml b/corpus/object-outline/keys/before-read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6b1857878b6245dc11352492f51f25331f52f38d
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/before-read/page-000.xml b/corpus/object-outline/keys/before-read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fce0eeb90bc5df3a98b61fe99b40f949b0c6e273
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/before-read/page-001.xml b/corpus/object-outline/keys/before-read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4e9e23104b9bbd0f6c1fc15bf4f983f975445c9
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/before-read/page-002.xml b/corpus/object-outline/keys/before-read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..131fb7750ba21b8414ca123ecc5a582c0dbfc0cd
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/page-002.xml
@@ -0,0 +1,5 @@
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7A
+oYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8h
+iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO
+4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII=
diff --git a/corpus/object-outline/keys/before-read/payloads.json b/corpus/object-outline/keys/before-read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..b0e3fe2308903c84baf0421514b818c859546d38
--- /dev/null
+++ b/corpus/object-outline/keys/before-read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "name": "notes.txt",
+ "object": "{61BCCC54-7CAF-01FE-29AB-CBA3BD28084B}{24}{B0}",
+ "kind": "InsertedFile",
+ "page": "{61B55117-0175-0726-0BF0-15DECEA928C1}{1}{B0}",
+ "bytes": 23
+ }
+]
\ No newline at end of file
diff --git a/corpus/object-outline/keys/commands.jsonl b/corpus/object-outline/keys/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..4cb34f7ec1deea36028d6dcaf16cbca35f17209a
--- /dev/null
+++ b/corpus/object-outline/keys/commands.jsonl
@@ -0,0 +1,6 @@
+{"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-2BB9C6C4 -ExpectedPages -1 -KeepOpen", "exit": 0, "stdout": "Read 2 sections and 3 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}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "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-2BB9C6C4 -UseCurrentCache -ExpectedPages -1", "exit": 0, "stdout": "Read 2 sections and 3 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/object-outline/keys/file-alone.ahk b/corpus/object-outline/keys/file-alone.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..08c2f1802712ab90f3f34a2b69d998413835488f
--- /dev/null
+++ b/corpus/object-outline/keys/file-alone.ahk
@@ -0,0 +1,13 @@
+ComObject("OneNote.Application").NavigateTo("{61B55117-0175-0726-0BF0-15DECEA928C1}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+MouseMove(190, 260)
+Sleep(800)
+Click(236, 301)
+Sleep(500)
+SendText("abc")
+Sleep(2000)
diff --git a/corpus/object-outline/keys/file-alone.json b/corpus/object-outline/keys/file-alone.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed3fd2785575612f4661f5cdc5e5a8f5201a9e93
--- /dev/null
+++ b/corpus/object-outline/keys/file-alone.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "File alone - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/object-outline/keys/file-alone.png b/corpus/object-outline/keys/file-alone.png
new file mode 100644
index 0000000000000000000000000000000000000000..befa61dd11f400e983c4b3ffc3664dfb6a11965c
Binary files /dev/null and b/corpus/object-outline/keys/file-alone.png differ
diff --git a/corpus/object-outline/keys/machine.json b/corpus/object-outline/keys/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..81a065c4392d33fafcba8a73eb0ff23a4f685699
--- /dev/null
+++ b/corpus/object-outline/keys/machine.json
@@ -0,0 +1 @@
+{"name": "m6-2bb9c6c4", "hostname": "ONE-M6-2BB9C6C4"}
diff --git a/corpus/object-outline/keys/notebook/Alone.one b/corpus/object-outline/keys/notebook/Alone.one
new file mode 100644
index 0000000000000000000000000000000000000000..0825e6c86a5634d214819c438943015aa27b60e6
Binary files /dev/null and b/corpus/object-outline/keys/notebook/Alone.one differ
diff --git a/corpus/object-outline/keys/notebook/Open Notebook.onetoc2 b/corpus/object-outline/keys/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..bdbffbaec4fbd2ff9bbbf826863008fefb549a6d
Binary files /dev/null and b/corpus/object-outline/keys/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/keys/notebook/fixture-data/Open Notebook.onetoc2 b/corpus/object-outline/keys/notebook/fixture-data/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..faf1cb4a07d510a73f8dc12a13a8490bc834f3c2
Binary files /dev/null and b/corpus/object-outline/keys/notebook/fixture-data/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/keys/notebook/fixture-data/notes.txt b/corpus/object-outline/keys/notebook/fixture-data/notes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/keys/notebook/fixture-data/notes.txt
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/keys/notebook/fixture.json b/corpus/object-outline/keys/notebook/fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..4a481c470291288052a5264feedebf411dfb3943
--- /dev/null
+++ b/corpus/object-outline/keys/notebook/fixture.json
@@ -0,0 +1,15 @@
+{
+ "sections": [
+ "Alone.one"
+ ],
+ "pages": [
+ {
+ "section": "Alone.one",
+ "xml": ""
+ },
+ {
+ "section": "Alone.one",
+ "xml": "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7AoYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8hiZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/corpus/object-outline/keys/notebook/synthetic.one b/corpus/object-outline/keys/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..4c641f1d43053dd5122b8fd944d4da15c51bf56a
Binary files /dev/null and b/corpus/object-outline/keys/notebook/synthetic.one differ
diff --git a/corpus/object-outline/keys/picture-alone.ahk b/corpus/object-outline/keys/picture-alone.ahk
new file mode 100644
index 0000000000000000000000000000000000000000..c2c19dbf01448e96fcf4c1550e7ec09a140e91ea
--- /dev/null
+++ b/corpus/object-outline/keys/picture-alone.ahk
@@ -0,0 +1,13 @@
+ComObject("OneNote.Application").NavigateTo("{A57769C4-804E-0B9F-0DD2-A7A457B448E4}{1}{B0}", "", false)
+WinWait("ahk_exe ONENOTE.EXE", , 30)
+WinActivate("ahk_exe ONENOTE.EXE")
+WinWaitActive("ahk_exe ONENOTE.EXE", , 30)
+WinMaximize("ahk_exe ONENOTE.EXE")
+Sleep(3000)
+CoordMode("Mouse", "Screen")
+MouseMove(190, 260)
+Sleep(800)
+Click(238, 282)
+Sleep(500)
+SendText("abc")
+Sleep(2000)
diff --git a/corpus/object-outline/keys/picture-alone.json b/corpus/object-outline/keys/picture-alone.json
new file mode 100644
index 0000000000000000000000000000000000000000..aca8aeba4ad53dbc8917f48caa5943126d869f67
--- /dev/null
+++ b/corpus/object-outline/keys/picture-alone.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Picture alone - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/object-outline/keys/picture-alone.png b/corpus/object-outline/keys/picture-alone.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b19e89d8e12a740899f4060908df384352728b1
Binary files /dev/null and b/corpus/object-outline/keys/picture-alone.png differ
diff --git a/corpus/object-outline/keys/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment b/corpus/object-outline/keys/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/keys/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/keys/read/environment.json b/corpus/object-outline/keys/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..8936a097e4654cdf89f1171959397cf6a41e6ef8
--- /dev/null
+++ b/corpus/object-outline/keys/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-2BB9C6C4",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/object-outline/keys/read/hierarchy.xml b/corpus/object-outline/keys/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1676e03e26b3528934cf4f54e56aa4bf42e77744
--- /dev/null
+++ b/corpus/object-outline/keys/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/read/page-000.xml b/corpus/object-outline/keys/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1156989697848cc7fd8f227a71a627f8211eacf4
--- /dev/null
+++ b/corpus/object-outline/keys/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/read/page-001.xml b/corpus/object-outline/keys/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9ba777420b03e6936c773e1b6f0f1958cecc924
--- /dev/null
+++ b/corpus/object-outline/keys/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/keys/read/page-002.xml b/corpus/object-outline/keys/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d7b509b1ce562aecddf07dfaf1c1d2f00a44aa3
--- /dev/null
+++ b/corpus/object-outline/keys/read/page-002.xml
@@ -0,0 +1,5 @@
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7A
+oYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8h
+iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO
+4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII=
diff --git a/corpus/object-outline/keys/read/payloads.json b/corpus/object-outline/keys/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..b0e3fe2308903c84baf0421514b818c859546d38
--- /dev/null
+++ b/corpus/object-outline/keys/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "name": "notes.txt",
+ "object": "{61BCCC54-7CAF-01FE-29AB-CBA3BD28084B}{24}{B0}",
+ "kind": "InsertedFile",
+ "page": "{61B55117-0175-0726-0BF0-15DECEA928C1}{1}{B0}",
+ "bytes": 23
+ }
+]
\ No newline at end of file
diff --git a/corpus/object-outline/keys/run.json b/corpus/object-outline/keys/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..51885d77cc99989f0dde02a9bb081ddbe4926604
--- /dev/null
+++ b/corpus/object-outline/keys/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/Users/clo/dev/one/corpus/object-outline/native/notebook",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/object-outline/keys/scripts/cold.ps1 b/corpus/object-outline/keys/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/object-outline/keys/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/object-outline/keys/scripts/read.ps1 b/corpus/object-outline/keys/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/object-outline/keys/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/object-outline/keys/source.json b/corpus/object-outline/keys/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..48f1f68639a6c6d352ec34d74c70039841eaf937
--- /dev/null
+++ b/corpus/object-outline/keys/source.json
@@ -0,0 +1,38 @@
+[
+ {
+ "path": "Alone.one",
+ "bytes": 20784,
+ "sha256": "5fe3413bdd11788de729b1b8b375b5174af7acfcf5624b1f13e43b19334d4c3b",
+ "mtime_ns": 1790744804347247366
+ },
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 3980,
+ "sha256": "49e914844513913cd4c3ec5e8fe3a237aa4d10a8575da1f2af1a9c3f97515656",
+ "mtime_ns": 1790744804345074117
+ },
+ {
+ "path": "fixture-data/Open Notebook.onetoc2",
+ "bytes": 3656,
+ "sha256": "e4f66353f0be442324927f1b4a158b8daad7900da2cc25f82a971605d1770a3e",
+ "mtime_ns": 1790744804346997658
+ },
+ {
+ "path": "fixture-data/notes.txt",
+ "bytes": 23,
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "mtime_ns": 1790744804346747949
+ },
+ {
+ "path": "fixture.json",
+ "bytes": 1240,
+ "sha256": "2b40bc72f2d9aefa7235fcb8f11a905904e6df46c6caa8f25444ce2d31b82457",
+ "mtime_ns": 1790744804344731700
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 5892,
+ "sha256": "a91822e4b09999a7f57435856ea754185d0e37079db20e52a62b417017a6a8e5",
+ "mtime_ns": 1790744804347492408
+ }
+]
diff --git a/corpus/object-outline/keys/teardown.json b/corpus/object-outline/keys/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/object-outline/keys/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/object-outline/native/commands.jsonl b/corpus/object-outline/native/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..403d2808c096758521dfb4f5f4e2d9afec080988
--- /dev/null
+++ b/corpus/object-outline/native/commands.jsonl
@@ -0,0 +1,4 @@
+{"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\\author.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-242DCCBE", "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-242DCCBE -ExpectedPages 3 -UseCurrentCache", "exit": 0, "stdout": "Read 2 sections and 3 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/object-outline/native/machine.json b/corpus/object-outline/native/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4325c839bb846a58495a5c1d64d7866cac8cc7
--- /dev/null
+++ b/corpus/object-outline/native/machine.json
@@ -0,0 +1 @@
+{"name": "m6-242dccbe", "hostname": "ONE-M6-242DCCBE"}
diff --git a/corpus/object-outline/native/notebook/Alone.one b/corpus/object-outline/native/notebook/Alone.one
new file mode 100644
index 0000000000000000000000000000000000000000..48d5ca5385260f33db4e307bd1d75eeca7564775
Binary files /dev/null and b/corpus/object-outline/native/notebook/Alone.one differ
diff --git a/corpus/object-outline/native/notebook/Open Notebook.onetoc2 b/corpus/object-outline/native/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..bdbffbaec4fbd2ff9bbbf826863008fefb549a6d
Binary files /dev/null and b/corpus/object-outline/native/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/native/notebook/fixture-data/Open Notebook.onetoc2 b/corpus/object-outline/native/notebook/fixture-data/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..faf1cb4a07d510a73f8dc12a13a8490bc834f3c2
Binary files /dev/null and b/corpus/object-outline/native/notebook/fixture-data/Open Notebook.onetoc2 differ
diff --git a/corpus/object-outline/native/notebook/fixture-data/notes.txt b/corpus/object-outline/native/notebook/fixture-data/notes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/native/notebook/fixture-data/notes.txt
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/native/notebook/fixture.json b/corpus/object-outline/native/notebook/fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..4a481c470291288052a5264feedebf411dfb3943
--- /dev/null
+++ b/corpus/object-outline/native/notebook/fixture.json
@@ -0,0 +1,15 @@
+{
+ "sections": [
+ "Alone.one"
+ ],
+ "pages": [
+ {
+ "section": "Alone.one",
+ "xml": ""
+ },
+ {
+ "section": "Alone.one",
+ "xml": "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7AoYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8hiZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII="
+ }
+ ]
+}
\ No newline at end of file
diff --git a/corpus/object-outline/native/notebook/synthetic.one b/corpus/object-outline/native/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..858d8a574fea2fd15de8d440db7b1eef5d495265
Binary files /dev/null and b/corpus/object-outline/native/notebook/synthetic.one differ
diff --git a/corpus/object-outline/native/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment b/corpus/object-outline/native/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..249e2b8dd53ba539efce08db14a4fc4a420f2b73
--- /dev/null
+++ b/corpus/object-outline/native/read/93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259.attachment
@@ -0,0 +1 @@
+Plain text attachment
diff --git a/corpus/object-outline/native/read/environment.json b/corpus/object-outline/native/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..def8c2b897144aa3a6b9f0ca595da8b73572d5fe
--- /dev/null
+++ b/corpus/object-outline/native/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-242DCCBE",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/object-outline/native/read/hierarchy.xml b/corpus/object-outline/native/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba400b1769d6a01f25b48bab02ec9c81e3ec026e
--- /dev/null
+++ b/corpus/object-outline/native/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/native/read/page-000.xml b/corpus/object-outline/native/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b22d655c9cd9e53ff20dcc3508f2f56fe4bb4c94
--- /dev/null
+++ b/corpus/object-outline/native/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/native/read/page-001.xml b/corpus/object-outline/native/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd049e59e569099c11c86760b3eeccf84639b660
--- /dev/null
+++ b/corpus/object-outline/native/read/page-001.xml
@@ -0,0 +1,5 @@
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAAAwCAIAAAAuKetIAAAAj0lEQVR4nO3ZsQkDQQwF0bnhit7A
+oYMrx0W4DtfiAswaDgd7A37pRyAJZdoezxdlEidxEidxEidxErfPgjFuXMxx3E8MMCtYZUwWmj8h
+iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4iZM4idu/ZBd8EXza/o/uxSRO
+4iRO4lzdwK/eahkMdcPZIWgAAAAASUVORK5CYII=
diff --git a/corpus/object-outline/native/read/page-002.xml b/corpus/object-outline/native/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..106edff4755eb23290b5274aedb8b3e44add1df3
--- /dev/null
+++ b/corpus/object-outline/native/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/object-outline/native/read/payloads.json b/corpus/object-outline/native/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..e9811dcade5ea6e76829cd0e42e86955b081fbc0
--- /dev/null
+++ b/corpus/object-outline/native/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "name": "notes.txt",
+ "object": "{6765D3EA-B77A-0052-0237-D533EA08D377}{24}{B0}",
+ "kind": "InsertedFile",
+ "page": "{676C4EA9-CAA0-068A-206C-0B4E9989F3FD}{1}{B0}",
+ "bytes": 23
+ }
+]
\ No newline at end of file
diff --git a/corpus/object-outline/native/run.json b/corpus/object-outline/native/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d9a49d8449d9e32fb016e124444ba1fc4038b56
--- /dev/null
+++ b/corpus/object-outline/native/run.json
@@ -0,0 +1,19 @@
+{
+ "notebook": "/private/tmp/unsup-lab/alone-input/notebook",
+ "expected_pages": 3,
+ "author": "tools/native/pages.ps1",
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "author.ps1": "dfbf0e016aa4c8486ecea9f39768c633de05ac0db8214139052ca2e9c43bbd02",
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/object-outline/native/scripts/author.ps1 b/corpus/object-outline/native/scripts/author.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..8e428618e3452caa35da88687293b520c273b6c6
--- /dev/null
+++ b/corpus/object-outline/native/scripts/author.ps1
@@ -0,0 +1,42 @@
+param([Parameter(Mandatory=$true)][string]$Root, [Parameter(Mandatory=$true)][string]$CloneHost)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+& "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost
+$fixture = Get-Content (Join-Path $Root 'notebook\fixture.json') -Raw -Encoding UTF8 | ConvertFrom-Json
+$inputs = Join-Path $Root 'inputs'
+New-Item -ItemType Directory -Path $inputs | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+try {
+ $app.OpenHierarchy((Join-Path $Root 'notebook'), '', [ref]$notebookId, 0)
+ $sections = @{}
+ foreach ($path in $fixture.sections) {
+ $parts = $path.Split('/')
+ if (@($parts | Where-Object { $_ -in @('', '.', '..') -or $_.Contains('\') -or $_.Contains(':') }).Count) { throw 'Invalid fixture section path.' }
+ $parent = $notebookId
+ for ($index = 0; $index -lt $parts.Count; $index++) {
+ $id = ''
+ $app.OpenHierarchy($parts[$index], $parent, [ref]$id, $(if ($index -eq $parts.Count - 1) {3} else {2}))
+ $parent = $id
+ }
+ $sections[$path] = $id
+ }
+ $index = 0
+ foreach ($item in $fixture.pages) {
+ $pageId = ''
+ $app.CreateNewPage($sections[$item.section], [ref]$pageId, 0)
+ [xml]$xml = $item.xml.Replace('__ASSETS__', [Security.SecurityElement]::Escape((Join-Path $Root 'notebook\fixture-data')))
+ $xml.DocumentElement.SetAttribute('ID', $pageId)
+ [IO.File]::WriteAllText((Join-Path $inputs ('page-{0:d3}.xml' -f $index)), $xml.OuterXml, [Text.Encoding]::UTF8)
+ $app.UpdatePageContent($xml.OuterXml, [DateTime]::MinValue, 1, $true)
+ $index++
+ }
+ $app.SyncHierarchy($notebookId)
+ $app.CloseNotebook($notebookId, $false)
+ $notebookId = ''
+} finally {
+ if ($notebookId) { $app.CloseNotebook($notebookId, $false) }
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+}
diff --git a/corpus/object-outline/native/scripts/cold.ps1 b/corpus/object-outline/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/object-outline/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/object-outline/native/scripts/read.ps1 b/corpus/object-outline/native/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/object-outline/native/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/object-outline/native/source.json b/corpus/object-outline/native/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..8e29e643305ed8b9ed22ce363581dd841e539457
--- /dev/null
+++ b/corpus/object-outline/native/source.json
@@ -0,0 +1,26 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1612,
+ "sha256": "fafa5dcb3cd827c7edd30c8ea2fbc957a59fb4d2a8b28b667a3c551c8261ab86",
+ "mtime_ns": 1790744194106080813
+ },
+ {
+ "path": "fixture-data/notes.txt",
+ "bytes": 23,
+ "sha256": "93d5f94f89aaa8a154fd3f4b8ee770706ee075bda149fb5b68d4038ab5488259",
+ "mtime_ns": 1790744194111002128
+ },
+ {
+ "path": "fixture.json",
+ "bytes": 1240,
+ "sha256": "2b40bc72f2d9aefa7235fcb8f11a905904e6df46c6caa8f25444ce2d31b82457",
+ "mtime_ns": 1790744196600541274
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 3348,
+ "sha256": "b0662387c3fdc256d8dbe809e3b8f73b3586559696467fb1fff8f589095fa797",
+ "mtime_ns": 1790744194106931525
+ }
+]
diff --git a/corpus/object-outline/native/teardown.json b/corpus/object-outline/native/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/object-outline/native/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/printout/README.md b/corpus/printout/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b04d364e2740906d9cf5cd24acf1ad755fb7ad2e
--- /dev/null
+++ b/corpus/printout/README.md
@@ -0,0 +1,19 @@
+# File printouts
+
+`native/` is a notebook OneNote 2010 made in the lab (Insert, File Printout of a
+two-page Word document, and a shape pasted from Word), cold-read with
+`tools/native_runner.py`. Each printout page is a picture whose PictureContainer is the
+printout's XPS package, shared by its pages, with IsPrintout, the page shown
+(DisplayedPageNumber) and OneNote's PNG rendering of that page as its
+WebPictureContainer14 (MS-ONE 2.3.98), which Snowbound draws, framed in grey as OneNote
+frames printout pages.
+
+`candidate/` is the output of `printouts_show_onenotes_rendering_and_move_as_pictures`
+in `crates/canvas/tests/printouts.rs`: one printout page moved down, the other deleted
+and the deletion undone, and text typed before the citation, published as one revision.
+Snowbound does not write XPS packages, so the undone page returns as the PNG OneNote
+showed of it. `cold/` is a fresh OneNote 2010 read: the moved page is still a printout,
+the restored one a picture. `tools/test_printout.py` checks this without a VM.
+Regenerate with `SNOWBOUND_PRINTOUT_EXPORT` set to a new absolute directory while
+running the test, then cold-open it with
+`tools/native_runner.py OUTPUT COLD --expected-pages 2 --collect-notebook --screenshots`.
diff --git a/corpus/printout/candidate/Open Notebook.onetoc2 b/corpus/printout/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..90da353c9de9888642b5d42f22eb53e74962833d
Binary files /dev/null and b/corpus/printout/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/printout/candidate/Printouts.one b/corpus/printout/candidate/Printouts.one
new file mode 100644
index 0000000000000000000000000000000000000000..d2e66594be0d9f0b2ec85053feb723d819eabd7b
Binary files /dev/null and b/corpus/printout/candidate/Printouts.one differ
diff --git a/corpus/printout/cold/commands.jsonl b/corpus/printout/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..06aa4959935e4e5b9720e0342b9fe633deb3d447
--- /dev/null
+++ b/corpus/printout/cold/commands.jsonl
@@ -0,0 +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-B402FE00 -ExpectedPages 2 -KeepOpen", "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/printout/cold/machine.json b/corpus/printout/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..41d3b5748eadd4f55fb2f0f51ffb9e06b59334b5
--- /dev/null
+++ b/corpus/printout/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-b402fe00", "hostname": "ONE-M6-B402FE00"}
diff --git a/corpus/printout/cold/notebook/Open Notebook.onetoc2 b/corpus/printout/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..e052f7f02ea4094221dca80760b88f7952848e6b
Binary files /dev/null and b/corpus/printout/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/printout/cold/notebook/Printouts.one b/corpus/printout/cold/notebook/Printouts.one
new file mode 100644
index 0000000000000000000000000000000000000000..8c35ff854862c80e3fc852dfdbcb9bc452ed76d1
Binary files /dev/null and b/corpus/printout/cold/notebook/Printouts.one differ
diff --git a/corpus/printout/cold/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment b/corpus/printout/cold/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..46b3e8dde9d528a18c72122460c6a8c018f0830b
Binary files /dev/null and b/corpus/printout/cold/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment differ
diff --git a/corpus/printout/cold/read/environment.json b/corpus/printout/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..b60b7a9a6d1208e3110d998f20a286622b5034bc
--- /dev/null
+++ b/corpus/printout/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-B402FE00",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/printout/cold/read/hierarchy.xml b/corpus/printout/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8ca7950adf00d326e81c9763e6b67748cc78a5d
--- /dev/null
+++ b/corpus/printout/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/printout/cold/read/page-000.navigation.json b/corpus/printout/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..61f3843fae261a8867978a4dbc42f1463a422ab2
--- /dev/null
+++ b/corpus/printout/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Pasted shape - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/printout/cold/read/page-000.png b/corpus/printout/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..713354cb41d1fe4527d207f8f6ae13bb71d379ce
Binary files /dev/null and b/corpus/printout/cold/read/page-000.png differ
diff --git a/corpus/printout/cold/read/page-000.xml b/corpus/printout/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e048f48128f2ab49aad3817203b548ebc69f12cf
--- /dev/null
+++ b/corpus/printout/cold/read/page-000.xml
@@ -0,0 +1,74 @@
+
+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
diff --git a/corpus/printout/cold/read/page-001.navigation.json b/corpus/printout/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..86a0d5f7e25a7ab73646345e7d3471637334f39e
--- /dev/null
+++ b/corpus/printout/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Printout - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/printout/cold/read/page-001.png b/corpus/printout/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..5865baf7c33b8ee492af2900abb11b5dd99a4a30
Binary files /dev/null and b/corpus/printout/cold/read/page-001.png differ
diff --git a/corpus/printout/cold/read/page-001.xml b/corpus/printout/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fcdc47760913a58a9bf0c0d30b661a0b1fd0d0af
--- /dev/null
+++ b/corpus/printout/cold/read/page-001.xml
@@ -0,0 +1,526 @@
+
+file://C:\work\printout\inputs\two-pages.docx>]]>iVBORw0KGgoAAAANSUhEUgAAAzAAAAQgCAIAAAC2Gy5ZAAAAAXNSR0IArs4c6QAAAAlwSFlzAAAO
+xAAADsQBlSsOGwAANTtJREFUeF7t1sENACAMAzFg/51bMcV93AUiOX3kzsxxBAgQIECAAAECncDr
+oiUTIECAAAECBAh8AYPMHxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+IEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGD
+LC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMg
+QIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBA
+wCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CA
+AAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAA
+gVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4
+APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAAB
+AgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGD
+zA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIE
+CBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRi
+AYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLE
+EyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQ
+IEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/
+QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBA
+gACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUM
+srgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+A
+AAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAA
+AYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AAB
+AgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAEC
+BGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMji
+AsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIE
+CBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQM
+Mj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQ
+IECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCI
+BQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQ
+T4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBA
+gAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8
+AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAA
+AQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYw
+yOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwB
+AgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAEC
+BAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wME
+CBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQI
+EIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCL
+CxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQ
+IECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAw
+yPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBA
+gAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAg
+FjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5A
+PAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAA
+AQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDz
+AwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAEC
+BAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjA
+IIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEE
+CBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQI
+EDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8Q
+IECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAg
+QCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMs
+LkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBA
+gAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDA
+IPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAA
+AQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACB
+WMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA
+8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAEC
+BAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPM
+DxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQI
+ECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIB
+gywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQT
+IECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAg
+QMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9A
+gAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECA
+AIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyy
+uADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AA
+AQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAAB
+g8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAEC
+BAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIE
+YgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOIC
+xBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQI
+ECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwy
+P0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAg
+QIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgF
+DLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+IEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGD
+LC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMg
+QIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBA
+wCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CA
+AAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAA
+gVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4
+APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAAB
+AgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGD
+zA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIE
+CBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRi
+AYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLE
+EyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQ
+IEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/
+QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBA
+gACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUM
+srgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+A
+AAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAA
+AYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AAB
+AgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAEC
+BGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMji
+AsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIE
+CBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQM
+Mj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQ
+IECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCI
+BQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQ
+T4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBA
+gAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8
+AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAA
+AQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYw
+yOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwB
+AgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAEC
+BAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wME
+CBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQI
+EIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCL
+CxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQ
+IECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAw
+yPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBA
+gAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAg
+FjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5A
+PAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAA
+AQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDz
+AwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAEC
+BAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjA
+IIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEE
+CBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQI
+EDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8Q
+IECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAg
+QCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMs
+LkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBA
+gAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDA
+IPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAA
+AQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACB
+WMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA
+8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAEC
+BAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPM
+DxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQI
+ECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIB
+gywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQT
+IECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAg
+QMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9A
+gAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECA
+AIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyy
+uADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AA
+AQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAAB
+g8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAEC
+BAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIE
+YgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOIC
+xBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQI
+ECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwy
+P0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAg
+QIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgF
+DLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+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
+b7w9fTfueZOd73/e+no85cQ4n3a+6vxw83zPK8yV7fpH5xHPfP71T7///e9/8IMffLyR9vS5j5BP
+b/zDH/7wz3me+eaP9+SennzFOH+ueM9QPP3M/8l3H1+8dZ9BgAABAgT+JwXOOyX+vLDAxz/+8Ve8
+4hV//vOfn37aq171qp/85CfnI+fj5++//e1vz9/PKvrqV796fdr54PnPM27O1/7pT386fz+fc/5+
+febXvva1Z/7++Krr216f/NGPfvSZbOeD58/1wfNNTrbHJ5//en38RHo89Ap/BTh/vz7/+vv1oGdO
+uJ57Hfs457rxvCyfCfP0m5/vdgU7u+rxlEfC88FH7Mejrw9e2R5f/swj/FcCBAgQILAg4B2yF1+/
+3/72t7/yla+88Y1vfPp+0nnb7AMf+MD54te97nVf+tKXfv7zn5+3gn7wgx987GMfe/pe2je/+c3z
+487Xv/7154PnZ4gf+chHzmden/DlL3/5+qni+973vvPrWefLz9tUj297/tF56POG+/Wvf319/Hzh
+eaPregvqfIdPf/rTz/v5jwCf+tSnzuf/8+ecEfahD33oCnOF/M1vfvP0nHPjj370oxf+5u94xzvO
+J5yNdX5gesSuT37zm998PfGsrg9/+MPXB9/73vde77cdioNw4VyY3iR7XmQfJECAAIGXvYBB9pIq
+Plvn/FbWWTbvfOc7z2g48+IMoMdP3z73uc+d8f7Xv/71n38H/0y0pw84W+R85jOPfO1rX3u9e3R9
+25cU6F8/6Xzh+c9//ob/1nc4P3h93u9/5tEPf/jDxznXhHrec14g2xltj3/6+Onk+ano9cSzus4j
+rk/4whe+cIba+csvfvGLz3/+84/nvvTDfSYBAgQIEHiZCRhk/45Cr3dxzmy63tS5fs3/+vOZz3zm
+Na95zT9/r8fbQtc/+uUvf/kCz7u+7Uv/czbTS//kF/jMN73pTSfn03POpc97zgt8k8fvip1fC/vs
+Zz97fbczYa8vOT/0fEzY827cJfme97znvEP29Lkv/C8i/Jcc65sQIECAAIGggEH2IqWcefH4nf3z
+I8Xz2W9/+9uv97Se+Z+NuN4i+u53v3t9x/OL8+c/z1ti512i6yPny7/3ve+9//3v/7ce+fTbnk8+
+b7w972eed+muj3/xi188Q+rfO+Me3/Pxe/rnnbPz9tUzPy58es4ZW2dFPW+Yc901xa7Dz6I63/Yx
+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
diff --git a/corpus/printout/cold/read/payloads.json b/corpus/printout/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1973a2e9f9b9a482fd4b86897627e4103866cb04
--- /dev/null
+++ b/corpus/printout/cold/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7",
+ "name": "two-pages.docx",
+ "object": "{DB7C4F71-B073-0121-2D07-84DA732F3A82}{23}{B0}",
+ "kind": "InsertedFile",
+ "page": "{DC91B969-8F8E-0E38-22C6-17772EFD8803}{1}{B0}",
+ "bytes": 12589
+ }
+]
\ No newline at end of file
diff --git a/corpus/printout/cold/run.json b/corpus/printout/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..569608b03b8438b13f9f79044d5a6ea8191630d5
--- /dev/null
+++ b/corpus/printout/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/printout-candidate",
+ "expected_pages": 2,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/printout/cold/scripts/cold.ps1 b/corpus/printout/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/printout/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/printout/cold/scripts/read.ps1 b/corpus/printout/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/printout/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/printout/cold/source.json b/corpus/printout/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..62181874431e571489e154622f1c1b3ac870956a
--- /dev/null
+++ b/corpus/printout/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1612,
+ "sha256": "29bbfd869154aea1720f98cf7c7cc40387313b00c8dfdb61d159f968312367b4",
+ "mtime_ns": 1790744275764608328
+ },
+ {
+ "path": "Printouts.one",
+ "bytes": 268208,
+ "sha256": "5b48da81b1b374da9af23b4dd664b01b100c34be71aef721907f4365afe5577e",
+ "mtime_ns": 1790744275764329165
+ }
+]
diff --git a/corpus/printout/cold/teardown.json b/corpus/printout/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/printout/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/printout/native/commands.jsonl b/corpus/printout/native/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..fcb05fee3efac52b109c62f715986651312665ad
--- /dev/null
+++ b/corpus/printout/native/commands.jsonl
@@ -0,0 +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-5A6EE6B8 -ExpectedPages 2 -KeepOpen", "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/printout/native/machine.json b/corpus/printout/native/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..b46527e91889a33db509cace5f21bf63675cee00
--- /dev/null
+++ b/corpus/printout/native/machine.json
@@ -0,0 +1 @@
+{"name": "m6-5a6ee6b8", "hostname": "ONE-M6-5A6EE6B8"}
diff --git a/corpus/printout/native/notebook/Open Notebook.onetoc2 b/corpus/printout/native/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..3831241391b8036277838b65a5b23ea67c24cd24
Binary files /dev/null and b/corpus/printout/native/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/printout/native/notebook/Printouts.one b/corpus/printout/native/notebook/Printouts.one
new file mode 100644
index 0000000000000000000000000000000000000000..9129491d6e151e32ddde445edaced78d9b00c195
Binary files /dev/null and b/corpus/printout/native/notebook/Printouts.one differ
diff --git a/corpus/printout/native/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment b/corpus/printout/native/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..46b3e8dde9d528a18c72122460c6a8c018f0830b
Binary files /dev/null and b/corpus/printout/native/read/e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7.attachment differ
diff --git a/corpus/printout/native/read/environment.json b/corpus/printout/native/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..7cca60d7ec965e627aaca74ef84a43b1b04dae35
--- /dev/null
+++ b/corpus/printout/native/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-5A6EE6B8",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/printout/native/read/hierarchy.xml b/corpus/printout/native/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03e0a44cf8d7414f107e592c7af32b3903489811
--- /dev/null
+++ b/corpus/printout/native/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/printout/native/read/page-000.navigation.json b/corpus/printout/native/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..61f3843fae261a8867978a4dbc42f1463a422ab2
--- /dev/null
+++ b/corpus/printout/native/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Pasted shape - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/printout/native/read/page-000.png b/corpus/printout/native/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5700cd124e05504603cf988dc4a9811e528bc33
Binary files /dev/null and b/corpus/printout/native/read/page-000.png differ
diff --git a/corpus/printout/native/read/page-000.xml b/corpus/printout/native/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..900c715d278fe3d6de3b0ff8af3c5e963a351363
--- /dev/null
+++ b/corpus/printout/native/read/page-000.xml
@@ -0,0 +1,74 @@
+
+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
diff --git a/corpus/printout/native/read/page-001.navigation.json b/corpus/printout/native/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..86a0d5f7e25a7ab73646345e7d3471637334f39e
--- /dev/null
+++ b/corpus/printout/native/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Printout - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/printout/native/read/page-001.png b/corpus/printout/native/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..d82c5b3f80e96216b8df6e09085e08b46ebb8762
Binary files /dev/null and b/corpus/printout/native/read/page-001.png differ
diff --git a/corpus/printout/native/read/page-001.xml b/corpus/printout/native/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e52836e4e51f7d7a9efeb21b0cd36a939620ddb9
--- /dev/null
+++ b/corpus/printout/native/read/page-001.xml
@@ -0,0 +1,527 @@
+
+file://C:\work\printout\inputs\two-pages.docx>]]>iVBORw0KGgoAAAANSUhEUgAAAzAAAAQgCAIAAAC2Gy5ZAAAAAXNSR0IArs4c6QAAAAlwSFlzAAAO
+xAAADsQBlSsOGwAANTtJREFUeF7t1sENACAMAzFg/51bMcV93AUiOX3kzsxxBAgQIECAAAECncDr
+oiUTIECAAAECBAh8AYPMHxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+IEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGD
+LC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMg
+QIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBA
+wCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CA
+AAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAA
+gVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4
+APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAAB
+AgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGD
+zA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIE
+CBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRi
+AYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLE
+EyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQ
+IEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/
+QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBA
+gACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUM
+srgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+A
+AAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAA
+AYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AAB
+AgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAEC
+BGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMji
+AsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIE
+CBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQM
+Mj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQ
+IECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCI
+BQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQ
+T4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBA
+gAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8
+AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAA
+AQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYw
+yOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwB
+AgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAEC
+BAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wME
+CBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQI
+EIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCL
+CxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQ
+IECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAw
+yPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBA
+gAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAg
+FjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5A
+PAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAA
+AQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDz
+AwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAEC
+BAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjA
+IIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEE
+CBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQI
+EDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8Q
+IECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAg
+QCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMs
+LkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBA
+gAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDA
+IPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAA
+AQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACB
+WMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA
+8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAEC
+BAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPM
+DxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQI
+ECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIB
+gywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQT
+IECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAg
+QMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9A
+gAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECA
+AIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyy
+uADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AA
+AQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAAB
+g8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAEC
+BAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIE
+YgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOIC
+xBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQI
+ECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwy
+P0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAg
+QIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgF
+DLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+IEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGD
+LC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMg
+QIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBA
+wCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CA
+AAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAA
+gVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4
+APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAAB
+AgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGD
+zA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIE
+CBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRi
+AYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLE
+EyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQ
+IEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/
+QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBA
+gACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUM
+srgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+A
+AAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAA
+AYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AAB
+AgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAEC
+BGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMji
+AsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIE
+CBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQM
+Mj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQ
+IECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCI
+BQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQ
+T4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBA
+gAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8
+AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAA
+AQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYw
+yOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwB
+AgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAEC
+BAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wME
+CBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQI
+EIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCL
+CxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQ
+IECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAw
+yPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBA
+gAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAg
+FjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5A
+PAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAA
+AQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDz
+AwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAEC
+BAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjA
+IIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEE
+CBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQI
+EDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8Q
+IECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAg
+QCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMs
+LkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBA
+gAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDA
+IPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAA
+AQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACB
+WMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA
+8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAEC
+BAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPM
+DxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQI
+ECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIB
+gywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQT
+IECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAg
+QMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9A
+gAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECA
+AIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyy
+uADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AA
+AQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAAB
+g8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAEC
+BAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIE
+YgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOIC
+xBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQI
+ECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwy
+P0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAg
+QIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgF
+DLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBP
+gAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECA
+AAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwA
+AQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAAB
+AgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI
+4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAEC
+BAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIE
+DDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQI
+ECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQ
+iAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsL
+EE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAg
+QIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI
+/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECA
+AAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAW
+MMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8
+AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAAB
+AgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMD
+BAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIE
+CBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAg
+iwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQI
+ECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQ
+MMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAABAgQIEIgFDLK4APEECBAgQIAAAYPMDxAg
+QIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFYwCCLCxBPgAABAgQIEDDI/AABAgQIECBA
+IBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADxBAgQIECAAAGDzA8QIECAAAECBGIBgywu
+QDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIECBAwyPwAAQIECBAgQCAWMMjiAsQTIECA
+AAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wPECBAgAABAgRiAYMsLkA8AQIECBAgQMAg
+8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQIEAgFjDI4gLEEyBAgAABAgQMMj9AgAAB
+AgQIEIgFDLK4APEECBAgQIAAAYPMDxAgQIAAAQIEYgGDLC5APAECBAgQIEDAIPMDBAgQIECAAIFY
+wCCLCxBPgAABAgQIEDDI/AABAgQIECBAIBYwyOICxBMgQIAAAQIEDDI/QIAAAQIECBCIBQyyuADx
+BAgQIECAAAGDzA8QIECAAAECBGIBgywuQDwBAgQIECBAwCDzAwQIECBAgACBWMAgiwsQT4AAAQIE
+CBAwyPwAAQIECBAgQCAWMMjiAsQTIECAAAECBAwyP0CAAAECBAgQiAUMsrgA8QQIECBAgAABg8wP
+ECBAgAABAgRiAYMsLkA8AQIECBAgQMAg8wMECBAgQIAAgVjAIIsLEE+AAAECBAgQMMj8AAECBAgQ
+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
+b7w9fTfueZOd73/e+no85cQ4n3a+6vxw83zPK8yV7fpH5xHPfP71T7///e9/8IMffLyR9vS5j5BP
+b/zDH/7wz3me+eaP9+SennzFOH+ueM9QPP3M/8l3H1+8dZ9BgAABAgT+JwXOOyX+vLDAxz/+8Ve8
+4hV//vOfn37aq171qp/85CfnI+fj5++//e1vz9/PKvrqV796fdr54PnPM27O1/7pT386fz+fc/5+
+febXvva1Z/7++Krr216f/NGPfvSZbOeD58/1wfNNTrbHJ5//en38RHo89Ap/BTh/vz7/+vv1oGdO
+uJ57Hfs457rxvCyfCfP0m5/vdgU7u+rxlEfC88FH7Mejrw9e2R5f/swj/FcCBAgQILAg4B2yF1+/
+3/72t7/yla+88Y1vfPp+0nnb7AMf+MD54te97nVf+tKXfv7zn5+3gn7wgx987GMfe/pe2je/+c3z
+487Xv/7154PnZ4gf+chHzmden/DlL3/5+qni+973vvPrWefLz9tUj297/tF56POG+/Wvf319/Hzh
+eaPregvqfIdPf/rTz/v5jwCf+tSnzuf/8+ecEfahD33oCnOF/M1vfvP0nHPjj370oxf+5u94xzvO
+J5yNdX5gesSuT37zm998PfGsrg9/+MPXB9/73vde77cdioNw4VyY3iR7XmQfJECAAIGXvYBB9pIq
+Plvn/FbWWTbvfOc7z2g48+IMoMdP3z73uc+d8f7Xv/71n38H/0y0pw84W+R85jOPfO1rX3u9e3R9
+25cU6F8/6Xzh+c9//ob/1nc4P3h93u9/5tEPf/jDxznXhHrec14g2xltj3/6+Onk+ano9cSzus4j
+rk/4whe+cIba+csvfvGLz3/+84/nvvTDfSYBAgQIEHiZCRhk/45Cr3dxzmy63tS5fs3/+vOZz3zm
+Na95zT9/r8fbQtc/+uUvf/kCz7u+7Uv/czbTS//kF/jMN73pTSfn03POpc97zgt8k8fvip1fC/vs
+Zz97fbczYa8vOT/0fEzY827cJfme97znvEP29Lkv/C8i/Jcc65sQIECAAIGggEH2IqWcefH4nf3z
+I8Xz2W9/+9uv97Se+Z+NuN4i+u53v3t9x/OL8+c/z1ti512i6yPny7/3ve+9//3v/7ce+fTbnk8+
+b7w972eed+muj3/xi188Q+rfO+Me3/Pxe/rnnbPz9tUzPy58es4ZW2dFPW+Yc901xa7Dz6I63/Yx
+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
diff --git a/corpus/printout/native/read/payloads.json b/corpus/printout/native/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..0c2ba107b6e7d335310b92d6c59843d9339fca24
--- /dev/null
+++ b/corpus/printout/native/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "e15f2722a8d11f9e68ac5eff54320f7c4ef5540fb6eb858223e31b983fa1bed7",
+ "name": "two-pages.docx",
+ "object": "{EA6778A6-E35F-0697-11B6-2FB222D735B1}{23}{B0}",
+ "kind": "InsertedFile",
+ "page": "{ED8A8EBE-DCA2-098E-1E77-BC1F7F058730}{1}{B0}",
+ "bytes": 12589
+ }
+]
\ No newline at end of file
diff --git a/corpus/printout/native/run.json b/corpus/printout/native/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..8b32d882ca9a25dc4463cf536d6d38737a5fd4c6
--- /dev/null
+++ b/corpus/printout/native/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/printout/notebook",
+ "expected_pages": 2,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/printout/native/scripts/cold.ps1 b/corpus/printout/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/printout/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/printout/native/scripts/read.ps1 b/corpus/printout/native/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/printout/native/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/printout/native/source.json b/corpus/printout/native/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..c3065458f8ecbf8705e5956b2ccda2448434d036
--- /dev/null
+++ b/corpus/printout/native/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4816,
+ "sha256": "fb4c3df57bb164e4a104f3ec15d65b00a4faf85325a2079096a577a1ff304b45",
+ "mtime_ns": 1790739438446243335
+ },
+ {
+ "path": "Printouts.one",
+ "bytes": 249304,
+ "sha256": "2d75e3cfce89a2e0a18dd97b9fbaab9636a68336c3c0493b1fd5249670f7568d",
+ "mtime_ns": 1790739438418795212
+ }
+]
diff --git a/corpus/printout/native/teardown.json b/corpus/printout/native/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/printout/native/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/recording/README.md b/corpus/recording/README.md
index 768e35f66f67827d5826547d8e0c88b972c9e540..bd403090aa5675ecf49a803cd7683f2026315252 100644
--- a/corpus/recording/README.md
+++ b/corpus/recording/README.md
@@ -32,6 +32,30 @@ was not observed):
click plays from the linked moment.
- **Deleting** the recording removes AudioRecordingGuids from the page; the
notes keep their links (`native/deleted`).
+- **Pause** while recording (the Pause button again resumes) leaves the pause
+ out of the clock; a note written while paused is not linked
+ (`native/read/paused-while-recording.xml`).
+- **See Playback** (on by default) highlights, as a selection, the note
+ linked last at or before the moment playing; the line saying when, linked at
+ 0, is not highlighted (`native/read/onenote-see-playback.png`). When the
+ note playing is off screen OneNote scrolls just far enough to show it
+ (`native/read/onenote-see-playback-scrolls.png`: 60 lines between two
+ notes, played from the top of the page). A linked
+ note plays from five seconds before its moment, the default of Options,
+ Audio & Video (`native/read/onenote-audio-video-options.png`), which also
+ shows the default video profile, Windows Media Video 8 for Local Area Network
+ (256 Kbps). Control-Alt-P plays and Control-Alt-S stops; Control-Alt-A does
+ not record.
+- **Record Video** without a camera says "No camera available. Make sure the
+ camera is properly installed and connected." (`native/read/onenote-no-camera.png`).
+ Installing a virtual camera in the clone was refused, so OneNote's own video
+ recording was not observed.
+- **0x1c001cc8** is a run list of {u32 character position, u8 state} on text
+ objects, OneNote's proofing state: its page date and time and the line saying
+ when recording started always carry `00 00 00 00 03` (three recordings, all
+ pages of `native/`), typed text none or 0, 1 or 9 (a misspelling), equations
+ 5. OneNote writes and rereads it itself and reads text without it, so
+ Snowbound writes it only on new pages' dates, as before.
- **Attach File** of a .wav makes it a recording as well: identity,
IRecordMedia 1 and its length (1,000 ms), listed on the page
(`native/attached`). MS-ONE requires this of .wma, .mp3, .wav, .wmv, .avi and
@@ -62,4 +86,18 @@ link. Regenerate with `ONESTORE_RECORDING_EDIT_EXPORT`, then
`tools/native_runner.py DIR COLD --expected-pages 2 --collect-notebook
--screenshots`.
+`video/` is Record Video. `native/read/attached-video.xml` is OneNote
+attaching one file of each kind: .avi, .mpg and .wmv become recordings (kind 2,
+with their length), .mp4 and .mov plain files. OneNote played Motion JPEG AVI
+with PCM or IMA ADPCM sound, MPEG-1 and WMV 8 with pictures
+(`onenote-plays-attached-*.png`), but H.264 in AVI without them. `video/candidate`
+is `a_video_recording_stores_its_file_line_and_linked_notes_for_onenote` in
+`crates/snowbound/src/recording.rs`: two seconds of Motion JPEG at 320 by 240,
+15 a second, with 16 kHz PCM, as Snowbound records video. `video/cold` is a
+fresh OneNote 2010 read; OneNote played it from a linked note with See Playback
+highlighting it (`video/played-from-note.png`), and played what the macOS
+conversion makes of `video/camera.mov` (H.264 and AAC, as a capture session
+records) and what GStreamer recorded in a Debian 13 VM from its test sources
+(`video/onenote-plays-*.png`). Regenerate with `SNOWBOUND_VIDEO_EXPORT`.
+
`tools/test_recording.py` checks the rows without a VM.
diff --git a/corpus/recording/native/read/attached-video.xml b/corpus/recording/native/read/attached-video.xml
new file mode 100644
index 0000000000000000000000000000000000000000..84ed590489c50103f81c9e55b5244ae1d03b10aa
--- /dev/null
+++ b/corpus/recording/native/read/attached-video.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/corpus/recording/native/read/onenote-audio-video-options.png b/corpus/recording/native/read/onenote-audio-video-options.png
new file mode 100644
index 0000000000000000000000000000000000000000..394a7dd072c0fe86c0228648cc7d2a5e9a6927c5
Binary files /dev/null and b/corpus/recording/native/read/onenote-audio-video-options.png differ
diff --git a/corpus/recording/native/read/onenote-h264-avi-no-picture.png b/corpus/recording/native/read/onenote-h264-avi-no-picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b249ebde1e5af6b99263e7b43ea9b6e32dbe182
Binary files /dev/null and b/corpus/recording/native/read/onenote-h264-avi-no-picture.png differ
diff --git a/corpus/recording/native/read/onenote-no-camera.png b/corpus/recording/native/read/onenote-no-camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..932b4c8b0d25d7c99b8775197aa2298f8dcd7af1
Binary files /dev/null and b/corpus/recording/native/read/onenote-no-camera.png differ
diff --git a/corpus/recording/native/read/onenote-plays-attached-mjpeg-avi.png b/corpus/recording/native/read/onenote-plays-attached-mjpeg-avi.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4bec1789413b3bbc49f91ac7145a502b53f0bd4
Binary files /dev/null and b/corpus/recording/native/read/onenote-plays-attached-mjpeg-avi.png differ
diff --git a/corpus/recording/native/read/onenote-plays-attached-wmv.png b/corpus/recording/native/read/onenote-plays-attached-wmv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d057b265109731458b005f48b7a4bbe249caa19
Binary files /dev/null and b/corpus/recording/native/read/onenote-plays-attached-wmv.png differ
diff --git a/corpus/recording/native/read/onenote-see-playback-scrolls.png b/corpus/recording/native/read/onenote-see-playback-scrolls.png
new file mode 100644
index 0000000000000000000000000000000000000000..62f0a51a4087c2350e5e23066d60aa5daf9c9d8b
Binary files /dev/null and b/corpus/recording/native/read/onenote-see-playback-scrolls.png differ
diff --git a/corpus/recording/native/read/onenote-see-playback.png b/corpus/recording/native/read/onenote-see-playback.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c83faed227532c8b7b6848ef9818456bd1691da
Binary files /dev/null and b/corpus/recording/native/read/onenote-see-playback.png differ
diff --git a/corpus/recording/native/read/paused-while-recording.xml b/corpus/recording/native/read/paused-while-recording.xml
new file mode 100644
index 0000000000000000000000000000000000000000..007671afd64075c61228bc252fe958a85d93c78f
--- /dev/null
+++ b/corpus/recording/native/read/paused-while-recording.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/corpus/recording/video/candidate/Open Notebook.onetoc2 b/corpus/recording/video/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..aa0819c3179b20ea52f6361460bd3003d814f5c9
Binary files /dev/null and b/corpus/recording/video/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/recording/video/candidate/Recorded.one b/corpus/recording/video/candidate/Recorded.one
new file mode 100644
index 0000000000000000000000000000000000000000..723f53fdd4193b7005eab60cd7be67f3f82b370b
Binary files /dev/null and b/corpus/recording/video/candidate/Recorded.one differ
diff --git a/corpus/recording/video/cold/commands.jsonl b/corpus/recording/video/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..da0dbf647198a007373f73ceb7c0a26d21e22e4b
--- /dev/null
+++ b/corpus/recording/video/cold/commands.jsonl
@@ -0,0 +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-63505C69 -ExpectedPages 1 -KeepOpen", "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/recording/video/cold/machine.json b/corpus/recording/video/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8040c3d4b13fd890caac0bc38de094e461139d9
--- /dev/null
+++ b/corpus/recording/video/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-63505c69", "hostname": "ONE-M6-63505C69"}
diff --git a/corpus/recording/video/cold/notebook/Open Notebook.onetoc2 b/corpus/recording/video/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..4e9240932d07eb8a9464f8495c37a1f42090ff2c
Binary files /dev/null and b/corpus/recording/video/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/recording/video/cold/notebook/Recorded.one b/corpus/recording/video/cold/notebook/Recorded.one
new file mode 100644
index 0000000000000000000000000000000000000000..fcf998026cf62ca0b776b5a79c5e637d76f530fd
Binary files /dev/null and b/corpus/recording/video/cold/notebook/Recorded.one differ
diff --git a/corpus/recording/video/cold/read/35256fff9b37a188c746f569cb7b12611d9718c9c4db3737f89a7e1fa11f2b94.attachment b/corpus/recording/video/cold/read/35256fff9b37a188c746f569cb7b12611d9718c9c4db3737f89a7e1fa11f2b94.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..0d89f8eb6e6f46a821a2c46ee2ceb628532fb4de
Binary files /dev/null and b/corpus/recording/video/cold/read/35256fff9b37a188c746f569cb7b12611d9718c9c4db3737f89a7e1fa11f2b94.attachment differ
diff --git a/corpus/recording/video/cold/read/environment.json b/corpus/recording/video/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..bba07c73bd6436f0a600c99f4883d440e6c93e04
--- /dev/null
+++ b/corpus/recording/video/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-63505C69",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/recording/video/cold/read/hierarchy.xml b/corpus/recording/video/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4068f4d99c1146ee46e7aa88c19f2def2db16df
--- /dev/null
+++ b/corpus/recording/video/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/recording/video/cold/read/page-000.navigation.json b/corpus/recording/video/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9ab685397f07722917e45eaa7f4bdb4cfa4d227
--- /dev/null
+++ b/corpus/recording/video/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Before recording - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/recording/video/cold/read/page-000.png b/corpus/recording/video/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e2d270f84ab5c285cc4a86b39e315fb0ce5d6f2
Binary files /dev/null and b/corpus/recording/video/cold/read/page-000.png differ
diff --git a/corpus/recording/video/cold/read/page-000.xml b/corpus/recording/video/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..97ebe77587bde2d84fdc6e8c9a1411dbe037d479
--- /dev/null
+++ b/corpus/recording/video/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/recording/video/cold/read/payloads.json b/corpus/recording/video/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..7227f0249a82a6fb2b74f7f920605c500f3f2f31
--- /dev/null
+++ b/corpus/recording/video/cold/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "35256fff9b37a188c746f569cb7b12611d9718c9c4db3737f89a7e1fa11f2b94",
+ "name": "Recorded.avi",
+ "object": "{BC2E9618-4A21-03A7-3CB4-FDCB55D334AB}{20}{B0}",
+ "kind": "MediaFile",
+ "page": "{BA8D3BEF-1250-0DF7-044C-ACACE947896E}{1}{B0}",
+ "bytes": 266580
+ }
+]
\ No newline at end of file
diff --git a/corpus/recording/video/cold/run.json b/corpus/recording/video/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..b708808d744ffe37bee07175be098acb1b270ef4
--- /dev/null
+++ b/corpus/recording/video/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/snowbound-recording/video-candidate",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/recording/video/cold/scripts/cold.ps1 b/corpus/recording/video/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/recording/video/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/recording/video/cold/scripts/read.ps1 b/corpus/recording/video/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/recording/video/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/recording/video/cold/source.json b/corpus/recording/video/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..689e9fb8904f2bea1692877ca41dca98fcdb76ea
--- /dev/null
+++ b/corpus/recording/video/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "c38d816f868de6acaadc7f3cd6e6f6f6b8322c73cbed1ece005a260d94574c04",
+ "mtime_ns": 1790735554335753866
+ },
+ {
+ "path": "Recorded.one",
+ "bytes": 276984,
+ "sha256": "773042e6ff29189dbb1e20b5ff22cfd40078aefce5ed706d1f2f9fddf41d52fe",
+ "mtime_ns": 1790735554327711884
+ }
+]
diff --git a/corpus/recording/video/cold/teardown.json b/corpus/recording/video/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/recording/video/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/recording/video/onenote-plays-gstreamer.png b/corpus/recording/video/onenote-plays-gstreamer.png
new file mode 100644
index 0000000000000000000000000000000000000000..8216fe6deb05c8eca1beb7da7935bfe31c80f804
Binary files /dev/null and b/corpus/recording/video/onenote-plays-gstreamer.png differ
diff --git a/corpus/recording/video/onenote-plays-macos-conversion.png b/corpus/recording/video/onenote-plays-macos-conversion.png
new file mode 100644
index 0000000000000000000000000000000000000000..49cdf9d55c2cb2ebf160715705129e71920f18d6
Binary files /dev/null and b/corpus/recording/video/onenote-plays-macos-conversion.png differ
diff --git a/corpus/recording/video/played-from-note.png b/corpus/recording/video/played-from-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9b09b08c6353535b52659790e37b4b39ca5c03a
Binary files /dev/null and b/corpus/recording/video/played-from-note.png differ
diff --git a/corpus/table-tags/README.md b/corpus/table-tags/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ab3d742c786dafa9d2b1fca8c2eaa110f58ff71c
--- /dev/null
+++ b/corpus/table-tags/README.md
@@ -0,0 +1,19 @@
+# Note tags on tables through the editor
+
+`native/` is OneNote 2010 authoring `tools/native/pages.ps1` input: three pages in
+`Tables.one`, each a table between two paragraphs, tagged To Do (unchecked) or
+Important, the last also holding a To Do-tagged table in a cell. OneNote stores a
+table's tags on the table object, and draws them in the tag column centred on it.
+
+`candidate/` is the output of `tagged_tables_draw_check_and_survive_edits` in
+`crates/canvas/tests/table_tags.rs`: on "Check a table" a click checks the table's
+box; on "Edit a tagged table" text is typed and Enter pressed in a cell; "Delete and
+undo" has all its content deleted and the deletion undone, each published as its own
+revision.
+
+`cold/` is a fresh OneNote 2010 read: the first table's To Do is completed, the edited
+table keeps its tag, and the restored tables read as OneNote authored them.
+`tools/test_table_tags.py` checks this without a VM. Regenerate with
+`SNOWBOUND_TABLE_TAGS_EXPORT` set to a new absolute directory while running the test,
+then cold-open it with
+`tools/native_runner.py OUTPUT COLD --expected-pages 3 --collect-notebook --screenshots`.
diff --git a/corpus/table-tags/candidate/Open Notebook.onetoc2 b/corpus/table-tags/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..39f970ae66fc1d29760cee79cea2700673bba7e7
Binary files /dev/null and b/corpus/table-tags/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/table-tags/candidate/Tables.one b/corpus/table-tags/candidate/Tables.one
new file mode 100644
index 0000000000000000000000000000000000000000..8c3627f8c8fe1106c5d32b7a17c391aa01714e3e
Binary files /dev/null and b/corpus/table-tags/candidate/Tables.one differ
diff --git a/corpus/table-tags/cold/commands.jsonl b/corpus/table-tags/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..bbf1e00f7199d0b0b5bc2267593c23998beb5b86
--- /dev/null
+++ b/corpus/table-tags/cold/commands.jsonl
@@ -0,0 +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-9A109FC4 -ExpectedPages 3 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 3 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-tags/cold/machine.json b/corpus/table-tags/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..e1085660bf10cd8edf653473961bf1a106fa63ef
--- /dev/null
+++ b/corpus/table-tags/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-9a109fc4", "hostname": "ONE-M6-9A109FC4"}
diff --git a/corpus/table-tags/cold/notebook/Open Notebook.onetoc2 b/corpus/table-tags/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..40a6f9d09a3c86b6a4c09fe9b0d8c81c54a87a68
Binary files /dev/null and b/corpus/table-tags/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/table-tags/cold/notebook/Tables.one b/corpus/table-tags/cold/notebook/Tables.one
new file mode 100644
index 0000000000000000000000000000000000000000..af87f7f9e254e3b2008eed3f307fbf1b9c56db19
Binary files /dev/null and b/corpus/table-tags/cold/notebook/Tables.one differ
diff --git a/corpus/table-tags/cold/read/environment.json b/corpus/table-tags/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..c01f13df85eac7604bdb97fb2107805e74b9d6e7
--- /dev/null
+++ b/corpus/table-tags/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-9A109FC4",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/table-tags/cold/read/hierarchy.xml b/corpus/table-tags/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3da0df5f723fe638f2e6251875fb569a2eda9a38
--- /dev/null
+++ b/corpus/table-tags/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/cold/read/page-000.navigation.json b/corpus/table-tags/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a7b9e0ec6b6277b956d5177ea958a524786fb8b
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Check a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/cold/read/page-000.png b/corpus/table-tags/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..0626d0ab6fc7086414a7c1685e3cb6d9e18cee95
Binary files /dev/null and b/corpus/table-tags/cold/read/page-000.png differ
diff --git a/corpus/table-tags/cold/read/page-000.xml b/corpus/table-tags/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5ff97d9a2bfd89f10a9a301690d78ca14febd06
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/cold/read/page-001.navigation.json b/corpus/table-tags/cold/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f96bf51a7b355a67f40c9bb4d1d7f1cf04129a47
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete and undo - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/cold/read/page-001.png b/corpus/table-tags/cold/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..0055c717996876b848a660af2af3f19e8f2ceb70
Binary files /dev/null and b/corpus/table-tags/cold/read/page-001.png differ
diff --git a/corpus/table-tags/cold/read/page-001.xml b/corpus/table-tags/cold/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e765cf72eb634d20a49f0ad3df4cae8169081a9c
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/cold/read/page-002.navigation.json b/corpus/table-tags/cold/read/page-002.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..c40a308d9c3c9026ea7bafe144254a80248bacb1
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-002.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Edit a tagged table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/cold/read/page-002.png b/corpus/table-tags/cold/read/page-002.png
new file mode 100644
index 0000000000000000000000000000000000000000..168059c761f2754d8c3fa29fe81863dc1b5789eb
Binary files /dev/null and b/corpus/table-tags/cold/read/page-002.png differ
diff --git a/corpus/table-tags/cold/read/page-002.xml b/corpus/table-tags/cold/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c81287dffb2e3c1025bc7d924d8f7e0b54a226c6
--- /dev/null
+++ b/corpus/table-tags/cold/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/cold/read/payloads.json b/corpus/table-tags/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/table-tags/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/table-tags/cold/run.json b/corpus/table-tags/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..d183ba83737d72b30679229476b610e2744485f3
--- /dev/null
+++ b/corpus/table-tags/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/unsup-lab/table-tags-candidate",
+ "expected_pages": 3,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/table-tags/cold/scripts/cold.ps1 b/corpus/table-tags/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/table-tags/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/table-tags/cold/scripts/read.ps1 b/corpus/table-tags/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/table-tags/cold/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/table-tags/cold/source.json b/corpus/table-tags/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..3346fcfa112bef3f0244b9b101fe7847b76b01af
--- /dev/null
+++ b/corpus/table-tags/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1604,
+ "sha256": "a69d74aabd379aaa9db37c38daa4f2fe20ae1fecc7a35d11415e5068b893f9b1",
+ "mtime_ns": 1790740524265850413
+ },
+ {
+ "path": "Tables.one",
+ "bytes": 31808,
+ "sha256": "6a2acc111e28655e60b76266e8fc76f7bb5d7adcf576863a574d64412e3400cd",
+ "mtime_ns": 1790740524265655662
+ }
+]
diff --git a/corpus/table-tags/cold/teardown.json b/corpus/table-tags/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/table-tags/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/table-tags/native/commands.jsonl b/corpus/table-tags/native/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..ac30865971d30550217d9b64502a119132fae4df
--- /dev/null
+++ b/corpus/table-tags/native/commands.jsonl
@@ -0,0 +1,4 @@
+{"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\\author.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-2203CF5A", "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-2203CF5A -ExpectedPages 4 -UseCurrentCache -KeepOpen", "exit": 0, "stdout": "Read 2 sections and 4 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-tags/native/machine.json b/corpus/table-tags/native/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..1efbbe21cc973c27aba4bb06ffbc4a5af5000371
--- /dev/null
+++ b/corpus/table-tags/native/machine.json
@@ -0,0 +1 @@
+{"name": "m6-2203cf5a", "hostname": "ONE-M6-2203CF5A"}
diff --git a/corpus/table-tags/native/notebook/Open Notebook.onetoc2 b/corpus/table-tags/native/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..f78d19f62c90d9fd742b915ceecd506e4bfede4a
Binary files /dev/null and b/corpus/table-tags/native/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/table-tags/native/notebook/Tables.one b/corpus/table-tags/native/notebook/Tables.one
new file mode 100644
index 0000000000000000000000000000000000000000..c34b859773a3332f7d7b538d4a5661de16bc4e9b
Binary files /dev/null and b/corpus/table-tags/native/notebook/Tables.one differ
diff --git a/corpus/table-tags/native/notebook/fixture.json b/corpus/table-tags/native/notebook/fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..eacd680aa690d042c4eee051549c48d274f921f1
--- /dev/null
+++ b/corpus/table-tags/native/notebook/fixture.json
@@ -0,0 +1,19 @@
+{
+ "sections": [
+ "Tables.one"
+ ],
+ "pages": [
+ {
+ "section": "Tables.one",
+ "xml": ""
+ },
+ {
+ "section": "Tables.one",
+ "xml": ""
+ },
+ {
+ "section": "Tables.one",
+ "xml": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/corpus/table-tags/native/notebook/synthetic.one b/corpus/table-tags/native/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..eeaf2e4894fcb7ebc8b5181352f9506e3c7703e1
Binary files /dev/null and b/corpus/table-tags/native/notebook/synthetic.one differ
diff --git a/corpus/table-tags/native/read/environment.json b/corpus/table-tags/native/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..74214c6b725249b7357bd1fce27b8854875f3e86
--- /dev/null
+++ b/corpus/table-tags/native/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-2203CF5A",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/table-tags/native/read/hierarchy.xml b/corpus/table-tags/native/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a94292b95fd752c43c19fbafbc57aeca18194a5c
--- /dev/null
+++ b/corpus/table-tags/native/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/native/read/page-000.navigation.json b/corpus/table-tags/native/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..c40a308d9c3c9026ea7bafe144254a80248bacb1
--- /dev/null
+++ b/corpus/table-tags/native/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Edit a tagged table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/native/read/page-000.png b/corpus/table-tags/native/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..de130a5b02c3c1d8a3c55b73ae989c24710d726d
Binary files /dev/null and b/corpus/table-tags/native/read/page-000.png differ
diff --git a/corpus/table-tags/native/read/page-000.xml b/corpus/table-tags/native/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..370f276a50553fe4a193d8effdd68f83713836da
--- /dev/null
+++ b/corpus/table-tags/native/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/native/read/page-001.navigation.json b/corpus/table-tags/native/read/page-001.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f96bf51a7b355a67f40c9bb4d1d7f1cf04129a47
--- /dev/null
+++ b/corpus/table-tags/native/read/page-001.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Delete and undo - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/native/read/page-001.png b/corpus/table-tags/native/read/page-001.png
new file mode 100644
index 0000000000000000000000000000000000000000..e131fad0b5d5ebaf1ab324430c439adc93ae91c1
Binary files /dev/null and b/corpus/table-tags/native/read/page-001.png differ
diff --git a/corpus/table-tags/native/read/page-001.xml b/corpus/table-tags/native/read/page-001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ddf48d5afec2e1bdf9614b2002f3af1fb68bb68b
--- /dev/null
+++ b/corpus/table-tags/native/read/page-001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/native/read/page-002.navigation.json b/corpus/table-tags/native/read/page-002.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a7b9e0ec6b6277b956d5177ea958a524786fb8b
--- /dev/null
+++ b/corpus/table-tags/native/read/page-002.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Check a table - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/native/read/page-002.png b/corpus/table-tags/native/read/page-002.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc19d2d6515b0a08180a8f902f1d2da59e623966
Binary files /dev/null and b/corpus/table-tags/native/read/page-002.png differ
diff --git a/corpus/table-tags/native/read/page-002.xml b/corpus/table-tags/native/read/page-002.xml
new file mode 100644
index 0000000000000000000000000000000000000000..575d498db93d21fc43d347ce4ac363495422b246
--- /dev/null
+++ b/corpus/table-tags/native/read/page-002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/native/read/page-003.navigation.json b/corpus/table-tags/native/read/page-003.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..002a1c45a5ba0121a28f35c11466c61b8a2aac13
--- /dev/null
+++ b/corpus/table-tags/native/read/page-003.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "A notebook created in Rust. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/table-tags/native/read/page-003.png b/corpus/table-tags/native/read/page-003.png
new file mode 100644
index 0000000000000000000000000000000000000000..9893dede6ca83e855d42298d5833dc9075e60d19
Binary files /dev/null and b/corpus/table-tags/native/read/page-003.png differ
diff --git a/corpus/table-tags/native/read/page-003.xml b/corpus/table-tags/native/read/page-003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5128765679fdac202610d20d8787a415bfbcb630
--- /dev/null
+++ b/corpus/table-tags/native/read/page-003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/table-tags/native/read/payloads.json b/corpus/table-tags/native/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/table-tags/native/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/table-tags/native/run.json b/corpus/table-tags/native/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9f245f243af74dba43adb93c313d215676bb746
--- /dev/null
+++ b/corpus/table-tags/native/run.json
@@ -0,0 +1,19 @@
+{
+ "notebook": "/private/tmp/unsup-lab/table-tags-input/notebook",
+ "expected_pages": 4,
+ "author": "tools/native/pages.ps1",
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "author.ps1": "dfbf0e016aa4c8486ecea9f39768c633de05ac0db8214139052ca2e9c43bbd02",
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "22bc760f955ef59bb5f0ccfd55271f8d868674084127fbe219e1048bd3777f35"
+ }
+}
diff --git a/corpus/table-tags/native/scripts/author.ps1 b/corpus/table-tags/native/scripts/author.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..8e428618e3452caa35da88687293b520c273b6c6
--- /dev/null
+++ b/corpus/table-tags/native/scripts/author.ps1
@@ -0,0 +1,42 @@
+param([Parameter(Mandatory=$true)][string]$Root, [Parameter(Mandatory=$true)][string]$CloneHost)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+& "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost
+$fixture = Get-Content (Join-Path $Root 'notebook\fixture.json') -Raw -Encoding UTF8 | ConvertFrom-Json
+$inputs = Join-Path $Root 'inputs'
+New-Item -ItemType Directory -Path $inputs | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+try {
+ $app.OpenHierarchy((Join-Path $Root 'notebook'), '', [ref]$notebookId, 0)
+ $sections = @{}
+ foreach ($path in $fixture.sections) {
+ $parts = $path.Split('/')
+ if (@($parts | Where-Object { $_ -in @('', '.', '..') -or $_.Contains('\') -or $_.Contains(':') }).Count) { throw 'Invalid fixture section path.' }
+ $parent = $notebookId
+ for ($index = 0; $index -lt $parts.Count; $index++) {
+ $id = ''
+ $app.OpenHierarchy($parts[$index], $parent, [ref]$id, $(if ($index -eq $parts.Count - 1) {3} else {2}))
+ $parent = $id
+ }
+ $sections[$path] = $id
+ }
+ $index = 0
+ foreach ($item in $fixture.pages) {
+ $pageId = ''
+ $app.CreateNewPage($sections[$item.section], [ref]$pageId, 0)
+ [xml]$xml = $item.xml.Replace('__ASSETS__', [Security.SecurityElement]::Escape((Join-Path $Root 'notebook\fixture-data')))
+ $xml.DocumentElement.SetAttribute('ID', $pageId)
+ [IO.File]::WriteAllText((Join-Path $inputs ('page-{0:d3}.xml' -f $index)), $xml.OuterXml, [Text.Encoding]::UTF8)
+ $app.UpdatePageContent($xml.OuterXml, [DateTime]::MinValue, 1, $true)
+ $index++
+ }
+ $app.SyncHierarchy($notebookId)
+ $app.CloseNotebook($notebookId, $false)
+ $notebookId = ''
+} finally {
+ if ($notebookId) { $app.CloseNotebook($notebookId, $false) }
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+}
diff --git a/corpus/table-tags/native/scripts/cold.ps1 b/corpus/table-tags/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/table-tags/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/table-tags/native/scripts/read.ps1 b/corpus/table-tags/native/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a42366b32e8baaf13dae92e9472cae7a071220cc
--- /dev/null
+++ b/corpus/table-tags/native/scripts/read.ps1
@@ -0,0 +1,144 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ # A paragraph's file is named by its paragraph, one on the page by itself.
+ $owner = if ($file.ParentNode.LocalName -eq 'Page') { $file } else { $file.ParentNode }
+ $payloads += @{ page = $id; object = $owner.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/table-tags/native/source.json b/corpus/table-tags/native/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..e9c597a824f4214dbe4893218db38d80f7527653
--- /dev/null
+++ b/corpus/table-tags/native/source.json
@@ -0,0 +1,20 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 1612,
+ "sha256": "fafa5dcb3cd827c7edd30c8ea2fbc957a59fb4d2a8b28b667a3c551c8261ab86",
+ "mtime_ns": 1790739021434250039
+ },
+ {
+ "path": "fixture.json",
+ "bytes": 4203,
+ "sha256": "5fef6d7a199e9f4ac5ffa07adc829a24bb9127b0d5e952c5129d7b3346a84c52",
+ "mtime_ns": 1790739021485254100
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 3348,
+ "sha256": "b0662387c3fdc256d8dbe809e3b8f73b3586559696467fb1fff8f589095fa797",
+ "mtime_ns": 1790739021434686911
+ }
+]
diff --git a/corpus/table-tags/native/teardown.json b/corpus/table-tags/native/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/table-tags/native/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/crates/canvas/Cargo.toml b/crates/canvas/Cargo.toml
index d70907696ad77a2c5a070402e11fa642ff0ec26a..d83605e92f3122f8d2820759c5d89655f6a83ae7 100644
--- a/crates/canvas/Cargo.toml
+++ b/crates/canvas/Cargo.toml
@@ -20,7 +20,7 @@ skrifa = "0.44.0"
accesskit = { version = "0.25.0", optional = true }
color_quant = { version = "1.1", optional = true }
-image = { version = "0.25", default-features = false, features = ["jpeg"], optional = true }
+image = { version = "0.25", default-features = false, features = ["jpeg", "png"], optional = true }
png = { version = "0.18", optional = true }
resvg = { version = "0.48.1", default-features = false, optional = true }
sha2 = { version = "0.11", optional = true }
diff --git a/crates/canvas/examples/unsupported_inventory.rs b/crates/canvas/examples/unsupported_inventory.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2443ce8f43c091f1c86fdeedb903eaddf342e558
--- /dev/null
+++ b/crates/canvas/examples/unsupported_inventory.rs
@@ -0,0 +1,659 @@
+//! Every place the canvas shows a page's content as a placeholder, draws it read-only, or
+//! refuses an ordinary edit as content it cannot edit, across the active pages of every
+//! section under the given directories, grouped by kind as Markdown. Identical sections
+//! count once.
+//!
+//! `cargo run --release -p canvas --features gpu --example unsupported_inventory -- corpus`
+
+use canvas::{
+ document::TextPosition,
+ editor::{CanvasEditor, EditorError, TextOutline},
+ layout::{LayoutError, TextEngine},
+ outline::Arrange,
+};
+use onestore::{
+ Arena, ExGuid, Section,
+ page::{
+ Image, Outline, Page, PageObject, PageParagraph, Paragraph, ParagraphContent,
+ text::{Affinity, EditError},
+ },
+};
+use std::{
+ collections::{BTreeMap, BTreeSet, hash_map::DefaultHasher},
+ hash::{Hash, Hasher},
+ path::{Path, PathBuf},
+};
+
+#[derive(Default)]
+struct Inventory {
+ /// Kind to the places it occurs, as `section — page`.
+ kinds: BTreeMap<(Stage, String), Vec>,
+ sections: usize,
+ pages: usize,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+enum Stage {
+ /// Drawn as an "Unsupported content" (or "Image unavailable") box.
+ Placeholder,
+ /// Drawn as stored, but the editor cannot hold it.
+ ReadOnly,
+ /// An ordinary edit the editor refuses as content it cannot edit.
+ Refused,
+ /// The page or section does not open at all.
+ Failure,
+}
+
+impl Inventory {
+ fn add(&mut self, stage: Stage, kind: impl Into, place: &str) {
+ self.kinds
+ .entry((stage, kind.into()))
+ .or_default()
+ .push(place.to_owned());
+ }
+}
+
+/// MS-ONE's names for the object kinds it documents, and the observed undocumented ones.
+fn jcid_name(jcid: u32) -> String {
+ let name = match jcid {
+ 0x60007 => "section",
+ 0x60008 => "page series",
+ 0x6000b => "page",
+ 0x6000c => "outline",
+ 0x6000d => "outline element",
+ 0x6000e => "rich text",
+ 0x60011 => "picture",
+ 0x60012 => "number list",
+ 0x60014 => "ink container",
+ 0x60019 => "outline group",
+ 0x60022 => "table",
+ 0x60023 => "table row",
+ 0x60024 => "table cell",
+ 0x6002c => "title",
+ 0x60035 => "embedded file",
+ 0x60037 => "page manifest",
+ 0x6003c => "version history",
+ 0x6003d => "version proxy",
+ _ => "undocumented",
+ };
+ format!("jcid 0x{jcid:05x} ({name})")
+}
+
+fn unsupported_error(error: &EditorError) -> bool {
+ matches!(
+ error,
+ EditorError::Layout(LayoutError::UnsupportedContent)
+ | EditorError::Edit(EditError::UnsupportedContent)
+ )
+}
+
+/// What a text paragraph holds that bears on editing it.
+fn traits(text: &Paragraph) -> Vec<&'static str> {
+ let spans = text.spans();
+ let mut traits = Vec::new();
+ if text.text().contains('\u{fffc}')
+ || spans.iter().any(|s| s.format.embedded_object == Some(true))
+ {
+ traits.push("embedded object in text");
+ }
+ if spans.iter().any(|s| s.format.math == Some(true)) {
+ traits.push("equation");
+ }
+ if spans.iter().any(|s| s.format.hyperlink == Some(true)) {
+ traits.push("link");
+ }
+ if spans.iter().any(|s| s.format.hidden == Some(true)) {
+ traits.push("hidden text");
+ }
+ if text.text().is_empty() {
+ traits.push("empty");
+ }
+ traits
+}
+
+/// Why `node`, alone in an outline, does not lay out as content the canvas understands.
+fn culprit(
+ engine: &mut TextEngine,
+ outline: &Outline,
+ node: &PageParagraph,
+ page: &Page,
+) -> Option {
+ let alone = Outline {
+ paragraphs: vec![PageParagraph {
+ parent: None,
+ level: 1,
+ ..node.clone()
+ }],
+ unsupported: Vec::new(),
+ ..outline.clone()
+ };
+ match alone.layout(engine, &page.definitions) {
+ Err(LayoutError::UnsupportedContent) => {}
+ _ => return None,
+ }
+ Some(match &node.content {
+ ParagraphContent::Unsupported(u) => format!("holds {}", jcid_name(u.jcid)),
+ ParagraphContent::Table(table) if !table.tags.is_empty() => "table with note tags".into(),
+ ParagraphContent::Table(table) => {
+ let cells = || table.rows.iter().flat_map(|row| &row.cells);
+ if let Some(cell) = cells().find(|cell| !cell.unsupported.is_empty()) {
+ format!(
+ "table cell holding {}",
+ cell.unsupported
+ .iter()
+ .map(|u| jcid_name(u.jcid))
+ .collect::>()
+ .join(", ")
+ )
+ } else {
+ let inner = cells()
+ .flat_map(|cell| &cell.paragraphs)
+ .find_map(|inner| culprit(engine, outline, inner, page));
+ format!(
+ "table cell: {}",
+ inner.unwrap_or_else(|| "nested content".into())
+ )
+ }
+ }
+ ParagraphContent::Image(_) => "picture without a size".into(),
+ ParagraphContent::Ink(_) => "handwriting without strokes".into(),
+ ParagraphContent::Attachment(_) => "file".into(),
+ ParagraphContent::Text(text) => {
+ let lists: Vec = node
+ .lists
+ .iter()
+ .filter_map(|id| page.definitions.get(id))
+ .map(|definition| format!("{:?}", definition.kind))
+ .collect();
+ if !lists.is_empty() {
+ format!("list marker {}", lists.join(", "))
+ } else if text
+ .text
+ .spans()
+ .iter()
+ .any(|s| s.format.math == Some(true))
+ {
+ "equation the math layout does not parse".into()
+ } else {
+ format!("text ({})", traits(&text.text).join(", "))
+ }
+ }
+ })
+}
+
+/// Why an outline the page shows is not editable.
+fn diagnose(engine: &mut TextEngine, outline: &Outline, page: &Page) -> Vec {
+ let mut reasons: Vec = outline
+ .unsupported
+ .iter()
+ .map(|u| format!("outline child {}", jcid_name(u.jcid)))
+ .collect();
+ reasons.extend(
+ outline
+ .paragraphs
+ .iter()
+ .filter_map(|node| culprit(engine, outline, node, page)),
+ );
+ if reasons.is_empty() {
+ let text = outline.paragraphs.iter().any(|node| {
+ node.text().is_some()
+ || matches!(&node.content, ParagraphContent::Table(t)
+ if t.rows.iter().flat_map(|r| &r.cells).any(|c| !c.paragraphs.is_empty()))
+ });
+ reasons.push(if text {
+ match TextOutline::from_outline(engine, outline, &page.definitions) {
+ Err(error) => format!("editor: {error}"),
+ Ok(_) => "outline on its own is editable".into(),
+ }
+ } else {
+ let kinds: BTreeSet<&str> = outline
+ .paragraphs
+ .iter()
+ .map(|node| match node.content {
+ ParagraphContent::Image(_) => "pictures",
+ ParagraphContent::Attachment(_) => "files",
+ ParagraphContent::Ink(_) => "handwriting",
+ _ => "other",
+ })
+ .collect();
+ format!(
+ "no paragraph of text (only {})",
+ kinds.into_iter().collect::>().join(", ")
+ )
+ });
+ }
+ reasons
+}
+
+/// A picture that draws as "Image unavailable": no data, or (with `--features gpu`) data
+/// the renderer does not decode, named by its leading bytes.
+fn picture(image: &Image, at: &str, inventory: &mut Inventory, place: &str) {
+ let Some(bytes) = &image.bytes else {
+ return inventory.add(
+ Stage::Placeholder,
+ format!("{at} picture without data"),
+ place,
+ );
+ };
+ #[cfg(feature = "gpu")]
+ if [Some(bytes), image.display.as_ref()]
+ .into_iter()
+ .flatten()
+ .all(|bytes| draw::RasterImage::measure(bytes).is_err())
+ {
+ let format = match &bytes[..bytes.len().min(4)] {
+ [0x50, 0x4b, 3, 4] => "a zip package (XPS printout)",
+ [1, 0, 0, 0] => "EMF",
+ [0xd7, 0xcd, 0xc6, 0x9a] | [1, 0, 9, 0] => "WMF",
+ [b'B', b'M', ..] => "BMP",
+ _ => "an unknown format",
+ };
+ inventory.add(
+ Stage::Placeholder,
+ format!("{at} picture stored as {format}"),
+ place,
+ );
+ }
+ #[cfg(not(feature = "gpu"))]
+ let _ = bytes;
+}
+
+/// Pictures that draw as "Image unavailable" and objects the model keeps aside.
+fn scan_paragraphs(nodes: &[PageParagraph], at: &str, inventory: &mut Inventory, place: &str) {
+ for node in nodes {
+ match &node.content {
+ ParagraphContent::Unsupported(u) => inventory.add(
+ Stage::Placeholder,
+ format!("{at} paragraph holding {}", jcid_name(u.jcid)),
+ place,
+ ),
+ ParagraphContent::Image(image) => picture(image, at, inventory, place),
+ ParagraphContent::Table(table) => {
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ for u in &cell.unsupported {
+ inventory.add(
+ Stage::Placeholder,
+ format!("table cell child {}", jcid_name(u.jcid)),
+ place,
+ );
+ }
+ scan_paragraphs(&cell.paragraphs, "table cell", inventory, place);
+ }
+ }
+ _ => {}
+ }
+ }
+}
+
+/// Ordinary edits at every text paragraph of every editable outline: typing at its start,
+/// middle and end, Enter, Backspace at its start, Delete at its end, and deleting from its
+/// middle into the next.
+fn probe(
+ editor: &mut CanvasEditor,
+ engine: &mut TextEngine,
+ inventory: &mut Inventory,
+ place: &str,
+) {
+ let ids: Vec = editor.outlines().iter().map(|o| o.id).collect();
+ for id in ids {
+ if editor.focus_outline(id).is_err() {
+ continue;
+ }
+ let document = editor.active_outline().document();
+ let containers = containers(document.nodes());
+ let leaves: Vec<(Option, Paragraph)> = document
+ .text_nodes()
+ .map(|node| {
+ (
+ containers.get(&node.id).copied().flatten(),
+ node.text().unwrap().text.clone(),
+ )
+ })
+ .collect();
+ for (index, (container, text)) in leaves.iter().enumerate() {
+ let length = text.text().encode_utf16().count() as u32;
+ // The middle of what shows, where a click could put the caret.
+ let Ok(projection) = text.project() else {
+ continue;
+ };
+ let shown = projection.text();
+ let middle = shown
+ .text()
+ .char_indices()
+ .map(|(at, _)| at)
+ .nth(shown.text().chars().count() / 2)
+ .and_then(|at| shown.utf16_offset(at).ok())
+ .and_then(|at| projection.source_offset(at, Affinity::Downstream).ok())
+ .unwrap_or(length);
+ let at = |offset| TextPosition {
+ paragraph: index,
+ offset,
+ };
+ let next = leaves.get(index + 1);
+ let mut probes: Vec<(&str, [TextPosition; 2], Probe)> = vec![
+ ("typing at a paragraph's start", [at(0); 2], Probe::Type),
+ ("typing inside a paragraph", [at(middle); 2], Probe::Type),
+ ("typing at a paragraph's end", [at(length); 2], Probe::Type),
+ ("Enter inside a paragraph", [at(middle); 2], Probe::Enter),
+ (
+ "Delete at a paragraph's end",
+ [at(length); 2],
+ Probe::Delete,
+ ),
+ ];
+ if index > 0 {
+ probes.push((
+ "Backspace at a paragraph's start",
+ [at(0); 2],
+ Probe::Backspace,
+ ));
+ }
+ if let Some((_, next_text)) = next {
+ let end = next_text.text().encode_utf16().count() as u32 / 2;
+ probes.push((
+ "deleting a selection into the next paragraph",
+ [
+ at(middle),
+ TextPosition {
+ paragraph: index + 1,
+ offset: end,
+ },
+ ],
+ Probe::Backspace,
+ ));
+ }
+ for (name, positions, kind) in probes {
+ if editor.select(positions.into()).is_err() {
+ continue;
+ }
+ let result = match kind {
+ Probe::Type => editor.insert(engine, "x").map(|()| true),
+ Probe::Enter => editor.enter(engine, false).map(|()| true),
+ Probe::Delete => editor.delete(engine, false),
+ Probe::Backspace => editor.delete(engine, true),
+ };
+ match result {
+ Ok(true) => {
+ editor.undo(engine).ok();
+ }
+ Ok(false) => {}
+ Err(error) if unsupported_error(&error) => {
+ let crossing = positions[0].paragraph != positions[1].paragraph
+ || name.starts_with("Backspace")
+ || name.starts_with("Delete");
+ let neighbour = match name {
+ n if n.starts_with("Backspace") => leaves.get(index - 1),
+ _ if crossing => next,
+ _ => None,
+ };
+ let mut why: Vec<&str> = traits(text);
+ if let Some((other, other_text)) = neighbour {
+ if other != container {
+ why.push("across a table cell boundary");
+ }
+ why.extend(traits(other_text).into_iter().map(|t| match t {
+ "embedded object in text" => "next to an embedded object",
+ "equation" => "next to an equation",
+ "link" => "next to a link",
+ t => t,
+ }));
+ }
+ if container.is_some() {
+ why.push("in a table cell");
+ }
+ why.sort();
+ why.dedup();
+ inventory.add(
+ Stage::Refused,
+ format!("{name} [{}]", why.join(", ")),
+ place,
+ );
+ }
+ Err(_) => {}
+ }
+ }
+ }
+ }
+}
+
+#[derive(Clone, Copy)]
+enum Probe {
+ Type,
+ Enter,
+ Delete,
+ Backspace,
+}
+
+/// Each paragraph's table cell, `None` at the outline's top.
+fn containers(nodes: &[PageParagraph]) -> BTreeMap> {
+ let mut map = BTreeMap::new();
+ let mut pending = vec![(None, nodes)];
+ while let Some((container, nodes)) = pending.pop() {
+ for node in nodes {
+ map.insert(node.id, container);
+ if let ParagraphContent::Table(table) = &node.content {
+ for cell in table.rows.iter().flat_map(|row| &row.cells) {
+ pending.push((Some(cell.id), cell.paragraphs.as_slice()));
+ }
+ }
+ }
+ }
+ map
+}
+
+fn page(engine: &mut TextEngine, page: Page, place: &str, inventory: &mut Inventory) {
+ for object in &page.objects {
+ match object {
+ PageObject::Unsupported(u) => inventory.add(
+ Stage::Placeholder,
+ format!("page object {}", jcid_name(u.jcid)),
+ place,
+ ),
+ PageObject::Image(image) => picture(image, "page", inventory, place),
+ PageObject::Outline(outline) => {
+ for u in &outline.unsupported {
+ inventory.add(
+ Stage::Placeholder,
+ format!("outline child {}", jcid_name(u.jcid)),
+ place,
+ );
+ }
+ scan_paragraphs(&outline.paragraphs, "outline", inventory, place);
+ }
+ PageObject::Title(title) => {
+ for outline in &title.outlines {
+ scan_paragraphs(&outline.paragraphs, "title", inventory, place);
+ }
+ }
+ _ => {}
+ }
+ }
+ let mut editor = match CanvasEditor::from_page(page.clone(), engine) {
+ Ok(editor) => editor,
+ Err(error) => {
+ inventory.add(
+ Stage::Failure,
+ format!("page does not open: {error}"),
+ place,
+ );
+ return;
+ }
+ };
+ for object in &page.objects {
+ let (outlines, title) = match object {
+ PageObject::Outline(outline) => (std::slice::from_ref(outline), None),
+ PageObject::Title(title) => (title.outlines.as_slice(), Some(title)),
+ _ => continue,
+ };
+ for outline in outlines {
+ if editor.has_page_outline(outline.id)
+ || editor.outlines().iter().any(|o| o.id == outline.id)
+ {
+ continue;
+ }
+ if let Some(title) = title {
+ if title.date == Some(outline.id) {
+ if editor.date().is_none() {
+ inventory.add(Stage::ReadOnly, "page date the date editor declines", place);
+ }
+ continue;
+ }
+ if !outline.title {
+ continue;
+ }
+ }
+ let placeholder = matches!(
+ outline.layout(engine, &page.definitions),
+ Err(LayoutError::UnsupportedContent)
+ );
+ let at = if title.is_some() { "title" } else { "outline" };
+ for reason in diagnose(engine, outline, &page) {
+ let stage = if placeholder {
+ Stage::Placeholder
+ } else {
+ Stage::ReadOnly
+ };
+ let whole = if placeholder {
+ format!("whole {at} as a box: {reason}")
+ } else {
+ format!("{at} read-only: {reason}")
+ };
+ inventory.add(stage, whole, place);
+ }
+ }
+ }
+ probe(&mut editor, engine, inventory, place);
+}
+
+fn section(engine: &mut TextEngine, path: &Path, root: &Path, inventory: &mut Inventory) {
+ let Ok(image) = std::fs::read(path) else {
+ return;
+ };
+ let name = path
+ .strip_prefix(root)
+ .unwrap_or(path)
+ .display()
+ .to_string();
+ let arena = Arena::default();
+ let mut section = match Section::open(&arena, image) {
+ Ok(section) => section,
+ Err(error) => {
+ inventory.add(
+ Stage::Failure,
+ format!("section does not open: {}", error.message),
+ &name,
+ );
+ return;
+ }
+ };
+ inventory.sections += 1;
+ let pages = match section.pages() {
+ Ok(pages) => pages,
+ Err(error) => {
+ inventory.add(
+ Stage::Failure,
+ format!("page list does not read: {}", error.message),
+ &name,
+ );
+ return;
+ }
+ };
+ for (space, title, _) in pages {
+ inventory.pages += 1;
+ let place = format!("{name} — {title}");
+ match section.page(space) {
+ Ok(model) => page(engine, model, &place, inventory),
+ Err(error) => inventory.add(
+ Stage::Failure,
+ format!("page does not read: {}", error.message),
+ &place,
+ ),
+ }
+ }
+}
+
+fn sections(directory: &Path, out: &mut Vec) {
+ let Ok(entries) = std::fs::read_dir(directory) else {
+ return;
+ };
+ let mut entries: Vec = entries.flatten().map(|entry| entry.path()).collect();
+ entries.sort();
+ for path in entries {
+ if path.is_dir() {
+ sections(&path, out);
+ } else if path.extension().is_some_and(|e| e == "one") {
+ out.push(path);
+ }
+ }
+}
+
+fn main() {
+ let roots: Vec = std::env::args().skip(1).map(PathBuf::from).collect();
+ let mut engine = TextEngine::default();
+ let mut inventory = Inventory::default();
+ let mut seen = BTreeSet::new();
+ let mut duplicates = 0;
+ for root in &roots {
+ let mut paths = Vec::new();
+ sections(root, &mut paths);
+ for path in paths {
+ let Ok(bytes) = std::fs::read(&path) else {
+ continue;
+ };
+ let mut hasher = DefaultHasher::new();
+ bytes.hash(&mut hasher);
+ if !seen.insert(hasher.finish()) {
+ duplicates += 1;
+ continue;
+ }
+ section(&mut engine, &path, root, &mut inventory);
+ }
+ }
+ println!("# Unsupported content inventory\n");
+ println!(
+ "{} distinct sections ({duplicates} identical copies skipped), {} pages, under {}.\n",
+ inventory.sections,
+ inventory.pages,
+ roots
+ .iter()
+ .map(|r| format!("`{}`", r.display()))
+ .collect::>()
+ .join(", ")
+ );
+ let headings = [
+ (Stage::Placeholder, "Drawn as a placeholder box"),
+ (Stage::ReadOnly, "Drawn as stored, read-only"),
+ (
+ Stage::Refused,
+ "Edits refused as content the editor cannot edit",
+ ),
+ (Stage::Failure, "Does not open"),
+ ];
+ for (stage, heading) in headings {
+ let mut rows: Vec<(&String, &Vec)> = inventory
+ .kinds
+ .iter()
+ .filter(|((s, _), _)| *s == stage)
+ .map(|((_, kind), places)| (kind, places))
+ .collect();
+ rows.sort_by(|a, b| b.1.len().cmp(&a.1.len()).then(a.0.cmp(b.0)));
+ println!("## {heading}\n");
+ if rows.is_empty() {
+ println!("None.\n");
+ continue;
+ }
+ println!("| Kind | Count | Pages | Examples |\n| --- | ---: | ---: | --- |");
+ for (kind, places) in rows {
+ let pages: BTreeSet<&String> = places.iter().collect();
+ let examples: Vec = pages.iter().take(3).map(|p| format!("`{p}`")).collect();
+ println!(
+ "| {} | {} | {} | {} |",
+ kind.replace('|', "\\|"),
+ places.len(),
+ pages.len(),
+ examples.join("
").replace('|', "\\|")
+ );
+ }
+ println!();
+ }
+}
diff --git a/crates/canvas/src/document.rs b/crates/canvas/src/document.rs
index b8c418d7570b901ebacc4afed19f0e3825a02955..cb9899ddfe5856f2f80e0590618fc548843499f2 100644
--- a/crates/canvas/src/document.rs
+++ b/crates/canvas/src/document.rs
@@ -1,5 +1,5 @@
use onestore::page::text::{EditError, Paragraph, new_id};
-use onestore::page::{PageParagraph, ParagraphContent, TextObject};
+use onestore::page::{PageParagraph, ParagraphContent, TableCell, TextObject};
use onestore::{ExGuid, document::Format};
use std::{
collections::{BTreeMap, BTreeSet},
@@ -247,10 +247,110 @@ fn divides_link(text: &Paragraph, offset: u32) -> Result {
Ok(at > 0 && link(at - 1) && link(at) && !text.text()[at..].starts_with('\u{fddf}'))
}
+/// What deleting `range`, which crosses a table's edge, leaves of `nodes`, whose
+/// first text leaf is paragraph `*next`, and whether all of them lay inside it. As OneNote 2010
+/// deletes such a selection, each container keeps what lies outside it and nothing joins
+/// across a container's edge: the end paragraphs keep their outer text, a cell inside keeps
+/// one empty paragraph, except that where the selection runs on past a table its rows with
+/// every cell inside go, and the table when all of them do. A paragraph that goes leaves its
+/// children to its parent.
+fn cut(
+ nodes: &[PageParagraph],
+ next: &mut usize,
+ range: &Range,
+) -> Result<(Vec, bool), EditError> {
+ let (start, end) = (range.start, range.end);
+ let mut kept = Vec::new();
+ let mut gone = BTreeMap::new();
+ for node in nodes {
+ let inside = match &node.content {
+ ParagraphContent::Text(text) => {
+ let at = *next;
+ *next += 1;
+ let text = &text.text;
+ let length = text.utf16_offset(text.text().len())?;
+ let shown = match at {
+ at if at == start.paragraph => Some(text.slice(0..start.offset)?),
+ at if at == end.paragraph => Some(text.slice(end.offset..length)?),
+ _ => None,
+ };
+ if let Some(shown) = shown {
+ let mut node = node.clone();
+ node.text_mut().unwrap().text = shown;
+ kept.push(node);
+ continue;
+ }
+ start.paragraph < at && at < end.paragraph
+ }
+ ParagraphContent::Table(table) => {
+ let mut table = table.clone();
+ let mut whole_rows = Vec::new();
+ for row in &mut table.rows {
+ let mut cells = Vec::new();
+ for cell in &row.cells {
+ let (paragraphs, inside) = cut(&cell.paragraphs, next, range)?;
+ cells.push((cell, paragraphs, inside));
+ }
+ let whole = cells.iter().all(|(_, _, inside)| *inside);
+ row.cells = cells
+ .into_iter()
+ .map(|(cell, paragraphs, inside)| {
+ let paragraphs = if inside {
+ let (_, _, leaf) = leaves(&cell.paragraphs, None)
+ .next()
+ .ok_or(EditError::InvalidStructure)?;
+ let mut leaf = leaf.clone();
+ let text = &mut leaf.text_mut().unwrap().text;
+ *text = text.slice(0..0)?;
+ leaf.parent = None;
+ leaf.level = 1;
+ vec![leaf]
+ } else {
+ paragraphs
+ };
+ Ok(TableCell {
+ paragraphs,
+ ..cell.clone()
+ })
+ })
+ .collect::>()?;
+ whole_rows.push(whole);
+ }
+ // Rows go only where the selection runs on past the table.
+ if end.paragraph >= *next {
+ let mut whole = whole_rows.into_iter();
+ table.rows.retain(|_| !whole.next().unwrap_or(false));
+ }
+ if table.rows.is_empty() {
+ true
+ } else {
+ let mut node = node.clone();
+ node.content = ParagraphContent::Table(table);
+ kept.push(node);
+ continue;
+ }
+ }
+ _ => start.paragraph < *next && *next <= end.paragraph,
+ };
+ if inside {
+ gone.insert(node.id, node.parent);
+ } else {
+ kept.push(node.clone());
+ }
+ }
+ let whole = kept.is_empty();
+ for node in &mut kept {
+ while let Some(parent) = node.parent.and_then(|parent| gone.get(&parent)) {
+ node.parent = *parent;
+ }
+ }
+ Ok((kept, whole))
+}
+
/// Whether a split or join keeping `first` up to UTF-16 `start` and `last` from `end` on meets
/// an embedded object at the seam or carries one to another paragraph, or joins inside an
-/// equation: the object's run data belongs to its paragraph, and an equation divides only at
-/// its edges (Enter inside one breaks its line instead, `CanvasEditor::enter`).
+/// equation's objects: the object's run data belongs to its paragraph, and an equation divides
+/// only at its edges (Enter inside one breaks its line instead, `CanvasEditor::enter`).
fn moves_object(
first: &Paragraph,
start: u32,
@@ -266,9 +366,21 @@ fn moves_object(
.chars()
.next()
.map(|c| end + c.len_utf16() as u32);
+ // An equation joins where both seams lie outside its objects (fractions, scripts and the
+ // like), as OneNote 2010 joins two equations a deletion meets.
+ let nested = |text: &str| {
+ text.chars().fold(0_i32, |depth, c| match c {
+ '\u{fdd0}' => depth + 1,
+ '\u{fdef}' => depth - 1,
+ _ => depth,
+ }) > 0
+ };
Ok(first.text()[..before].ends_with('\u{fffc}')
|| last.text()[after..].contains('\u{fffc}')
- || start > 0 && math(first, start) && following.is_some_and(|next| math(last, next)))
+ || start > 0
+ && math(first, start)
+ && following.is_some_and(|next| math(last, next))
+ && (nested(&first.text()[..before]) || nested(&last.text()[..after])))
}
/// Paragraph positions of each node's first text leaf, counting from `first`.
@@ -689,15 +801,15 @@ impl TextDocument {
if range.start > range.end {
return Err(EditError::InvalidRange);
}
+ if self.crosses_table(range.clone())? {
+ return self.replace_across(range, replacement);
+ }
let (container, start, first) = self
.leaf(range.start.paragraph)
.ok_or(EditError::InvalidRange)?;
- let (end_container, end, last) = self
+ let (_, end, last) = self
.leaf(range.end.paragraph)
.ok_or(EditError::InvalidRange)?;
- if container != end_container {
- return Err(EditError::UnsupportedContent);
- }
let nodes = self.container(container)?;
let first_text = &first.text().unwrap().text;
let last_text = &last.text().unwrap().text;
@@ -763,6 +875,66 @@ impl TextDocument {
})
}
+ /// Whether `range` crosses a table's edge: its ends lie in different containers, or a table
+ /// lies between them.
+ pub(crate) fn crosses_table(&self, range: Range) -> Result {
+ let (container, start, _) = self
+ .leaf(range.start.paragraph)
+ .ok_or(EditError::InvalidRange)?;
+ let (end_container, end, _) = self
+ .leaf(range.end.paragraph)
+ .ok_or(EditError::InvalidRange)?;
+ Ok(container != end_container
+ || self.container(container)?[start..end]
+ .iter()
+ .any(|node| matches!(node.content, ParagraphContent::Table(_))))
+ }
+
+ /// `replace` of a range crossing a table's edge, as OneNote 2010 deletes such a selection
+ /// before inserting at its start: see [`cut`].
+ fn replace_across(
+ &self,
+ range: Range,
+ replacement: Vec,
+ ) -> Result {
+ // A caret never stands inside hidden text, such as a link's field code.
+ for end in [range.start, range.end] {
+ let text = self
+ .paragraph(end.paragraph)
+ .ok_or(EditError::InvalidRange)?;
+ let at = text.byte_offset(end.offset)?;
+ let hidden = |byte: usize| {
+ text.spans()
+ .iter()
+ .find(|span| byte < span.end)
+ .is_some_and(|span| span.format.hidden == Some(true))
+ };
+ if at > 0 && hidden(at - 1) && hidden(at) {
+ return Err(EditError::InvalidRange);
+ }
+ }
+ let root = |paragraph: usize| self.starts.partition_point(|start| *start <= paragraph) - 1;
+ let (first, last) = (root(range.start.paragraph), root(range.end.paragraph));
+ let (kept, _) = cut(
+ &self.nodes[first..=last],
+ &mut self.starts[first].clone(),
+ &range,
+ )?;
+ let mut nodes = self.nodes[..first].to_vec();
+ nodes.extend(kept);
+ nodes.extend_from_slice(&self.nodes[last + 1..]);
+ let mut cut = Self::from_nodes(nodes)?;
+ let insertion = cut.replace(range.start..range.start, replacement)?;
+ cut.apply(insertion)?;
+ let end = cut.nodes.len() + last + 1 - self.nodes.len();
+ Ok(DocumentEdit {
+ columns: BTreeMap::new(),
+ container: None,
+ range: first..last + 1,
+ replacement: cut.nodes.drain(first..end).collect(),
+ })
+ }
+
/// Appends text leaf `lower`'s text to `upper`'s, keeping the upper paragraph's properties
/// and giving it the lower one's children; None unless nothing but `upper`'s hidden subtree
/// lies between them in one container. The lower text keeps its look under `base`, the
@@ -1245,9 +1417,9 @@ mod tests {
.paragraphs()
.map(Paragraph::text)
.collect::>(),
- ["after"]
+ ["", "after"]
);
- assert_eq!(document.nodes().len(), 1);
+ assert_eq!(document.nodes().len(), 2);
}
#[test]
@@ -1259,9 +1431,17 @@ mod tests {
document.replace(position(1, 2)..position(1, 3), text()),
Err(EditError::InvalidRange)
);
+ let across = document
+ .replace(position(1, 1)..position(3, 1), text())
+ .unwrap();
+ let mut deleted = document.clone();
+ deleted.apply(across).unwrap();
assert_eq!(
- document.replace(position(1, 0)..position(3, 1), text()),
- Err(EditError::UnsupportedContent)
+ deleted
+ .paragraphs()
+ .map(Paragraph::text)
+ .collect::>(),
+ ["before", "aX", "ight", "after"],
);
let ParagraphContent::Table(table) = &document.nodes()[1].content else {
panic!()
@@ -1778,9 +1958,43 @@ mod tests {
for replacement in &replacements {
let mut document = original.clone();
let planned = document.replace(start..end, replacement.clone());
- if regions[start.paragraph] != regions[end.paragraph] {
- assert_eq!(planned, Err(EditError::UnsupportedContent));
+ if regions[start.paragraph..=end.paragraph]
+ .iter()
+ .any(|region| *region != regions[start.paragraph])
+ {
+ // Across a container's edge nothing joins: the start keeps what
+ // precedes it, followed by the replacement, and the end what
+ // follows it.
+ let planned = planned.unwrap();
assert_eq!(document, original);
+ let undo = document.apply(planned).unwrap();
+ let texts: Vec<_> =
+ document.paragraphs().map(Paragraph::text).collect();
+ let before: Vec<_> =
+ original.paragraphs().map(Paragraph::text).collect();
+ assert_eq!(texts[..start.paragraph], before[..start.paragraph]);
+ let text = |position: TextPosition| before[position.paragraph];
+ let byte = |position: TextPosition| {
+ original
+ .paragraphs()
+ .nth(position.paragraph)
+ .unwrap()
+ .byte_offset(position.offset)
+ .unwrap()
+ };
+ let mut inserted: Vec =
+ replacement.iter().map(|p| p.text().to_owned()).collect();
+ inserted[0].insert_str(0, &text(start)[..byte(start)]);
+ let at = start.paragraph;
+ assert_eq!(texts[at..at + inserted.len()], inserted);
+ assert!(
+ texts[at + inserted.len()..].contains(&&text(end)[byte(end)..])
+ );
+ let after = document.clone();
+ let redo = document.apply(undo).unwrap();
+ assert_eq!(document, original, "{start:?}..{end:?}");
+ document.apply(redo).unwrap();
+ assert_eq!(document, after);
continue;
}
let planned = planned.unwrap();
diff --git a/crates/canvas/src/editor.rs b/crates/canvas/src/editor.rs
index fe67bb1d3b7542ceb716765017bf37fa2f669de1..e58c4651dbde740ddb90c48f358d46910c3811d5 100644
--- a/crates/canvas/src/editor.rs
+++ b/crates/canvas/src/editor.rs
@@ -126,6 +126,10 @@ pub struct CanvasEditor {
recording: Option,
/// Drawings being dragged and how far, shown there until dropped.
ink_drag: Option<(Vec, [f32; 2])>,
+ /// The paragraph each outline holding only pictures or files shows after them, by outline,
+ /// and whether it is stored: the first op that reaches it stores it, and undoing back to it
+ /// empty and alone removes it again, as OneNote 2010's undo does.
+ provisional: BTreeMap,
}
/// Imported page state the editable content does not carry.
@@ -280,9 +284,10 @@ impl TextOutline {
outline.layout(engine, definitions)?
};
let document = TextDocument::from_nodes(outline.paragraphs.clone())?;
- // The caret needs a paragraph of text to stand in.
+ // The caret needs a paragraph of text to stand in; a page gives an outline holding
+ // none a provisional one (`page::build`).
if document.text_nodes().next().is_none() {
- return Err(EditError::UnsupportedContent.into());
+ return Err(EditError::InvalidStructure.into());
}
Ok(Self {
id: outline.id,
@@ -532,6 +537,23 @@ impl TextOutline {
Ok(rectangles)
}
+ /// Where a mark under UTF-16 `range` of paragraph `index` runs, outline-local: each
+ /// line's left, right and baseline.
+ pub fn underlines(&self, index: usize, range: Range) -> Result, EditError> {
+ let paragraph = self.paragraph_layout(index)?;
+ let selection = ParagraphSelection::new(
+ paragraph.cursor(range.start, Affinity::Downstream)?,
+ paragraph.cursor(range.end, Affinity::Upstream)?,
+ );
+ let [x, y] = paragraph.origin;
+ Ok(paragraph
+ .text
+ .underlines(selection)
+ .into_iter()
+ .map(|[left, right, baseline]| [left + x, right + x, baseline + y])
+ .collect())
+ }
+
/// Where `position` falls in `shown_text`; a hidden paragraph falls at the start of the
/// next shown one.
pub fn utf16_offset(&self, position: TextPosition) -> Result {
@@ -889,6 +911,7 @@ impl CanvasEditor {
typing: None,
recording: None,
ink_drag: None,
+ provisional: BTreeMap::new(),
})
}
@@ -899,6 +922,7 @@ impl CanvasEditor {
mut outlines,
date,
areas,
+ provisional,
} = page::build(&mut page, engine, true)?;
let needs_caret = outlines.is_empty();
if needs_caret {
@@ -926,6 +950,10 @@ impl CanvasEditor {
};
}
editor.objects = objects;
+ editor.provisional = provisional
+ .into_iter()
+ .map(|(outline, blank)| (outline, (blank, false)))
+ .collect();
editor.header = PageHeader {
title: page.title,
identity: page.identity,
@@ -1030,6 +1058,10 @@ impl CanvasEditor {
&& let Some(kept) = own.remove(&outline.id)
{
*outline = kept;
+ match self.provisional.remove(&outline.id) {
+ Some(provisional) => fresh.provisional.insert(outline.id, provisional),
+ None => fresh.provisional.remove(&outline.id),
+ };
}
}
let position = fresh.outlines.iter().position(|outline| outline.id == id);
@@ -1132,7 +1164,13 @@ impl CanvasEditor {
let mut outline = match content {
page::Content::Editable(id) => {
match self.outlines.iter().find(|outline| outline.id == *id) {
- Some(outline) => outline.snapshot(),
+ Some(outline) => {
+ let mut outline = outline.snapshot();
+ if let Some((blank, false)) = self.provisional.get(id) {
+ outline.paragraphs.retain(|node| node.id != blank.id);
+ }
+ outline
+ }
None => continue,
}
}
@@ -1469,6 +1507,7 @@ impl CanvasEditor {
typing: None,
recording: None,
ink_drag: None,
+ provisional: BTreeMap::new(),
})
}
@@ -1647,6 +1686,16 @@ impl CanvasEditor {
}
/// Provisional input geometry outside the document's outline collection.
+ /// The caret a run of typing left while typing there still joins the run: the word
+ /// before it is still being written.
+ pub fn typing(&self) -> Option<(ExGuid, TextPosition)> {
+ let (outline, at, depth) = self.typing?;
+ (outline == self.active_outline().id
+ && self.selection().positions == [at; 2]
+ && depth == self.undo.len())
+ .then_some((outline, at))
+ }
+
pub fn caret_outline(&self) -> Option<&TextOutline> {
match &self.active {
Focus::Caret { outline, .. } => Some(outline),
@@ -2192,6 +2241,12 @@ impl CanvasEditor {
self.redo.clear();
return Ok(());
}
+ let file = match self.across(engine, |editor, engine| {
+ editor.insert_attachment(engine, file.clone())
+ })? {
+ Some(()) => return Ok(()),
+ None => file,
+ };
let [anchor, focus] = self.selection().positions;
let (start, end) = (anchor.min(focus), anchor.max(focus));
let mut format = self.typing_format(start)?;
@@ -2261,7 +2316,19 @@ impl CanvasEditor {
})
.ok_or(EditError::InvalidRange)?;
self.finish_composition();
- let image = self.remove_picture(index);
+ let mut image = self.remove_picture(index);
+ // A printout page's XPS package cannot be written back, so undoing its deletion
+ // restores the picture OneNote showed of it.
+ if image.printout.is_some()
+ && image
+ .bytes
+ .as_deref()
+ .is_some_and(|bytes| bytes.starts_with(b"PK\x03\x04"))
+ && let Some(shown) = image.display.take()
+ {
+ image.bytes = Some(shown);
+ image.printout = None;
+ }
self.undo.push(History::Picture {
index,
image: Some(Box::new(image)),
@@ -2484,6 +2551,34 @@ impl CanvasEditor {
result
}
+ /// Runs `edit` once a selection crossing a table's edge is deleted, as OneNote 2010 deletes
+ /// one before what replaces it goes in at its start, in one undo step; `None` for any
+ /// other selection.
+ fn across(
+ &mut self,
+ engine: &mut TextEngine,
+ edit: impl FnOnce(&mut Self, &mut TextEngine) -> Result,
+ ) -> Result, EditorError> {
+ let [anchor, focus] = self.active_outline().selection.positions;
+ if !self
+ .active_outline()
+ .document
+ .crosses_table(anchor.min(focus)..anchor.max(focus))?
+ {
+ return Ok(None);
+ }
+ let depth = self.undo.len();
+ let result = self.delete(engine, false).and_then(|_| edit(self, engine));
+ let entries = self.undo.split_off(depth);
+ if !entries.is_empty() {
+ self.undo.push(History::Group {
+ entries,
+ page: false,
+ });
+ }
+ result.map(Some)
+ }
+
/// Runs `edit`, typing or a backspace at a caret, as part of the typing run the last undo
/// step holds if the caret is where that run left it and nothing came between; OneNote 2010
/// undoes a run whole however long it pauses.
@@ -3149,6 +3244,21 @@ impl CanvasEditor {
)
}
+ /// Replaces the selection with `text` in the formatting of the text it replaces, as a
+ /// spelling correction does.
+ pub fn correct(&mut self, engine: &mut TextEngine, text: &str) -> Result<(), EditorError> {
+ let [anchor, focus] = self.selection().positions;
+ let end = anchor.max(focus);
+ let format = self
+ .active_outline()
+ .document
+ .paragraph(end.paragraph)
+ .ok_or(EditError::InvalidRange)?
+ .format_at(end.offset)?
+ .clone();
+ self.replace(engine, vec![Paragraph::new(text.to_owned(), format)])
+ }
+
/// Types `text` at the selection; a space ends a typed URL, which becomes a link. A line
/// of text joins the typing run before it.
pub fn insert(&mut self, engine: &mut TextEngine, text: &str) -> Result<(), EditorError> {
@@ -3210,6 +3320,11 @@ impl CanvasEditor {
format.language = Some(language);
return self.replace(engine, vec![Paragraph::new(last.to_owned(), format)]);
}
+ if let Some(pasted) = self.across(engine, |editor, engine| {
+ editor.paste(engine, text, language)
+ })? {
+ return Ok(pasted);
+ }
let edge = Paragraph::new(String::new(), self.typing_format(start)?);
let pasted = Format {
font: Some("Calibri".into()),
@@ -3252,6 +3367,9 @@ impl CanvasEditor {
/// start its tags stay with its text below; an empty paragraph opens a plain one above and
/// leaves the list it ends; a heading continues as body text.
fn split(&mut self, engine: &mut TextEngine) -> Result<(), EditorError> {
+ if let Some(split) = self.across(engine, Self::split)? {
+ return Ok(split);
+ }
let [anchor, focus] = self.active_outline().selection.positions;
let (start, end) = (anchor.min(focus), anchor.max(focus));
let mut format = self.typing_format(start)?;
@@ -3339,8 +3457,9 @@ impl CanvasEditor {
.document
.leaf(end.paragraph)
.ok_or(EditError::InvalidRange)?;
+ // OneNote 2010's Tab leaves a selection crossing a table's edge alone.
if container != end_container {
- return Err(EditError::UnsupportedContent.into());
+ return Ok(false);
}
let range = local_start
..local_end + usize::from(end.offset != 0 || start.paragraph == end.paragraph);
@@ -3617,6 +3736,7 @@ impl CanvasEditor {
};
match self.apply_history(engine, history) {
Ok(inverse) => {
+ self.unstore_provisional();
let page = matches!(inverse, History::Group { page: true, .. });
self.redo.push(inverse);
if page {
@@ -3631,6 +3751,37 @@ impl CanvasEditor {
}
}
+ /// Removes from storage each stored provisional paragraph an undo left empty and the only
+ /// text of its outline, which shows it still.
+ fn unstore_provisional(&mut self) {
+ let removed: Vec = self
+ .provisional
+ .iter()
+ .filter(|(outline, (blank, stored))| {
+ let Some(outline) = self.outlines.iter().find(|item| item.id == **outline) else {
+ return false;
+ };
+ let mut leaves = crate::document::leaves(outline.document.nodes(), None);
+ *stored
+ && matches!(
+ (leaves.next(), leaves.next()),
+ (Some((None, _, node)), None) if node.id == blank.id
+ && node.tags.is_empty()
+ && node.lists.is_empty()
+ && node.text().is_some_and(|text| {
+ text.text.text().is_empty() && text.tags.is_empty()
+ })
+ )
+ })
+ .map(|(outline, _)| *outline)
+ .collect();
+ for outline in removed {
+ let (blank, _) = &self.provisional[&outline];
+ self.record(Ok(vec![PageOp::Delete { object: blank.id }]));
+ self.provisional.get_mut(&outline).unwrap().1 = false;
+ }
+ }
+
pub fn redo(&mut self, engine: &mut TextEngine) -> Result {
self.finish_composition();
let Some(history) = self.redo.pop() else {
@@ -5994,8 +6145,10 @@ mod tests {
..Default::default()
},
bytes: Some(std::sync::Arc::from(b"deferred image payload".as_slice())),
+ display: None,
alt: None,
background,
+ printout: None,
});
let (id, background_id) = (picture.id, background.id);
let mut editor = CanvasEditor::from_page(
@@ -6100,8 +6253,10 @@ mod tests {
..Default::default()
},
bytes: Some(std::sync::Arc::from(bytes)),
+ display: None,
alt: None,
background,
+ printout: None,
};
let [old, picture] = [image(true, b"old art"), image(false, b"picture")];
let mut editor = CanvasEditor::from_page(
@@ -6187,8 +6342,10 @@ mod tests {
..Default::default()
},
bytes: Some(std::sync::Arc::from(b"deferred image payload".as_slice())),
+ display: None,
alt: None,
background: false,
+ printout: None,
};
let id = picture.id;
let objects = vec![
@@ -6250,8 +6407,10 @@ mod tests {
id: onestore::page::text::new_id().unwrap(),
layout: Default::default(),
bytes: Some(std::sync::Arc::from(b"deferred image payload".as_slice())),
+ display: None,
alt: None,
background: false,
+ printout: None,
};
picture.content = ParagraphContent::Image(image.clone());
source.paragraphs.insert(1, picture);
@@ -6423,7 +6582,9 @@ mod tests {
editor.select(at(0, 3)).unwrap();
let middle = file("middle.txt");
- editor.insert_attachment(&mut engine, middle.clone()).unwrap();
+ editor
+ .insert_attachment(&mut engine, middle.clone())
+ .unwrap();
assert_eq!(shown(&editor), ["Bef", "[middle.txt]", "ore", ""]);
// A file is no text position: the caret starts "ore", the second text.
assert_eq!(editor.selection().positions, at(1, 0).positions);
@@ -6433,7 +6594,9 @@ mod tests {
if paragraphs.iter().any(|p| matches!(&p.content, ParagraphContent::Attachment(a) if *a == middle)))));
editor.select(at(2, 0)).unwrap();
- editor.insert_attachment(&mut engine, file("empty.bin")).unwrap();
+ editor
+ .insert_attachment(&mut engine, file("empty.bin"))
+ .unwrap();
assert_eq!(
shown(&editor),
["Bef", "[middle.txt]", "ore", "[empty.bin]", ""]
@@ -6447,7 +6610,7 @@ mod tests {
}
#[test]
- fn unknown_paragraphs_and_text_free_outlines_stay_on_the_page() {
+ fn unknown_paragraphs_stay_on_the_page_and_text_free_outlines_take_a_caret() {
use onestore::page::{Image, Page, PageObject, ParagraphContent, Unsupported};
let mut engine = TextEngine::default();
let outline = |engine: &mut TextEngine| {
@@ -6481,8 +6644,10 @@ mod tests {
id: onestore::page::text::new_id().unwrap(),
layout: Default::default(),
bytes: Some(std::sync::Arc::from(b"deferred image payload".as_slice())),
+ display: None,
alt: None,
background: false,
+ printout: None,
});
let (mixed_id, picture_id) = (mixed.id, picture_only.id);
let editor = CanvasEditor::from_page(
@@ -6512,11 +6677,15 @@ mod tests {
));
assert_eq!(placeholder.rect[2] - placeholder.rect[0], 160.0);
assert!(mixed.shaped().paragraphs[1].origin[1] >= placeholder.bottom);
- assert!(editor.objects.iter().any(|object| matches!(
+ // The picture's outline takes a paragraph for the caret, which the page leaves out
+ // until it is typed in.
+ assert!(editor.has_page_outline(picture_id));
+ let page = editor.page().unwrap();
+ assert_eq!(page.objects.len(), 2);
+ assert!(page.objects.iter().any(|object| matches!(
object,
- page::Content::Outline { source, .. } if source.id == picture_id
+ PageObject::Outline(outline) if outline.id == picture_id && outline.paragraphs.len() == 1
)));
- assert_eq!(editor.page().unwrap().objects.len(), 2);
}
#[test]
@@ -6560,8 +6729,10 @@ mod tests {
..Default::default()
},
bytes: Some(std::sync::Arc::from(b"deferred image payload".as_slice())),
+ display: None,
alt: None,
background,
+ printout: None,
});
let image_ids = images.each_ref().map(|image| image.id);
let image_bytes = images
@@ -9136,8 +9307,10 @@ mod tests {
},
size: None,
bytes: None,
+ display: None,
alt: None,
background: false,
+ printout: None,
});
if objects {
let selection = [TextPosition {
diff --git a/crates/canvas/src/editor/equation.rs b/crates/canvas/src/editor/equation.rs
index e0e20df4a641dd72520643ad87cc60934fa36323..57b55a8cddb86b51d06ad84623b1114a07f18fb7 100644
--- a/crates/canvas/src/editor/equation.rs
+++ b/crates/canvas/src/editor/equation.rs
@@ -119,28 +119,52 @@ impl CanvasEditor {
self.pending = Some((outline.id, start, format));
return Ok(());
}
- if start.paragraph != end.paragraph {
- return Err(EditError::UnsupportedContent.into());
+ // Across paragraphs each paragraph's part becomes an equation of its own, as in
+ // OneNote 2010, in one undo step.
+ let depth = self.undo.len();
+ let result = (|| {
+ for paragraph in start.paragraph..=end.paragraph {
+ let text = self
+ .active_outline()
+ .document
+ .paragraph(paragraph)
+ .ok_or(EditError::InvalidRange)?;
+ let from = if paragraph == start.paragraph {
+ start.offset
+ } else {
+ 0
+ };
+ let to = if paragraph == end.paragraph {
+ end.offset
+ } else {
+ text.utf16_offset(text.text().len())?
+ };
+ if from == to {
+ continue;
+ }
+ let linear = text
+ .slice(from..to)?
+ .project()?
+ .text()
+ .text()
+ .replace('\n', " ");
+ let base = format_after(text, from).cloned().unwrap_or_default();
+ let math = Math::paragraph(&Math::from_linear(&linear), &base);
+ let caret = from + math.utf16_offset(math.text().len())?;
+ self.replace_zone(engine, paragraph, from..to, math, caret)?;
+ }
+ Ok(())
+ })();
+ let entries = self.undo.split_off(depth);
+ match entries.len() {
+ 0 => {}
+ 1 => self.undo.extend(entries),
+ _ => self.undo.push(History::Group {
+ entries,
+ page: false,
+ }),
}
- let text = outline
- .document
- .paragraph(start.paragraph)
- .ok_or(EditError::InvalidRange)?;
- let selected = text.slice(start.offset..end.offset)?;
- let linear = selected.project()?.text().text().replace('\n', " ");
- let base = format_after(text, start.offset)
- .cloned()
- .unwrap_or_default();
- let math = Math::paragraph(&Math::from_linear(&linear), &base);
- let caret = start.offset + math.utf16_offset(math.text().len())?;
- self.replace_zone(
- engine,
- start.paragraph,
- start.offset..end.offset,
- math,
- caret,
- )?;
- Ok(())
+ result
}
/// Builds the equation up after the space typed at `typed` ended part of it, as the
diff --git a/crates/canvas/src/editor/format.rs b/crates/canvas/src/editor/format.rs
index 2654ce08cf56997b2bbaea9bbad4b408ccbe006d..2daf7dfa2e1dabd7518192800d28b7560f76a9b9 100644
--- a/crates/canvas/src/editor/format.rs
+++ b/crates/canvas/src/editor/format.rs
@@ -174,6 +174,10 @@ pub struct NoteTag {
/// COLORREFs; none leaves the text's own.
pub color: Option,
pub highlight: Option,
+ /// Snowbound's own art for the tag, named for its content, which a notebook's
+ /// `.snowbound` folder maps the tag's name and symbol to; OneNote draws the symbol.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub art: Option,
}
/// OneNote 2010's tag list before it is customized, the first nine on Ctrl+1 to Ctrl+9
@@ -220,10 +224,19 @@ impl NoteTag {
// The highlighting tags also set black text.
color: highlight.map(|_| 0),
highlight,
+ art: None,
})
.collect()
}
+ /// The tag as its definition stores it, without Snowbound's art.
+ pub fn stored(&self) -> Self {
+ Self {
+ art: None,
+ ..self.clone()
+ }
+ }
+
/// The definition OneNote stores for the tag at place `action_type` in the list.
pub fn definition(&self, action_type: u16) -> Definition {
Definition {
@@ -256,6 +269,7 @@ impl NoteTag {
shape: shape.unwrap_or(0),
color: *color,
highlight: *highlight,
+ art: None,
},
action_type.unwrap_or(0),
))
@@ -905,7 +919,7 @@ impl CanvasEditor {
Formatting::Toggle(toggle) => state.toggles.contains(toggle),
Formatting::Bullets => state.bullets,
Formatting::Numbering => state.numbering,
- Formatting::Tag(tag, action_type) => state.tags.contains(&(tag.clone(), *action_type)),
+ Formatting::Tag(tag, action_type) => state.tags.contains(&(tag.stored(), *action_type)),
_ => false,
};
let mut outlines = Vec::new();
@@ -939,9 +953,10 @@ impl CanvasEditor {
self.focus_outline(outline)?;
let outline = self.active_outline();
let document = &outline.document;
- let paragraph = leaves(document.nodes(), None)
- .position(|(_, _, node)| node.id == id)
- .ok_or(EditError::InvalidRange)?;
+ let Some(paragraph) = leaves(document.nodes(), None).position(|(_, _, node)| node.id == id)
+ else {
+ return self.click_block_check(engine, id);
+ };
let at = TextPosition {
paragraph,
offset: 0,
@@ -965,6 +980,53 @@ impl CanvasEditor {
)
}
+ /// A click on the check box of a table, picture or file paragraph `id`.
+ fn click_block_check(
+ &mut self,
+ engine: &mut TextEngine,
+ id: ExGuid,
+ ) -> Result<(), EditorError> {
+ let outline = self.active_outline();
+ let (container, index, node) = descendants(outline.document.nodes(), None)
+ .find(|(_, _, node)| node.id == id)
+ .ok_or(EditError::InvalidRange)?;
+ let mut node = node.clone();
+ let checkable = |tag: &Tag| {
+ matches!(
+ self.tag_kind(tag),
+ Some(Kind::TagDefinition { shape: Some(shape), .. })
+ if crate::outline::checkable(*shape)
+ )
+ };
+ let content = match &mut node.content {
+ ParagraphContent::Table(table) => table.tags.as_mut_slice(),
+ _ => &mut [],
+ };
+ let mut tags: Vec<&mut Tag> = node.tags.iter_mut().chain(content).collect();
+ let checked = tags
+ .iter()
+ .filter(|tag| checkable(tag))
+ .all(|tag| tag.status & 1 != 0);
+ let completed = if checked { Some(0) } else { time32() };
+ for tag in &mut tags {
+ if checkable(tag) && (tag.status & 1 != 0) == checked {
+ tag.status ^= 1;
+ tag.completed = completed;
+ }
+ }
+ let selection = outline.selection;
+ self.commit(
+ engine,
+ DocumentEdit {
+ columns: BTreeMap::new(),
+ container,
+ range: index..index + 1,
+ replacement: vec![node],
+ },
+ selection,
+ )
+ }
+
/// Checks the check boxes of the `covered` paragraphs, or clears them once all are
/// checked; OneNote keeps a cleared box's completion time as zero.
fn check(
@@ -1976,6 +2038,7 @@ mod tests {
shape: 61,
color: Some(0x0000_0080),
highlight: Some(0x00ff_cc00),
+ art: None,
};
editor
.format(&mut engine, Formatting::Tag(tag.clone(), 0))
diff --git a/crates/canvas/src/editor/ink.rs b/crates/canvas/src/editor/ink.rs
index af6f5ed8f517c716959510dd923beaf0049c4fb1..2045df5a565d715061bb4f3add8d7e32a9de78c1 100644
--- a/crates/canvas/src/editor/ink.rs
+++ b/crates/canvas/src/editor/ink.rs
@@ -6,7 +6,11 @@ use super::{CanvasEditor, EditError, EditorError, History, Placement, page};
use onestore::{
ExGuid,
op::PageOp,
- page::{Ink, InkStroke, PageObject, ink::snap, text::new_id},
+ page::{
+ Ink, InkStroke, PageObject,
+ ink::{level, snap},
+ text::new_id,
+ },
};
/// A pen or highlighter, as OneNote's pen gallery and Color & Thickness choose one.
@@ -47,8 +51,9 @@ impl Pen {
}
}
- /// A stroke of this pen through `points`, snapped to the HIMETRIC grid stored.
- pub fn stroke(&self, points: &[[f32; 2]]) -> Result {
+ /// A stroke of this pen through `points`, snapped to the HIMETRIC grid stored, its width
+ /// following `pressure` at each point unless that is empty, as a mouse's is.
+ pub fn stroke(&self, points: &[[f32; 2]], pressure: &[f32]) -> Result {
let points_of = |himetric: f32| snap(himetric * 72.0 / 2540.0);
Ok(InkStroke {
id: new_id()?,
@@ -63,6 +68,7 @@ impl Pen {
transparency: self.highlighter.then_some(127),
pen_tip: self.highlighter.then_some(1),
raster_operation: self.highlighter.then_some(9),
+ pressure: pressure.iter().copied().map(level).collect(),
})
}
}
diff --git a/crates/canvas/src/editor/link.rs b/crates/canvas/src/editor/link.rs
index 3be719d5c34e97782b4beeebdd9f7563debd9c0b..add6d2a2c7d587803ae4476380fcb888d4b34be8 100644
--- a/crates/canvas/src/editor/link.rs
+++ b/crates/canvas/src/editor/link.rs
@@ -175,6 +175,10 @@ fn field_code(address: &str) -> String {
format!("\u{fddf}HYPERLINK \"{address}\"")
}
+/// A range of a paragraph the Link dialog links, with the text it shows and the address it
+/// holds.
+type Linked = (usize, Range, String, String);
+
impl CanvasEditor {
/// The link in the active outline at `position`, its ends included.
pub fn link_at(&self, position: TextPosition) -> Option {
@@ -234,12 +238,13 @@ impl CanvasEditor {
/// What the Link dialog links, as OneNote 2010 picks it: the selection within one
/// paragraph, else the link or word at the caret, else nothing at the caret. With the
- /// text it shows and the address it holds.
- fn link_range(&self) -> Result<(usize, Range, String, String), EditError> {
+ /// text it shows and the address it holds; none for a selection across paragraphs, which
+ /// OneNote's Link leaves alone.
+ fn link_range(&self) -> Result, EditError> {
let [anchor, focus] = self.active_outline().selection.positions;
let (start, end) = (anchor.min(focus), anchor.max(focus));
if start.paragraph != end.paragraph {
- return Err(EditError::UnsupportedContent);
+ return Ok(None);
}
let text = self
.active_outline()
@@ -263,11 +268,16 @@ impl CanvasEditor {
.filter(|link| link.range().start <= range.start && range.end <= link.label.end)
.map(|link| link.target)
.unwrap_or_default();
- return Ok((start.paragraph, range.clone(), shown(range)?, address));
+ return Ok(Some((
+ start.paragraph,
+ range.clone(),
+ shown(range)?,
+ address,
+ )));
}
if let Some(link) = self.link_at(start) {
let label = shown(link.label.clone())?;
- return Ok((start.paragraph, link.range(), label, link.target));
+ return Ok(Some((start.paragraph, link.range(), label, link.target)));
}
// The word at the caret, within plain visible text.
let byte = text.byte_offset(start.offset)?;
@@ -293,14 +303,22 @@ impl CanvasEditor {
.last()
.map_or(byte, |(at, c)| byte + at + c.len_utf8());
let range = text.utf16_offset(from)?..text.utf16_offset(to)?;
- Ok((start.paragraph, range.clone(), shown(range)?, String::new()))
+ Ok(Some((
+ start.paragraph,
+ range.clone(),
+ shown(range)?,
+ String::new(),
+ )))
}
- /// The text and address the Link dialog opens with.
- pub fn link_prefill(&self) -> (String, String) {
- self.link_range()
- .map(|(_, _, text, address)| (text, address))
- .unwrap_or_default()
+ /// The text and address the Link dialog opens with; none where it does not open, over a
+ /// selection across paragraphs.
+ pub fn link_prefill(&self) -> Option<(String, String)> {
+ match self.link_range() {
+ Ok(Some((_, _, text, address))) => Some((text, address)),
+ Ok(None) => None,
+ Err(_) => Some(Default::default()),
+ }
}
/// OK in the Link dialog: what [`Self::link_prefill`] picked becomes `text`, or the
@@ -314,7 +332,9 @@ impl CanvasEditor {
if address.trim().is_empty() {
return Ok(());
}
- let (paragraph, range, _, _) = self.link_range()?;
+ let Some((paragraph, range, _, _)) = self.link_range()? else {
+ return Ok(());
+ };
let current = self
.active_outline()
.document
@@ -601,7 +621,7 @@ mod tests {
typed(&mut editor, engine, "Zplain words here");
let paragraph = editor.selection().positions[0].paragraph;
editor.select(at(paragraph, 13)).unwrap();
- assert_eq!(editor.link_prefill(), ("here".into(), String::new()));
+ assert_eq!(editor.link_prefill(), Some(("here".into(), String::new())));
editor.set_link(engine, "here", "example.net/x").unwrap();
typed(&mut editor, engine, "Q");
editor.enter(engine, false).unwrap();
@@ -622,12 +642,15 @@ mod tests {
.into(),
)
.unwrap();
- assert_eq!(editor.link_prefill(), ("me please".into(), String::new()));
+ assert_eq!(
+ editor.link_prefill(),
+ Some(("me please".into(), String::new()))
+ );
editor
.set_link(engine, "me please", "https://example.com/selected")
.unwrap();
editor.enter(engine, false).unwrap();
- assert_eq!(editor.link_prefill(), (String::new(), String::new()));
+ assert_eq!(editor.link_prefill(), Some((String::new(), String::new())));
editor
.set_link(engine, "", "https://example.com/only")
.unwrap();
diff --git a/crates/canvas/src/editor/ops.rs b/crates/canvas/src/editor/ops.rs
index 4bbd1fa473e2ba33845526379612b00b7fbb29c5..d3e0362ddcd1201d2f8f8c55bb1534fa4c356f80 100644
--- a/crates/canvas/src/editor/ops.rs
+++ b/crates/canvas/src/editor/ops.rs
@@ -15,6 +15,44 @@ fn stale(_: EditError) -> onestore::Error {
refused("The editor lost track of the stored page")
}
+/// Whether `op` needs paragraph `blank`, last in `outline` and not stored yet: it edits the
+/// paragraph or its text, or adds to or moves within the outline's top level.
+fn reaches(op: &PageOp, outline: ExGuid, blank: &PageParagraph) -> bool {
+ let text = blank.text().map(|text| text.id);
+ let own = |id: &ExGuid| *id == blank.id || Some(*id) == text;
+ match op {
+ PageOp::Text { text, .. }
+ | PageOp::Format { text, .. }
+ | PageOp::Link { text, .. }
+ | PageOp::Equation { text, .. }
+ | PageOp::Split { text, .. } => own(text),
+ PageOp::Join { left, right } => own(left) || own(right),
+ PageOp::Insert {
+ container, before, ..
+ } => *container == outline || before.as_ref().is_some_and(own),
+ PageOp::Move {
+ object,
+ parent,
+ before,
+ } => {
+ own(object)
+ || parent
+ .as_ref()
+ .is_some_and(|parent| *parent == outline || own(parent))
+ || before.as_ref().is_some_and(own)
+ }
+ PageOp::Delete { object: id }
+ | PageOp::Level { paragraph: id, .. }
+ | PageOp::Outline { object: id, .. }
+ | PageOp::Paragraph { paragraph: id, .. }
+ | PageOp::Style { paragraph: id, .. }
+ | PageOp::Media { paragraph: id, .. }
+ | PageOp::List { paragraph: id, .. }
+ | PageOp::Tags { target: id, .. } => own(id),
+ _ => false,
+ }
+}
+
/// Definitions a paragraph names: its lists, style and note tags.
pub(super) fn references(node: &PageParagraph) -> impl Iterator- + '_ {
let content_tags = match &node.content {
@@ -266,12 +304,30 @@ impl CanvasEditor {
taken
}
+ /// Queues `lowered`, storing first the provisional paragraph of an outline an op reaches.
pub(super) fn record(&mut self, lowered: Lowered) {
- if let Ok(ops) = &mut self.ops {
- match lowered {
- Ok(mut lowered) => ops.append(&mut lowered),
- Err(error) => self.ops = Err(error),
+ let Ok(ops) = &mut self.ops else {
+ return;
+ };
+ let lowered = match lowered {
+ Ok(lowered) => lowered,
+ Err(error) => {
+ self.ops = Err(error);
+ return;
}
+ };
+ for op in lowered {
+ for (outline, (blank, stored)) in &mut self.provisional {
+ if !*stored && reaches(&op, *outline, blank) {
+ *stored = true;
+ ops.push(PageOp::Insert {
+ container: *outline,
+ before: None,
+ paragraphs: vec![blank.clone()],
+ });
+ }
+ }
+ ops.push(op);
}
}
diff --git a/crates/canvas/src/editor/page.rs b/crates/canvas/src/editor/page.rs
index 7b7def205020a6a3b7a45aa5e15e7c10c56a8502..0d4815d1a531975586caffaade9ca16919764159 100644
--- a/crates/canvas/src/editor/page.rs
+++ b/crates/canvas/src/editor/page.rs
@@ -5,7 +5,7 @@ use crate::{
outline::{Arrange, OutlineLayout},
};
use onestore::page::text::Paragraph;
-use onestore::page::{Attachment, Image, Ink, Outline, Page, PageObject};
+use onestore::page::{Attachment, Image, Ink, Outline, Page, PageObject, PageParagraph};
use std::collections::BTreeMap;
/// A title object's own state, plus the child origins `build` replaces with page coordinates.
@@ -21,6 +21,8 @@ pub(crate) struct Import {
pub outlines: Vec,
pub date: Option,
pub areas: Vec,
+ /// The paragraph each outline holding no text shows after its objects, not stored.
+ pub provisional: BTreeMap,
}
pub(crate) enum Content {
@@ -184,6 +186,7 @@ pub(crate) fn build(
let mut outlines = Vec::new();
let mut areas = Vec::new();
let mut date = None;
+ let mut provisional = BTreeMap::new();
for object in std::mem::take(&mut page.objects) {
match &object {
PageObject::Outline(outline) => {
@@ -202,7 +205,28 @@ pub(crate) fn build(
)
};
if editable {
- match TextOutline::from_outline(engine, outline, &page.definitions) {
+ // Pictures and files alone in an outline take a paragraph after them where
+ // a click beside them lands, as OneNote 2010 adds one when typing there.
+ let extended;
+ let source = if crate::document::leaves(&outline.paragraphs, None)
+ .next()
+ .is_none()
+ {
+ let blank = crate::document::node(
+ Paragraph::new(String::new(), Default::default()),
+ Default::default(),
+ )?;
+ extended = Outline {
+ paragraphs: [&outline.paragraphs[..], std::slice::from_ref(&blank)]
+ .concat(),
+ ..outline.clone()
+ };
+ provisional.insert(outline.id, blank);
+ &extended
+ } else {
+ outline
+ };
+ match TextOutline::from_outline(engine, source, &page.definitions) {
Ok(outline) => {
objects.push(Content::Editable(outline.id));
outlines.push(outline);
@@ -210,7 +234,9 @@ pub(crate) fn build(
}
Err(error) if !unsupported(&error) => return Err(error),
// Drawn as stored when the editor cannot hold it.
- Err(_) => {}
+ Err(_) => {
+ provisional.remove(&outline.id);
+ }
}
}
match outline.layout(engine, &page.definitions) {
@@ -396,6 +422,7 @@ pub(crate) fn build(
outlines,
date,
areas,
+ provisional,
})
}
@@ -415,11 +442,15 @@ fn stroke_bounds(ink: &Ink) -> Option<[f32; 4]> {
ink.strokes
.iter()
.flat_map(|stroke| {
- let r = stroke.width.max(stroke.height) * 0.5;
+ let size = stroke.width.max(stroke.height) * 0.5;
stroke
.points
.iter()
- .map(move |[x, y]| [x - r, y - r, x + r, y + r])
+ .enumerate()
+ .map(move |(index, [x, y])| {
+ let r = size * stroke.thickness(index);
+ [x - r, y - r, x + r, y + r]
+ })
})
.chain(ink.groups.iter().filter_map(stroke_bounds))
.reduce(|a, b| {
diff --git a/crates/canvas/src/editor/recording.rs b/crates/canvas/src/editor/recording.rs
index c8ed78b4d36811e4f1215a2ac4a680e6c01c63df..fd075ef8fa0c976dcce9652c751cc1bb7b6cd6be 100644
--- a/crates/canvas/src/editor/recording.rs
+++ b/crates/canvas/src/editor/recording.rs
@@ -88,8 +88,13 @@ impl CanvasEditor {
if self.recording.is_some() {
return Err(EditError::InvalidRange.into());
}
- let id = onestore::page::text::new_guid()?;
self.leave_title(engine)?;
+ if let Some(id) = self.across(engine, |editor, engine| {
+ editor.start_recording(engine, label)
+ })? {
+ return Ok(id);
+ }
+ let id = onestore::page::text::new_guid()?;
let [anchor, focus] = self.selection().positions;
let (start, end) = (anchor.min(focus), anchor.max(focus));
let mut format = self.typing_format(start)?;
diff --git a/crates/canvas/src/editor/table.rs b/crates/canvas/src/editor/table.rs
index 7f986d45c2812c3b3b84cac711a5a0bac44abccb..bfaf7e654e54211ab74c6d7a4998d0ec74b36325 100644
--- a/crates/canvas/src/editor/table.rs
+++ b/crates/canvas/src/editor/table.rs
@@ -35,16 +35,24 @@ fn locate(document: &TextDocument, id: ExGuid) -> Option> {
None
}
+/// A new cell like `source`, one empty paragraph in its first text's format; a cell holding
+/// no text, only pictures or files, gives a plain one.
fn empty_cell(source: &TableCell) -> Result {
- let (_, _, paragraph) = leaves(&source.paragraphs, None)
- .next()
- .ok_or(EditError::UnsupportedContent)?;
- let format = paragraph.text().unwrap().text.format_at(0)?;
- let mut node = crate::document::node(
- Paragraph::new(String::new(), format.clone()),
- paragraph.format.clone(),
- )?;
- node.style = paragraph.style;
+ let node = match leaves(&source.paragraphs, None).next() {
+ Some((_, _, paragraph)) => {
+ let format = paragraph.text().unwrap().text.format_at(0)?;
+ let mut node = crate::document::node(
+ Paragraph::new(String::new(), format.clone()),
+ paragraph.format.clone(),
+ )?;
+ node.style = paragraph.style;
+ node
+ }
+ None => crate::document::node(
+ Paragraph::new(String::new(), Default::default()),
+ Default::default(),
+ )?,
+ };
Ok(TableCell {
id: new_id()?,
layout: Default::default(),
@@ -377,6 +385,16 @@ impl CanvasEditor {
)
}
pub fn enter(&mut self, engine: &mut TextEngine, soft: bool) -> Result<(), EditorError> {
+ let [anchor, focus] = self.active_outline().selection.positions;
+ // Inside a link's label OneNote 2010 ignores Shift+Enter, and Enter follows the link
+ // (`PageView` asks the host), so neither breaks it.
+ if anchor == focus
+ && self.link_at(focus).is_some_and(|link| {
+ link.label.start < focus.offset && focus.offset < link.label.end
+ })
+ {
+ return Ok(());
+ }
if soft {
return self.insert(engine, "\u{000b}");
}
diff --git a/crates/canvas/src/gpu/mod.rs b/crates/canvas/src/gpu/mod.rs
index 5d73aea37db05a69280742365d21480eabc67bfe..c1b50953f137f97248f6dfffe5858e0adfa167ce 100644
--- a/crates/canvas/src/gpu/mod.rs
+++ b/crates/canvas/src/gpu/mod.rs
@@ -1,6 +1,8 @@
pub mod page;
#[cfg(test)]
mod profile;
+mod tag_art;
+pub use tag_art::{TagArt, art_sources, import as import_tag_art};
use crate::{
layout::{TextBrush, TextLayout},
diff --git a/crates/canvas/src/gpu/page.rs b/crates/canvas/src/gpu/page.rs
index 82e57a1a05177f785b398ffc7b6a8d04219ddbbd..72952fc0b0caaa3d635135fbdef07b760bd49749 100644
--- a/crates/canvas/src/gpu/page.rs
+++ b/crates/canvas/src/gpu/page.rs
@@ -98,7 +98,8 @@ fn outline_origin(
/// Draws `ink` moved by `offset`, strokes without a colour in the paper's `automatic` ink. A
/// highlighter's rectangular tip sweeps a band as wide as the tip reaches across each
-/// segment, its colour multiplying what lies beneath as OneNote's MaskPen does.
+/// segment, its colour multiplying what lies beneath as OneNote's MaskPen does. A pressure
+/// pen's width follows its pressure from point to point, as OneNote's does.
pub(crate) fn append_ink(
ink: &onestore::page::Ink,
offset: [f32; 2],
@@ -112,12 +113,21 @@ pub(crate) fn append_ink(
color[3] = 1.0 - f32::from(stroke.transparency.unwrap_or(0)) / 255.0;
}
let round = stroke.pen_tip != Some(1);
- let segment = |from: [f32; 2], to: [f32; 2]| {
+ let size = stroke.width.max(stroke.height);
+ let segment = |from: [f32; 2], to: [f32; 2], [t0, t1]: [f32; 2]| {
if !highlighter {
+ if round && t0 != t1 {
+ return Primitive::Taper {
+ from,
+ to,
+ widths: [size * t0, size * t1],
+ color,
+ };
+ }
return Primitive::Segment {
from,
to,
- width: stroke.width.max(stroke.height),
+ width: size * (t0 + t1) / 2.0,
round,
color,
};
@@ -132,28 +142,30 @@ pub(crate) fn append_ink(
Primitive::Highlight {
from,
to,
- width: stroke.width * across + stroke.height * along,
+ width: (stroke.width * across + stroke.height * along) * (t0 + t1) / 2.0,
color,
}
};
let mut points = stroke
.points
.iter()
- .map(|[x, y]| [x + offset[0], y + offset[1]]);
- let Some(mut from) = points.next() else {
+ .enumerate()
+ .map(|(index, [x, y])| ([x + offset[0], y + offset[1]], stroke.thickness(index)));
+ let Some((mut from, mut thick)) = points.next() else {
continue;
};
- // Samples along a straight run make one segment, since each joint paints its overlap
- // twice.
- let mut end = from;
- for to in points {
- if !between(from, end, to) {
- primitives.push(segment(from, end));
- from = end;
+ // Samples along a straight run of one width make one segment, since each joint paints
+ // its overlap twice.
+ let (mut end, mut end_thick) = (from, thick);
+ for (to, to_thick) in points {
+ let same = end == from || (to_thick == end_thick && end_thick == thick);
+ if !(same && between(from, end, to)) {
+ primitives.push(segment(from, end, [thick, end_thick]));
+ (from, thick) = (end, end_thick);
}
- end = to;
+ (end, end_thick) = (to, to_thick);
}
- primitives.push(segment(from, end));
+ primitives.push(segment(from, end, [thick, end_thick]));
}
for group in &ink.groups {
append_ink(group, offset, automatic, primitives);
@@ -326,21 +338,18 @@ impl PageScene {
}
/// Every picture the page draws, page-level ones and those inside outlines, except the
- /// template backgrounds it recognises; one the renderer cannot decode is left out.
+ /// template backgrounds it recognises; one the renderer cannot decode is left out. A
+ /// picture shows its stored bytes, else the raster OneNote made of them.
fn pictures(objects: &[Content], editor: Option<&CanvasEditor>) -> Result {
- fn nested<'a>(
- nodes: &'a [onestore::page::PageParagraph],
- payloads: &mut Vec<(onestore::ExGuid, Option<&'a Arc<[u8]>>)>,
- ) {
+ type Payloads<'a> = Vec<(onestore::ExGuid, [Option<&'a Arc<[u8]>>; 2])>;
+ fn nested<'a>(nodes: &'a [onestore::page::PageParagraph], payloads: &mut Payloads<'a>) {
for node in nodes {
match &node.content {
onestore::page::ParagraphContent::Image(image) => {
- payloads.push((image.id, image.bytes.as_ref()))
+ payloads.push((image.id, [image.bytes.as_ref(), image.display.as_ref()]))
}
onestore::page::ParagraphContent::Attachment(file) => {
- if let Some(icon) = file.preview.as_ref() {
- payloads.push((file.id, Some(icon)))
- }
+ payloads.push((file.id, [file.preview.as_ref(), None]))
}
onestore::page::ParagraphContent::Table(table) => {
for cell in table.rows.iter().flat_map(|row| &row.cells) {
@@ -361,13 +370,11 @@ impl PageScene {
{
backgrounds.insert(source.id, art);
} else {
- payloads.push((source.id, source.bytes.as_ref()))
+ payloads.push((source.id, [source.bytes.as_ref(), source.display.as_ref()]))
}
}
Content::File { source, .. } => {
- if let Some(icon) = source.preview.as_ref() {
- payloads.push((source.id, Some(icon)))
- }
+ payloads.push((source.id, [source.preview.as_ref(), None]))
}
Content::Outline { source, .. } => nested(&source.paragraphs, &mut payloads),
Content::Editable(id) => {
@@ -382,7 +389,7 @@ impl PageScene {
}
let mut pictures = std::collections::BTreeMap::new();
for (id, encoded) in payloads {
- let Some(picture) = encoded.and_then(Picture::new) else {
+ let Some(picture) = encoded.into_iter().flatten().find_map(Picture::new) else {
continue;
};
if pictures.insert(id, picture).is_some() {
@@ -772,6 +779,7 @@ impl PageScene {
}
/// `moving` draws one picture at a previewed rectangle instead of its stored layout.
+ /// Outlines the editor does not hold draw their tags' symbols.
pub fn append_primitives_with<'a, E: From>(
&'a self,
primitives: &mut Vec>,
@@ -904,23 +912,31 @@ impl PageScene {
let Some(image) = image else {
continue;
};
- primitives.push(Primitive::Image {
- image,
- rect: match moving {
- Some((id, [x0, y0, x1, y1])) if id == source.id => [
- x0 + offset[0],
- y0 + offset[1],
- x1 + offset[0],
- y1 + offset[1],
- ],
- _ => [
- object_origin[0],
- object_origin[1],
- object_origin[0] + width,
- object_origin[1] + height,
- ],
- },
- })
+ let rect = match moving {
+ Some((id, [x0, y0, x1, y1])) if id == source.id => [
+ x0 + offset[0],
+ y0 + offset[1],
+ x1 + offset[0],
+ y1 + offset[1],
+ ],
+ _ => [
+ object_origin[0],
+ object_origin[1],
+ object_origin[0] + width,
+ object_origin[1] + height,
+ ],
+ };
+ primitives.push(Primitive::Image { image, rect });
+ // OneNote frames a printout's page with a one-pixel grey line.
+ if source.printout.is_some() {
+ let [x0, y0, x1, y1] = rect;
+ primitives.push(Primitive::RoundedRect {
+ rect: [x0 + 0.375, y0 + 0.375, x1 - 0.375, y1 - 0.375],
+ radius: [0.0; 2],
+ stroke: Some(draw::Stroke::Solid(0.75)),
+ color: paper.shade(colorref(0x00cc_cccc)),
+ });
+ }
}
Content::Outline { .. } | Content::Date { .. } => {
let outline = match content {
@@ -931,6 +947,8 @@ impl PageScene {
.layout(),
};
outline.append_table_primitives(primitives, object_origin, paper);
+ let art = super::TagArt::default();
+ outline.append_block_tag_primitives(primitives, object_origin, &art);
let everything = [f32::NEG_INFINITY, f32::INFINITY];
outline.append_background_primitives(
primitives,
@@ -945,6 +963,7 @@ impl PageScene {
paragraph,
object_origin,
paper.ink,
+ &art,
primitives,
);
}
@@ -1040,13 +1059,14 @@ impl crate::outline::OutlineLayout {
}
/// One paragraph of this outline, whose origin is `origin`: its text or equation, list
- /// markers and tags.
+ /// markers and tags, those `art` maps drawn with their art.
pub fn append_paragraph_primitives<'a>(
&'a self,
index: usize,
paragraph: &'a crate::outline::ParagraphLayout,
origin: [f32; 2],
ink: [f32; 4],
+ art: &super::TagArt,
primitives: &mut Vec>,
) {
let [x, y] = [
@@ -1117,7 +1137,7 @@ impl crate::outline::OutlineLayout {
}
for tag in ¶graph.tags {
primitives.push(Primitive::Icon {
- sources: super::tag_sources(tag.icon),
+ sources: art.sources(tag),
origin: [
origin[0] + self.tag_column_offset() + tag.origin[0],
y + tag.origin[1],
@@ -1129,6 +1149,33 @@ impl crate::outline::OutlineLayout {
}
}
+ /// The note tags of this outline's tables, pictures and files, whose origin is `origin`,
+ /// those `art` maps drawn with their art.
+ pub fn append_block_tag_primitives(
+ &self,
+ primitives: &mut Vec>,
+ origin: [f32; 2],
+ art: &super::TagArt,
+ ) {
+ let tables = self.tables.iter().filter_map(|table| table.tags.as_ref());
+ let objects = self
+ .objects
+ .iter()
+ .filter_map(|object| object.tags.as_ref());
+ for tag in tables.chain(objects).flat_map(|block| &block.tags) {
+ primitives.push(Primitive::Icon {
+ sources: art.sources(tag),
+ origin: [
+ origin[0] + self.tag_column_offset() + tag.origin[0],
+ origin[1] + tag.origin[1],
+ ],
+ size: tag.size,
+ tint: [1.0, 1.0, 1.0, if tag.disabled { 0.45 } else { 1.0 }],
+ palette: draw::Palette::default(),
+ });
+ }
+ }
+
pub fn append_table_primitives(
&self,
primitives: &mut Vec>,
@@ -1577,6 +1624,7 @@ mod tests {
size: None,
id: onestore::page::text::new_id().unwrap(),
bytes: Some(image_bytes.clone()),
+ display: None,
layout: Layout {
x: Some(x),
y: Some(y),
@@ -1586,6 +1634,7 @@ mod tests {
},
alt: None,
background,
+ printout: None,
}));
}
let (mut scene, mut editor) = PageScene::from_page(page, &mut engine).unwrap();
@@ -1944,8 +1993,10 @@ mod tests {
..Default::default()
},
bytes: None,
+ display: None,
alt: Some("missing diagram".into()),
background: false,
+ printout: None,
}),
PageObject::Unsupported(unknown.clone()),
],
@@ -2112,8 +2163,10 @@ mod tests {
..Default::default()
},
bytes: Some(Arc::from(bytes.clone())),
+ display: None,
alt: None,
background: false,
+ printout: None,
}),
outline(50.0, "last"),
],
@@ -2254,6 +2307,7 @@ mod tests {
transparency: Some(51),
pen_tip: None,
raster_operation: None,
+ pressure: Vec::new(),
};
let ink = Ink {
id: ExGuid::default(),
@@ -2317,6 +2371,59 @@ mod tests {
assert_eq!(editor.page().unwrap().objects, [PageObject::Ink(ink)]);
}
+ #[test]
+ fn pressure_widens_a_stroke_from_point_to_point_as_onenote_draws_it() {
+ use onestore::page::{Ink, InkStroke};
+ let stroke = |points: Vec<[f32; 2]>, pressure: Vec| InkStroke {
+ id: ExGuid::default(),
+ points,
+ width: 4.0,
+ height: 4.0,
+ color: None,
+ transparency: None,
+ pen_tip: None,
+ raster_operation: None,
+ pressure,
+ };
+ let ink = Ink {
+ id: ExGuid::default(),
+ layout: Layout::default(),
+ strokes: vec![
+ stroke(
+ vec![[0.0, 0.0], [10.0, 0.0], [20.0, 0.0]],
+ vec![0.0, 0.5, 1.0],
+ ),
+ // A straight run at one pressure is one segment.
+ stroke(vec![[0.0, 10.0], [10.0, 10.0], [20.0, 10.0]], vec![0.0; 3]),
+ ],
+ groups: Vec::new(),
+ shape: None,
+ };
+ let mut primitives = Vec::new();
+ append_ink(&ink, [0.0; 2], [0.0, 0.0, 0.0, 1.0], &mut primitives);
+ let found: Vec<([f32; 2], [f32; 2], [f32; 2])> = primitives
+ .iter()
+ .map(|primitive| match primitive {
+ Primitive::Taper {
+ from, to, widths, ..
+ } => (*from, *to, *widths),
+ Primitive::Segment {
+ from, to, width, ..
+ } => (*from, *to, [*width; 2]),
+ _ => panic!(),
+ })
+ .collect();
+ // A quarter of the pen at no pressure, all of it at half and 1.75 times at full.
+ assert_eq!(
+ found,
+ [
+ ([0.0, 0.0], [10.0, 0.0], [1.0, 4.0]),
+ ([10.0, 0.0], [20.0, 0.0], [4.0, 7.0]),
+ ([0.0, 10.0], [20.0, 10.0], [1.0, 1.0]),
+ ]
+ );
+ }
+
#[test]
fn scene_owns_decoded_images_and_reuses_identity_across_translated_frames() {
let mut encoded = Vec::new();
@@ -2349,8 +2456,10 @@ mod tests {
..Default::default()
},
bytes: Some(Arc::from(encoded.clone())),
+ display: None,
alt: None,
background: false,
+ printout: None,
})],
};
let mut engine = TextEngine::default();
@@ -2412,8 +2521,10 @@ mod tests {
..Default::default()
},
bytes: Some(Arc::from(bytes.clone())),
+ display: None,
alt: None,
background,
+ printout: None,
};
let [background, picture] = [image(0.0, true), image(50.0, false)];
let id = picture.id;
@@ -2481,8 +2592,10 @@ mod tests {
..Default::default()
},
bytes: Some(Arc::clone(&bytes)),
+ display: None,
alt: None,
background: false,
+ printout: None,
})
.collect();
assert!(20 * u64::from(side * side) * 4 > draw::MAX_IMAGE_BYTES);
diff --git a/crates/canvas/src/gpu/page/background.rs b/crates/canvas/src/gpu/page/background.rs
index a6456df86cd5ace5be35b78c4eb0d7c65b29daac..6e86cf7b9d99c0604345ccf253e2486462e97126 100644
--- a/crates/canvas/src/gpu/page/background.rs
+++ b/crates/canvas/src/gpu/page/background.rs
@@ -753,8 +753,10 @@ mod tests {
},
size: None,
bytes: Some(Arc::from(bytes)),
+ display: None,
alt: None,
background: true,
+ printout: None,
}
}
diff --git a/crates/canvas/src/gpu/profile.rs b/crates/canvas/src/gpu/profile.rs
index c6f2e101001290c5512149d5e85d7461f1bb5082..890dac06f6bc361afbc4691dc9f1fda170f76634 100644
--- a/crates/canvas/src/gpu/profile.rs
+++ b/crates/canvas/src/gpu/profile.rs
@@ -243,8 +243,10 @@ fn frame_cost() {
},
size: None,
bytes: None,
+ display: None,
alt: None,
background: false,
+ printout: None,
});
let cell = || TableCell {
id: new_id().unwrap(),
diff --git a/crates/canvas/src/gpu/tag_art.rs b/crates/canvas/src/gpu/tag_art.rs
new file mode 100644
index 0000000000000000000000000000000000000000..295a6278f0e106262de0f669d81ec9be760850bf
--- /dev/null
+++ b/crates/canvas/src/gpu/tag_art.rs
@@ -0,0 +1,230 @@
+//! Pictures Snowbound draws for tags in place of their symbols. A notebook maps a tag, by
+//! the name and symbol its definition stores, to art of its own; OneNote 2010, which knows
+//! nothing of the art, draws the symbol.
+
+use super::{CHECKMARK, tag_sources};
+use crate::outline::{ParagraphTag, TagIcon};
+use resvg::{tiny_skia, usvg};
+use std::{collections::BTreeMap, sync::Mutex};
+
+/// The longest side art is drawn from, in pixels: a 24 pt tag at 200% on a 2× display.
+const SIDE: u32 = 128;
+
+/// Icon sources drawing a tag's art, unchecked and checked.
+type Sources = [&'static [&'static str]; 2];
+
+/// A picked PNG or SVG prepared for keeping as tag art, with its extension: an SVG as it is,
+/// a PNG no larger than the art is drawn from. None where it is neither, or draws nothing.
+pub fn import(bytes: &[u8]) -> Option<(Vec, &'static str)> {
+ let drawn = drawn(bytes)?;
+ Some(match svg(bytes) {
+ Some(_) => (bytes.to_vec(), "svg"),
+ None => (drawn, "png"),
+ })
+}
+
+/// The sources drawing art named `art`, made from what `bytes` reads the first time `art`
+/// is asked for; none where that is neither a PNG nor an SVG. Art is named by its content,
+/// so what one name draws never changes.
+pub fn art_sources(art: &str, bytes: impl FnOnce() -> Option>) -> Option {
+ static MADE: Mutex>> = Mutex::new(BTreeMap::new());
+ let mut made = MADE.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
+ if let Some(made) = made.get(art) {
+ return *made;
+ }
+ let sources = bytes()
+ .and_then(|bytes| drawn(&bytes))
+ .and_then(|png| draw::picture_icon(&png))
+ .map(|source| {
+ // Each art's sources are made once and drawn for the program's life.
+ let source: &'static str = source.leak();
+ let plain: &'static [&'static str] = Box::leak(Box::new([source]));
+ let checked: &'static [&'static str] = Box::leak(Box::new([source, CHECKMARK]));
+ [plain, checked]
+ });
+ made.insert(art.to_owned(), sources);
+ sources
+}
+
+/// Art as a PNG no larger than `SIDE`: an SVG drawn, a PNG scaled down; none where it is
+/// neither, or draws nothing.
+fn drawn(bytes: &[u8]) -> Option> {
+ if let Some(tree) = svg(bytes) {
+ return raster(&tree);
+ }
+ let picture = image::load_from_memory_with_format(bytes, image::ImageFormat::Png).ok()?;
+ let [width, height] = fit([picture.width(), picture.height()]);
+ let picture = picture.resize_exact(width, height, image::imageops::FilterType::Lanczos3);
+ Some(png(&picture.into_rgba8()))
+}
+
+/// An SVG document, reading no file it names.
+fn svg(bytes: &[u8]) -> Option {
+ let mut options = usvg::Options::default();
+ options.image_href_resolver.resolve_string = Box::new(|_, _| None);
+ usvg::Tree::from_data(bytes, &options).ok()
+}
+
+/// `tree` drawn as a PNG at its proportions no larger than `SIDE`; none where it paints
+/// nothing.
+fn raster(tree: &usvg::Tree) -> Option> {
+ let view = tree.size();
+ let [width, height] = fit([view.width(), view.height()].map(|side| side.ceil() as u32));
+ let mut pixmap = tiny_skia::Pixmap::new(width, height)?;
+ resvg::render(
+ tree,
+ tiny_skia::Transform::from_scale(
+ width as f32 / view.width(),
+ height as f32 / view.height(),
+ ),
+ &mut pixmap.as_mut(),
+ );
+ let rgba: Vec = pixmap
+ .pixels()
+ .iter()
+ .flat_map(|pixel| {
+ let color = pixel.demultiply();
+ [color.red(), color.green(), color.blue(), color.alpha()]
+ })
+ .collect();
+ if rgba.chunks_exact(4).all(|pixel| pixel[3] == 0) {
+ return None;
+ }
+ Some(png(&image::RgbaImage::from_raw(width, height, rgba)?))
+}
+
+/// A picture of `size` scaled to fit `SIDE` at its proportions, never larger.
+fn fit(size: [u32; 2]) -> [u32; 2] {
+ let longest = size[0].max(size[1]).max(1);
+ if longest <= SIDE {
+ return size.map(|side| side.max(1));
+ }
+ size.map(|side| (u64::from(side) * u64::from(SIDE) / u64::from(longest)).max(1) as u32)
+}
+
+fn png(picture: &image::RgbaImage) -> Vec {
+ let mut encoded = Vec::new();
+ let mut encoder = png::Encoder::new(&mut encoded, picture.width(), picture.height());
+ encoder.set_color(png::ColorType::Rgba);
+ encoder.set_depth(png::BitDepth::Eight);
+ encoder
+ .write_header()
+ .and_then(|mut writer| writer.write_image_data(picture.as_raw()))
+ .expect("A PNG encodes into memory");
+ encoded
+}
+
+/// The art a notebook's tags draw with, by the name and symbol their definitions store.
+#[derive(Clone, Default)]
+pub struct TagArt(Vec);
+
+#[derive(Clone)]
+struct Mapped {
+ name: String,
+ shape: u16,
+ art: String,
+ sources: Sources,
+}
+
+impl TagArt {
+ /// Draws tags named `name` with symbol `shape` with art `art`, drawn by `sources`, in
+ /// place of any art they drew with before.
+ pub fn map(&mut self, name: &str, shape: u16, art: &str, sources: Sources) {
+ self.0
+ .retain(|mapped| (mapped.name.as_str(), mapped.shape) != (name, shape));
+ self.0.push(Mapped {
+ name: name.to_owned(),
+ shape,
+ art: art.to_owned(),
+ sources,
+ });
+ }
+
+ /// The art tags named `name` with symbol `shape` draw with.
+ pub fn art(&self, name: &str, shape: u16) -> Option<&str> {
+ self.find(name, shape).map(|mapped| mapped.art.as_str())
+ }
+
+ /// What draws `tag`: its art, or its symbol.
+ pub fn sources(&self, tag: &ParagraphTag) -> &'static [&'static str] {
+ match tag.icon {
+ TagIcon::Symbol { shape, checked } => self.find(&tag.label, shape).map_or_else(
+ || tag_sources(tag.icon),
+ |mapped| mapped.sources[usize::from(checked)],
+ ),
+ TagIcon::Task { .. } => tag_sources(tag.icon),
+ }
+ }
+
+ fn find(&self, name: &str, shape: u16) -> Option<&Mapped> {
+ self.0
+ .iter()
+ .find(|mapped| mapped.name == name && mapped.shape == shape)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ fn encoded(width: u32, height: u32) -> Vec {
+ png(&image::RgbaImage::from_pixel(
+ width,
+ height,
+ image::Rgba([200, 40, 40, 255]),
+ ))
+ }
+
+ #[test]
+ fn pictures_keep_their_proportions_within_the_largest_side() {
+ let (kept, extension) = import(&encoded(400, 100)).unwrap();
+ assert_eq!(extension, "png");
+ let picture = image::load_from_memory(&kept).unwrap();
+ assert_eq!([picture.width(), picture.height()], [SIDE, SIDE / 4]);
+ let small = encoded(20, 30);
+ let (kept, _) = import(&small).unwrap();
+ let picture = image::load_from_memory(&kept).unwrap();
+ assert_eq!([picture.width(), picture.height()], [20, 30]);
+ assert!(import(b"neither").is_none());
+ }
+
+ #[test]
+ fn drawings_are_kept_as_written_unless_they_draw_nothing() {
+ let drawing = br##""##;
+ assert_eq!(import(drawing), Some((drawing.to_vec(), "svg")));
+ let empty = br#""#;
+ assert!(import(empty).is_none());
+ // A drawing naming a file on this computer reads none of it.
+ let named = br#""#;
+ assert!(import(named).is_none());
+ }
+
+ #[test]
+ fn mapped_tags_draw_their_art_checked_or_not() {
+ let art = art_sources("test-art", || Some(encoded(8, 8))).unwrap();
+ // Made once: a second ask reads nothing.
+ assert_eq!(art_sources("test-art", || unreachable!()), Some(art));
+ assert_eq!(art_sources("test-broken", || Some(b"x".to_vec())), None);
+ let mut map = TagArt::default();
+ map.map("Launch", 13, "test-art", art);
+ let tag = |label: &str, shape, checked| ParagraphTag {
+ icon: TagIcon::Symbol { shape, checked },
+ origin: [0.0; 2],
+ size: ParagraphTag::SIZE,
+ label: label.into(),
+ disabled: false,
+ };
+ assert_eq!(map.sources(&tag("Launch", 13, false)), art[0]);
+ assert_eq!(map.sources(&tag("Launch", 13, true)), art[1]);
+ assert_eq!(art[1].last(), Some(&CHECKMARK));
+ let symbol = TagIcon::of(13, false).unwrap();
+ assert_eq!(
+ map.sources(&tag("Launch", 15, false)),
+ tag_sources(TagIcon::of(15, false).unwrap())
+ );
+ assert_eq!(map.sources(&tag("Other", 13, false)), tag_sources(symbol));
+ assert_eq!(map.art("Launch", 13), Some("test-art"));
+ map.map("Launch", 13, "test-other", art);
+ assert_eq!(map.art("Launch", 13), Some("test-other"));
+ }
+}
diff --git a/crates/canvas/src/interaction/accessibility.rs b/crates/canvas/src/interaction/accessibility.rs
index d96beb8059a2814c3c18484dacaedbc3e2a2eb7c..3857899ec81a54fcfb5719874f3bdd3ae2eb5a42 100644
--- a/crates/canvas/src/interaction/accessibility.rs
+++ b/crates/canvas/src/interaction/accessibility.rs
@@ -118,7 +118,7 @@ impl Accessibility {
editor: &CanvasEditor,
scene: Option<&(PageScene, [f32; 2])>,
viewport: Viewport,
- title: &str,
+ label: &str,
preview: Option<(ExGuid, [f32; 2])>,
read_only_focus: Option,
) -> Result {
@@ -331,8 +331,8 @@ impl Accessibility {
f64::from(viewport.origin[1]),
]));
page.set_children(children);
- let mut root = Node::new(Role::Window);
- root.set_label(title);
+ let mut root = Node::new(Role::Group);
+ root.set_label(label);
root.set_children(vec![PAGE]);
root.set_bounds(Rect::new(
0.0,
diff --git a/crates/canvas/src/interaction/ink.rs b/crates/canvas/src/interaction/ink.rs
index 3f682462ce7dd9ff031c1faa782a479e85351e2d..706a37c19cd33eca883d34fb31386c1cd1464017 100644
--- a/crates/canvas/src/interaction/ink.rs
+++ b/crates/canvas/src/interaction/ink.rs
@@ -47,10 +47,13 @@ pub(super) struct State {
gesture: Option,
/// Drawings picked by the lasso or a click.
selection: Vec,
+ /// The pen's pressure where the pointer is, from 0 to 1; none for a mouse or finger.
+ pressure: Option,
}
enum Gesture {
- Stroke(Vec<[f32; 2]>),
+ /// The points drawn through, and the pressure at each where the pen reports it.
+ Stroke(Vec<[f32; 2]>, Vec),
Shape([f32; 2]),
/// `mark` counts the ops waiting when the sweep began.
Erase {
@@ -80,6 +83,12 @@ impl PageView {
Response::redraw()
}
+ /// The pen's pressure at the pointer, from 0 to 1, for what the pointer does next: none
+ /// for a mouse or finger, whose strokes keep their pen's width.
+ pub fn set_pressure(&mut self, pressure: Option) {
+ self.ink.pressure = pressure;
+ }
+
/// Drawings the lasso or a click picked.
pub fn ink_selection(&self) -> &[ExGuid] {
&self.ink.selection
@@ -154,7 +163,7 @@ impl PageView {
self.ink.selection = vec![id];
Gesture::Move { press: point }
}
- Tool::Pen(_) => Gesture::Stroke(vec![point]),
+ Tool::Pen(_) => Gesture::Stroke(vec![point], self.ink.pressure.into_iter().collect()),
Tool::Shape(..) => Gesture::Shape(self.grid(point)),
Tool::Eraser => {
let mark = self.editor.pending_ops();
@@ -185,12 +194,18 @@ impl PageView {
/// The pointer moved to page point `point` during a gesture.
pub(super) fn ink_moved(&mut self, point: [f32; 2]) -> Result {
+ let pressure = self.ink.pressure;
match &mut self.ink.gesture {
- Some(Gesture::Stroke(points) | Gesture::Lasso(points)) => {
+ Some(Gesture::Stroke(points, _) | Gesture::Lasso(points)) => {
let last = points[points.len() - 1];
// Samples closer than a HIMETRIC unit store as one point.
if (point[0] - last[0]).hypot(point[1] - last[1]) >= 72.0 / 2540.0 {
points.push(point);
+ if let Some(Gesture::Stroke(_, levels)) = &mut self.ink.gesture
+ && let Some(&last) = levels.last()
+ {
+ levels.push(pressure.unwrap_or(last));
+ }
}
Ok(Response::redraw())
}
@@ -222,14 +237,14 @@ impl PageView {
return Ok(Response::default());
};
match gesture {
- Gesture::Stroke(points) => {
+ Gesture::Stroke(points, pressure) => {
let Tool::Pen(pen) = self.ink.tool else {
return Ok(Response::default());
};
self.editor.draw(Ink {
id: new_id()?,
layout: Default::default(),
- strokes: vec![pen.stroke(&points)?],
+ strokes: vec![pen.stroke(&points, &pressure)?],
groups: Vec::new(),
shape: None,
})?;
@@ -243,7 +258,7 @@ impl PageView {
return Ok(Response::redraw());
}
self.editor
- .draw(Ink::drawn(kind, from, to, &pen.stroke(&[])?)?)?;
+ .draw(Ink::drawn(kind, from, to, &pen.stroke(&[], &[])?)?)?;
}
Gesture::Erase { .. } => return Ok(Response::redraw()),
Gesture::Lasso(mut points) => {
@@ -312,14 +327,14 @@ impl PageView {
crate::gpu::page::append_ink(&ink, [0.0; 2], automatic, primitives)
};
match (&self.ink.gesture, self.ink.tool) {
- (Some(Gesture::Stroke(points)), Tool::Pen(pen)) => {
- if let Ok(stroke) = pen.stroke(points) {
+ (Some(Gesture::Stroke(points, pressure)), Tool::Pen(pen)) => {
+ if let Ok(stroke) = pen.stroke(points, pressure) {
preview(ink(vec![stroke]), primitives);
}
}
(Some(Gesture::Shape(from)), Tool::Shape(kind, pen)) => {
let to = self.grid(point);
- if let Ok(pen) = pen.stroke(&[])
+ if let Ok(pen) = pen.stroke(&[], &[])
&& let Ok(shape) = Ink::drawn(kind, *from, to, &pen)
{
preview(shape, primitives);
diff --git a/crates/canvas/src/interaction/mod.rs b/crates/canvas/src/interaction/mod.rs
index a637d9365a8b61703ee317dc029311500451137a..5ce5301ccc8a135d98d4a080a4fc8b8fbde34b20 100644
--- a/crates/canvas/src/interaction/mod.rs
+++ b/crates/canvas/src/interaction/mod.rs
@@ -84,6 +84,21 @@ pub struct Context {
pub paragraph: Option,
/// The file the press selected, which Open and Save As take.
pub attachment: Option,
+ /// The marked word the press landed on, which the menu offers corrections for.
+ pub spelling: Option,
+}
+
+/// A marked word under a context menu, and what it could become.
+#[derive(Debug, PartialEq)]
+pub struct Correction {
+ pub word: String,
+ /// Replacements, best first; none for a repeated word, which Delete Repeated Word
+ /// removes with the space before it.
+ pub suggestions: Vec,
+ pub repeated: bool,
+ outline: onestore::ExGuid,
+ /// What a correction replaces: the word, or a repeated word and the space before it.
+ range: Selection,
}
/// What an event did: `changed` means the page or selection changed (the host saves,
@@ -136,6 +151,8 @@ pub struct TextColors {
struct Paint<'a> {
caret: f32,
scale: f32,
+ /// The device pixel the document origin lands on, for marks drawn on the pixel grid.
+ device_origin: [f32; 2],
pixel: f32,
colors: TextColors,
/// The document's top and bottom the view shows; paragraphs wholly outside it are
@@ -147,6 +164,8 @@ struct Paint<'a> {
found: &'a [crate::search::PageMatch],
/// The note See Playback highlights.
played: Option<&'a crate::search::PageMatch>,
+ spelling: Option<&'a crate::spelling::Spelling>,
+ tag_art: &'a crate::gpu::TagArt,
}
enum Drag {
@@ -242,7 +261,11 @@ pub struct PageView {
/// Matches of the search shown on the page, marked under their text.
pub found: Vec,
/// The note playing, highlighted as See Playback highlights it.
- pub played: Option,
+ played: Option,
+ /// Marks misspelled and repeated words; none leaves words unmarked.
+ pub spelling: Option,
+ /// The art the page's notebook draws its tags with.
+ pub tag_art: std::sync::Arc,
/// The caret's opacity in its blink.
caret: f32,
/// When the caret last moved, which restarts its blink.
@@ -305,6 +328,8 @@ impl PageView {
host_viewport: false,
found: Vec::new(),
played: None,
+ spelling: None,
+ tag_art: Default::default(),
caret: 1.0,
blink_from: Instant::now(),
ink: Default::default(),
@@ -537,17 +562,15 @@ impl PageView {
let shaped = outline.shaped();
let left = offset[0] + outline.origin()[0] + shaped.tag_column_offset();
let top = offset[1] + outline.origin()[1];
- shaped.paragraphs.iter().find_map(|paragraph| {
- paragraph.tags.iter().find_map(|tag| {
- let x0 = left + tag.origin[0];
- let y0 = top + paragraph.origin[1] + tag.origin[1];
- (matches!(tag.icon, crate::outline::TagIcon::Task { .. })
- && (x0..=x0 + tag.size).contains(&x)
- && (y0..=y0 + tag.size).contains(&y))
- .then(|| {
- let [x1, y1] = [x0 + tag.size, y0 + tag.size];
- [view(x0, 0), view(y0, 1), view(x1, 0), view(y1, 1)]
- })
+ shaped.tags().find_map(|(_, origin, tag)| {
+ let x0 = left + origin[0];
+ let y0 = top + origin[1];
+ (matches!(tag.icon, crate::outline::TagIcon::Task { .. })
+ && (x0..=x0 + tag.size).contains(&x)
+ && (y0..=y0 + tag.size).contains(&y))
+ .then(|| {
+ let [x1, y1] = [x0 + tag.size, y0 + tag.size];
+ [view(x0, 0), view(y0, 1), view(x1, 0), view(y1, 1)]
})
})
})
@@ -643,23 +666,33 @@ impl PageView {
rect.y1 += f64::from(origin[1]);
rect
};
- let outline = self.editor.active_outline().bounds();
+ let outline = self
+ .object_focus
+ .is_none()
+ .then(|| self.editor.active_outline().bounds());
+ self.reveal(rect, outline);
+ Ok(())
+ }
+
+ /// Scrolls document `rect` into view, and with it all of `outline` where that fits.
+ fn reveal(&mut self, rect: parley::BoundingBox, outline: Option) {
for (axis, (mut start, mut end)) in [(rect.x0, rect.x1), (rect.y0, rect.y1)]
.into_iter()
.enumerate()
{
let size = f64::from(self.viewport.size[axis]);
let margin = f64::from(16.0 * self.display_scale).min(size * 0.25);
- let (outline_start, outline_end) =
- [(outline.x0, outline.x1), (outline.y0, outline.y1)][axis];
- let outline_start = outline_start.min(start);
- let outline_end = outline_end.max(end);
- if self.object_focus.is_none()
- && (outline_end - outline_start) * f64::from(self.viewport.scale)
+ if let Some(outline) = outline {
+ let (outline_start, outline_end) =
+ [(outline.x0, outline.x1), (outline.y0, outline.y1)][axis];
+ let outline_start = outline_start.min(start);
+ let outline_end = outline_end.max(end);
+ if (outline_end - outline_start) * f64::from(self.viewport.scale)
<= size - margin * 2.0
- {
- start = outline_start;
- end = outline_end;
+ {
+ start = outline_start;
+ end = outline_end;
+ }
}
let start =
start * f64::from(self.viewport.scale) + f64::from(self.viewport.origin[axis]);
@@ -673,7 +706,45 @@ impl PageView {
};
self.viewport.origin[axis] += shift as f32;
}
- Ok(())
+ }
+
+ /// Highlights `played`, the note playing, as See Playback does, scrolling it into view
+ /// as OneNote does when the note changes.
+ pub fn set_played(&mut self, played: Option) -> Result {
+ if played == self.played {
+ return Ok(Response::default());
+ }
+ self.played = played;
+ let outline = played.and_then(|(id, _)| {
+ self.editor
+ .outlines()
+ .iter()
+ .find(|outline| outline.id == id)
+ });
+ if let (Some(outline), Some((_, selection))) = (outline, played)
+ && !self.host_viewport
+ && !self.viewport.size.contains(&0)
+ {
+ let [x, y] = outline.origin().map(f64::from);
+ let rect = outline
+ .range_rects(selection)?
+ .into_iter()
+ .reduce(|a, b| a.union(b))
+ .map(|rect| parley::BoundingBox {
+ x0: rect.x0 + x,
+ y0: rect.y0 + y,
+ x1: rect.x1 + x,
+ y1: rect.y1 + y,
+ });
+ if let Some(rect) = rect {
+ self.reveal(rect, None);
+ return self.moved();
+ }
+ }
+ Ok(Response {
+ redraw: true,
+ ..Response::default()
+ })
}
/// Moves the caret by lines until it has gone a view's height, then scrolls as far so
@@ -868,6 +939,7 @@ impl PageView {
0.0
},
scale: self.viewport.scale,
+ device_origin: self.viewport.origin,
pixel: self.pixel(),
colors,
visible: [0.0, self.viewport.size[1] as f32]
@@ -875,6 +947,8 @@ impl PageView {
chrome: !self.touch || self.focused,
found: &self.found,
played: self.played.as_ref(),
+ spelling: self.spelling.as_ref(),
+ tag_art: &self.tag_art,
},
)?);
if self.drag.is_none()
@@ -1429,12 +1503,125 @@ impl PageView {
.leaf(anchor.min(focus).paragraph)
.map(|(_, _, node)| node.id),
attachment: None,
+ spelling: self.selected_correction(),
};
Ok(Some((self.changed()?, context)))
}
- /// The text and address the Link dialog opens with for the selection.
- pub fn link_prefill(&self) -> (String, String) {
+ /// The marked word at the caret, or wholly selected, with its corrections.
+ pub fn selected_correction(&self) -> Option {
+ let [anchor, focus] = self.editor.selection().positions;
+ let correction = self.correction(anchor.min(focus))?;
+ (anchor == focus || self.correction(anchor.max(focus)).as_ref() == Some(&correction))
+ .then_some(correction)
+ }
+
+ /// The marked word at `at` in the focused outline, with its corrections.
+ fn correction(&self, at: crate::document::TextPosition) -> Option {
+ let spelling = self.spelling.as_ref()?;
+ let outline = self.editor.active_outline();
+ let paragraph = outline.document().paragraph(at.paragraph)?;
+ let byte = paragraph.byte_offset(at.offset).ok()?;
+ let mark = spelling
+ .marks(paragraph)
+ .into_iter()
+ .find(|mark| mark.range.start <= byte && byte <= mark.range.end)?;
+ correction(spelling, outline, at.paragraph, &mark)
+ }
+
+ /// The Spelling pane's next word: the first marked word after the selection in page
+ /// order, wrapping round to the top, selected. None once the page marks no word.
+ pub fn next_correction(&mut self) -> Result> {
+ let Some(spelling) = &self.spelling else {
+ return Ok(None);
+ };
+ let (id, word, correction) = {
+ let mut outlines: Vec<&TextOutline> = self.editor.outlines().iter().collect();
+ outlines.sort_by(|a, b| {
+ let [ax, ay] = a.origin();
+ let [bx, by] = b.origin();
+ ay.total_cmp(&by).then(ax.total_cmp(&bx))
+ });
+ let active = self.editor.active_outline().id;
+ let active = outlines.iter().position(|outline| outline.id == active);
+ let [anchor, focus] = self.editor.selection().positions;
+ let after = anchor.max(focus);
+ let mut marked = outlines.iter().enumerate().flat_map(|(order, outline)| {
+ outline.layouts().flat_map(move |(index, _)| {
+ let paragraph = outline.document().paragraph(index);
+ paragraph
+ .map(|paragraph| spelling.marks_now(paragraph))
+ .unwrap_or_default()
+ .into_iter()
+ .map(move |mark| (order, *outline, index, mark))
+ })
+ });
+ let mut first = None;
+ // The first word not wholly before the selection; the page's first after them all.
+ let found = marked.find(|(order, outline, index, mark)| {
+ first.get_or_insert_with(|| (*order, *outline, *index, mark.clone()));
+ let Some(active) = active else {
+ return true;
+ };
+ let paragraph = outline.document().paragraph(*index);
+ let offset = |byte| {
+ paragraph.map_or(0, |paragraph| paragraph.utf16_offset(byte).unwrap_or(0))
+ };
+ let caret = (after.paragraph, after.offset);
+ *order > active
+ || *order == active
+ && ((*index, offset(mark.range.end)) > caret
+ || (*index, offset(mark.range.start)) >= caret)
+ });
+ let Some((_, outline, index, mark)) = found.or(first) else {
+ return Ok(None);
+ };
+ let correction = correction(spelling, outline, index, &mark).ok_or("Unmarked word")?;
+ let paragraph = outline
+ .document()
+ .paragraph(index)
+ .ok_or("Missing paragraph")?;
+ let at = |byte| -> Result {
+ Ok(crate::document::TextPosition {
+ paragraph: index,
+ offset: paragraph.utf16_offset(byte)?,
+ })
+ };
+ let word: Selection = [at(mark.range.start)?, at(mark.range.end)?].into();
+ (outline.id, word, correction)
+ };
+ self.editor.focus_outline(id)?;
+ self.editor.select(word)?;
+ Ok(Some((self.edited()?, correction)))
+ }
+
+ /// Replaces the word `correction` names with `text`, or with nothing, as one edit; not
+ /// once an edit since has changed the word.
+ pub fn correct(&mut self, correction: &Correction, text: &str) -> Result {
+ let [start, end] = correction.range.positions;
+ let unchanged = self
+ .editor
+ .outlines()
+ .iter()
+ .find(|outline| outline.id == correction.outline)
+ .and_then(|outline| outline.document().paragraph(start.paragraph))
+ .and_then(|paragraph| {
+ let range = paragraph.byte_offset(start.offset).ok()?
+ ..paragraph.byte_offset(end.offset).ok()?;
+ Some(paragraph.text().get(range)?.trim_start() == correction.word)
+ });
+ if unchanged != Some(true) {
+ return Ok(Response::default());
+ }
+ self.editor.focus_outline(correction.outline)?;
+ self.editor.select(correction.range)?;
+ self.editor.correct(&mut self.engine, text)?;
+ self.edited()
+ }
+
+ /// The text and address the Link dialog opens with for the selection; none where it does
+ /// not open.
+ pub fn link_prefill(&self) -> Option<(String, String)> {
self.editor.link_prefill()
}
@@ -1489,8 +1676,10 @@ impl PageView {
},
size: Some(size),
bytes: Some(bytes.into()),
+ display: None,
alt: None,
background: false,
+ printout: None,
};
self.editor.insert_picture(&mut self.engine, image)?;
self.edited()
@@ -1995,19 +2184,17 @@ fn page_hit(
}
let shaped = outline.shaped();
let [left, top] = outline.origin();
- let check = shaped.paragraphs.iter().find(|paragraph| {
- paragraph.tags.iter().any(|tag| {
- let tag_x = left + shaped.tag_column_offset() + tag.origin[0];
- let tag_y = top + paragraph.origin[1] + tag.origin[1];
- tag.icon.checkable()
- && (tag_x..=tag_x + tag.size).contains(&x)
- && (tag_y..=tag_y + tag.size).contains(&y)
- })
+ let check = shaped.tags().find(|(_, origin, tag)| {
+ let tag_x = left + shaped.tag_column_offset() + origin[0];
+ let tag_y = top + origin[1];
+ tag.icon.checkable()
+ && (tag_x..=tag_x + tag.size).contains(&x)
+ && (tag_y..=tag_y + tag.size).contains(&y)
});
- if let Some(paragraph) = check {
+ if let Some((paragraph, ..)) = check {
return Some(Hit::Check {
outline: outline.id,
- paragraph: paragraph.id,
+ paragraph,
});
}
let text = outline.bounds();
@@ -2435,14 +2622,13 @@ fn reach(outline: &TextOutline) -> [f32; 2] {
.iter()
.flat_map(|paragraph| {
let markers = paragraph.markers.iter().map(|(_, [x, _])| *x);
- let tags = paragraph
- .tags
- .iter()
- .map(move |tag| tag.origin[0] + column + 0.75);
- std::iter::once(paragraph.origin[0] - 7.5)
- .chain(markers)
- .chain(tags)
+ std::iter::once(paragraph.origin[0] - 7.5).chain(markers)
})
+ .chain(
+ shaped
+ .tags()
+ .map(|(_, origin, _)| origin[0] + column + 0.75),
+ )
.fold(-7.5, f32::min);
let [x, y] = outline.origin();
[x + left, y - 6.0]
@@ -2492,11 +2678,8 @@ fn outline_chrome(outline: &TextOutline, pixel: f32) -> ([f32; 4], f32) {
let left = shaped
.paragraphs
.iter()
- .flat_map(|paragraph| {
- let tags = paragraph.tags.iter().map(|tag| tag.origin[0] + column);
- let markers = paragraph.markers.iter().map(|(_, [x, _])| x + 7.5);
- tags.chain(markers)
- })
+ .flat_map(|paragraph| paragraph.markers.iter().map(|(_, [x, _])| x + 7.5))
+ .chain(shaped.tags().map(|(_, origin, _)| origin[0] + column))
.fold(0.0, f32::min);
(
[
@@ -2608,17 +2791,22 @@ fn append_outline<'a>(
let Paint {
caret,
scale,
+ device_origin,
pixel,
colors,
visible,
found,
played,
+ spelling,
..
} = paint;
let rows = [visible[0] - y, visible[1] - y];
outline
.shaped()
.append_table_primitives(primitives, origin, colors.paper);
+ outline
+ .shaped()
+ .append_block_tag_primitives(primitives, origin, paint.tag_art);
outline
.shaped()
.append_background_primitives(primitives, origin, rows, colors.paper);
@@ -2668,9 +2856,26 @@ fn append_outline<'a>(
paragraph,
origin,
colors.paper.ink,
+ paint.tag_art,
primitives,
);
}
+ if let Some(spelling) = spelling {
+ let typing = editor
+ .and_then(CanvasEditor::typing)
+ .filter(|(id, _)| *id == outline.id)
+ .map(|(_, at)| at);
+ append_marks(
+ spelling,
+ outline,
+ typing,
+ origin,
+ rows,
+ [scale, device_origin[0], device_origin[1]],
+ pixel,
+ primitives,
+ )?;
+ }
if let Some(editor) = editor {
for rect in editor.marked_rects()? {
primitives.push(Primitive::Rect {
@@ -2704,3 +2909,101 @@ fn append_outline<'a>(
}
Ok(())
}
+
+/// OneNote's red zigzag under each marked word of the paragraphs between outline-local
+/// `rows`: a pixel thick, two high and four long, 1.5 to 3.5 pixels below the baseline, laid
+/// on the device grid `[scale, x, y]` so it stays hard-edged. The word ending at the caret of
+/// a run of typing, `typing`, is still being written and goes unmarked.
+#[allow(clippy::too_many_arguments)]
+fn append_marks(
+ spelling: &crate::spelling::Spelling,
+ outline: &TextOutline,
+ typing: Option,
+ origin: [f32; 2],
+ rows: [f32; 2],
+ [scale, device_x, device_y]: [f32; 3],
+ pixel: f32,
+ primitives: &mut Vec>,
+) -> Result<()> {
+ let color = draw::srgb(0xff, 0x00, 0x00);
+ let dot = (pixel * scale).round().max(1.0);
+ let shown = outline.layouts().filter(|(_, paragraph)| {
+ paragraph.origin[1] + paragraph.text.height() >= rows[0] && paragraph.origin[1] <= rows[1]
+ });
+ for (index, _) in shown {
+ let Some(paragraph) = outline.document().paragraph(index) else {
+ continue;
+ };
+ for mark in spelling.marks(paragraph) {
+ let start = paragraph.utf16_offset(mark.range.start)?;
+ let end = paragraph.utf16_offset(mark.range.end)?;
+ if typing.is_some_and(|at| at.paragraph == index && at.offset == end) {
+ continue;
+ }
+ for [left, right, baseline] in outline.underlines(index, start..end)? {
+ let right = ((origin[0] + right) * scale + device_x).round();
+ let mut x = ((origin[0] + left) * scale + device_x).round();
+ let top = ((origin[1] + baseline) * scale + device_y).round() + dot;
+ for step in [1.0, 2.0, 1.0, 0.0].into_iter().cycle() {
+ if x >= right {
+ break;
+ }
+ let y = top + step * dot;
+ primitives.push(Primitive::Rect {
+ rect: [
+ (x - device_x) / scale,
+ (y - device_y) / scale,
+ (x + dot - device_x) / scale,
+ (y + dot - device_y) / scale,
+ ],
+ color,
+ });
+ x += dot;
+ }
+ }
+ }
+ }
+ Ok(())
+}
+
+/// Marked word `mark` of paragraph `index` of `outline`, with its corrections.
+fn correction(
+ spelling: &crate::spelling::Spelling,
+ outline: &TextOutline,
+ index: usize,
+ mark: &crate::spelling::Mark,
+) -> Option {
+ let paragraph = outline.document().paragraph(index)?;
+ let text = paragraph.text();
+ let word = text[mark.range.clone()].to_owned();
+ let start = if mark.repeated {
+ text[..mark.range.start].trim_end().len()
+ } else {
+ mark.range.start
+ };
+ let position = |byte| {
+ Some(crate::document::TextPosition {
+ paragraph: index,
+ offset: paragraph.utf16_offset(byte).ok()?,
+ })
+ };
+ let suggestions = if mark.repeated {
+ Vec::new()
+ } else {
+ let language = paragraph
+ .spans()
+ .iter()
+ .find(|span| span.end > mark.range.start)
+ .and_then(|span| span.format.language);
+ let mut suggestions = spelling.suggest(&word, language);
+ suggestions.truncate(5);
+ suggestions
+ };
+ Some(Correction {
+ suggestions,
+ repeated: mark.repeated,
+ outline: outline.id,
+ range: [position(start)?, position(mark.range.end)?].into(),
+ word,
+ })
+}
diff --git a/crates/canvas/src/interaction/tests.rs b/crates/canvas/src/interaction/tests.rs
index b1a9b106f428d94dfa830940ace1c37c44ed74b3..e33c5f3c08083621e588a55dca172bb8a116ab15 100644
--- a/crates/canvas/src/interaction/tests.rs
+++ b/crates/canvas/src/interaction/tests.rs
@@ -14,17 +14,22 @@ const COLORS: TextColors = TextColors {
paper: crate::gpu::Paper::WHITE,
};
+static NO_ART: std::sync::LazyLock = std::sync::LazyLock::new(Default::default);
+
/// Paint for a view at `scale` device pixels per point on a display of `display_scale`.
pub(super) fn paint(show_caret: bool, scale: f32, display_scale: f32) -> Paint<'static> {
Paint {
caret: f32::from(u8::from(show_caret)),
scale,
+ device_origin: [0.0; 2],
pixel: display_scale / scale,
colors: COLORS,
visible: [f32::NEG_INFINITY, f32::INFINITY],
chrome: true,
found: &[],
played: None,
+ spelling: None,
+ tag_art: &NO_ART,
}
}
@@ -699,8 +704,10 @@ fn a_picture_in_an_outline_takes_the_click_over_its_text() {
id,
layout: Default::default(),
bytes: None,
+ display: None,
alt: None,
background: false,
+ printout: None,
});
source.paragraphs.insert(1, picture);
let editor = CanvasEditor::from_page(
@@ -885,12 +892,15 @@ fn table_glyphs_highlights_and_selection_share_cell_paint_bounds() {
Paint {
caret: 0.0,
scale: 1.0,
+ device_origin: [0.0; 2],
pixel: 1.0,
colors: COLORS,
visible: [f32::NEG_INFINITY, f32::INFINITY],
chrome: true,
found: &[],
played: None,
+ spelling: None,
+ tag_art: &NO_ART,
},
&mut primitives,
)
@@ -960,12 +970,15 @@ fn editable_tables_paint_borders_before_selection_and_cell_text() {
Paint {
caret: 0.0,
scale: 1.0,
+ device_origin: [0.0; 2],
pixel: 1.0,
colors: COLORS,
visible: [f32::NEG_INFINITY, f32::INFINITY],
chrome: true,
found: &[],
played: None,
+ spelling: None,
+ tag_art: &NO_ART,
},
&mut primitives,
)
@@ -1528,8 +1541,10 @@ fn picture_view() -> (PageView, onestore::ExGuid) {
id,
layout: Default::default(),
bytes: None,
+ display: None,
alt: None,
background: false,
+ printout: None,
});
source.paragraphs.insert(1, picture);
let editor = CanvasEditor::from_page(
@@ -2885,3 +2900,238 @@ fn a_file_dropped_on_blank_page_lies_on_the_page_and_drags() {
assert_eq!(placed(&view).unwrap().layout.x, Some(504.0));
view.primitives(COLORS).unwrap();
}
+
+/// Words the fake dictionary misses are marked red under their text once checked, except
+/// the word still being typed; the context menu offers the dictionary's corrections, and
+/// taking one is one edit and one undo step.
+#[test]
+fn misspelled_words_are_marked_and_corrected_in_one_edit() {
+ struct Wake(std::sync::mpsc::Sender<()>);
+ impl std::task::Wake for Wake {
+ fn wake(self: Arc) {
+ let _ = self.0.send(());
+ }
+ }
+ let mut engine = TextEngine::default();
+ let document = TextDocument::new(vec![Paragraph::new(
+ "Ths sentence has the typos".into(),
+ Default::default(),
+ )])
+ .unwrap();
+ let outline = TextOutline::new(&mut engine, document, 400.0, [36.0, 36.0]).unwrap();
+ let editor = CanvasEditor::from_page(
+ Page {
+ title: String::new(),
+ identity: None,
+ created: None,
+ margin_origin: [36.0, 14.4],
+ color: None,
+ rule_lines: None,
+ definitions: Default::default(),
+ objects: vec![onestore::page::PageObject::Outline(outline.snapshot())],
+ },
+ &mut engine,
+ )
+ .unwrap();
+ let mut view = PageView::new(editor, engine, None, [800, 600], 1.0, Duration::ZERO);
+ view.viewport.scale = 1.0;
+ view.viewport.origin = [0.0; 2];
+ let (woken, wakes) = std::sync::mpsc::channel();
+ view.spelling = Some(crate::spelling::Spelling::new(
+ Box::new(crate::spelling::tests::Fake),
+ Arc::new(Wake(woken)).into(),
+ ));
+ let red = draw::srgb(0xff, 0x00, 0x00);
+ let marks = |view: &PageView| -> Vec<[f32; 2]> {
+ view.primitives(COLORS)
+ .unwrap()
+ .into_iter()
+ .filter_map(|primitive| match primitive {
+ Primitive::Rect { rect, color } if color == red => Some([rect[0], rect[1]]),
+ _ => None,
+ })
+ .collect()
+ };
+ assert!(marks(&view).is_empty());
+ wakes
+ .recv_timeout(Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ let outline = view.editor.active_outline();
+ let [origin_x, origin_y] = outline.origin();
+ let [left, right, baseline] = outline.underlines(0, 0..3).unwrap()[0];
+ let under = marks(&view);
+ // OneNote's pixels along "Ths": a column each, stepping mid, low, mid, high on the
+ // three pixel rows from one to three below the baseline.
+ let [start, end, line] =
+ [origin_x + left, origin_x + right, origin_y + baseline].map(f32::round);
+ assert_eq!(under.len(), (end - start) as usize);
+ for (column, [x, y]) in under.into_iter().enumerate() {
+ assert_eq!(x, start + column as f32);
+ assert_eq!(y, line + [2.0, 3.0, 2.0, 1.0][column % 4]);
+ }
+
+ let _ = view
+ .pointer_moved([origin_x + (left + right) / 2.0, origin_y + baseline - 3.0])
+ .unwrap();
+ let (_, context) = view.context().unwrap().unwrap();
+ let correction = context.spelling.unwrap();
+ assert_eq!(correction.word, "Ths");
+ assert_eq!(correction.suggestions, ["This", "Thus"]);
+ view.editor.take_ops().unwrap();
+ assert!(view.correct(&correction, "This").unwrap().changed);
+ assert_eq!(
+ view.editor.active_outline().shown_text(),
+ "This sentence has the typos"
+ );
+ assert!(!view.editor.take_ops().unwrap().is_empty());
+ marks(&view);
+ wakes
+ .recv_timeout(Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ assert!(marks(&view).is_empty());
+ let _ = view.undo(false).unwrap();
+ assert_eq!(
+ view.editor.active_outline().shown_text(),
+ "Ths sentence has the typos"
+ );
+
+ view.editor
+ .move_selection(&mut view.engine, Movement::DocumentEnd, false)
+ .unwrap();
+ let _ = view.key(&Key::Character(" ".into()), Some(" ")).unwrap();
+ for letter in ["q", "w", "r", "t"] {
+ let _ = view
+ .key(&Key::Character(letter.into()), Some(letter))
+ .unwrap();
+ }
+ marks(&view);
+ wakes
+ .recv_timeout(Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ let typing = marks(&view).len();
+ let _ = view.key(&Key::Character(" ".into()), Some(" ")).unwrap();
+ marks(&view);
+ wakes
+ .recv_timeout(Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ assert!(marks(&view).len() > typing);
+}
+
+/// See Playback scrolls the note playing into view, as OneNote 2010 does
+/// (`corpus/recording/native/read/onenote-see-playback-scrolls.png`); the caret stays.
+#[test]
+fn the_note_playing_scrolls_into_view() {
+ let mut engine = TextEngine::default();
+ let lines = (0..100)
+ .map(|line| Paragraph::new(format!("Line {line}"), Default::default()))
+ .collect();
+ let outline = TextOutline::new(
+ &mut engine,
+ TextDocument::new(lines).unwrap(),
+ 240.0,
+ [36.0, 36.0],
+ )
+ .unwrap();
+ let editor = CanvasEditor::from_page(
+ Page {
+ title: String::new(),
+ identity: None,
+ created: None,
+ margin_origin: [36.0, 14.4],
+ color: None,
+ rule_lines: None,
+ definitions: Default::default(),
+ objects: vec![onestore::page::PageObject::Outline(outline.snapshot())],
+ },
+ &mut engine,
+ )
+ .unwrap();
+ let mut view = PageView::new(
+ editor,
+ engine,
+ None,
+ [800, 200],
+ 1.0,
+ Duration::from_millis(500),
+ );
+ view.viewport.scale = 1.0;
+ view.viewport.origin = [0.0; 2];
+ let caret = view.editor.selection();
+ let outline = view.editor.outlines()[0].id;
+ let at = |offset| TextPosition {
+ paragraph: 60,
+ offset,
+ };
+ let note: Selection = [at(0), at(7)].into();
+ let played = Some((outline, note));
+ assert!(view.set_played(played).unwrap().moved);
+ let rects = view.editor.outlines()[0].range_rects(note).unwrap();
+ let top = view.editor.outlines()[0].origin()[1] + rects[0].y0 as f32;
+ let bottom = view.editor.outlines()[0].origin()[1] + rects[0].y1 as f32;
+ let shown = [top, bottom].map(|y| y + view.viewport.origin[1]);
+ assert!(shown[0] >= 0.0 && shown[1] <= 200.0, "{shown:?}");
+ assert_eq!(view.editor.selection(), caret);
+ // Playing on within the same note leaves the view where the reader put it.
+ view.viewport.origin[1] = 0.0;
+ assert!(!view.set_played(played).unwrap().moved);
+ assert_eq!(view.viewport.origin[1], 0.0);
+}
+
+/// The Spelling pane walks marked words from the caret in page order, wraps to the page's
+/// top, and ends once none is left.
+#[test]
+fn the_spelling_pane_walks_marked_words_from_the_caret() {
+ let mut engine = TextEngine::default();
+ let document = TextDocument::new(
+ ["the wrng word", "this is qwrt here"]
+ .map(|text| Paragraph::new(text.into(), Default::default()))
+ .into(),
+ )
+ .unwrap();
+ let outline = TextOutline::new(&mut engine, document, 400.0, [36.0, 36.0]).unwrap();
+ let editor = CanvasEditor::from_page(
+ Page {
+ title: String::new(),
+ identity: None,
+ created: None,
+ margin_origin: [36.0, 14.4],
+ color: None,
+ rule_lines: None,
+ definitions: Default::default(),
+ objects: vec![onestore::page::PageObject::Outline(outline.snapshot())],
+ },
+ &mut engine,
+ )
+ .unwrap();
+ let mut view = PageView::new(editor, engine, None, [800, 600], 1.0, Duration::ZERO);
+ let spelling = crate::spelling::Spelling::new(
+ Box::new(crate::spelling::tests::Fake),
+ std::task::Waker::noop().clone(),
+ );
+ view.spelling = Some(spelling.clone());
+ let caret = |paragraph, offset| [TextPosition { paragraph, offset }; 2].into();
+ view.editor.select(caret(1, 17)).unwrap();
+ let next = |view: &mut PageView| {
+ view.next_correction()
+ .unwrap()
+ .map(|(_, correction)| correction.word)
+ };
+ assert_eq!(next(&mut view).as_deref(), Some("wrng"));
+ assert_eq!(
+ view.editor.selection().positions,
+ [
+ TextPosition {
+ paragraph: 0,
+ offset: 4
+ },
+ TextPosition {
+ paragraph: 0,
+ offset: 8
+ }
+ ]
+ );
+ spelling.ignore("wrng");
+ assert_eq!(next(&mut view).as_deref(), Some("qwrt"));
+ spelling.learn("qwrt");
+ assert_eq!(next(&mut view), None);
+}
diff --git a/crates/canvas/src/language.rs b/crates/canvas/src/language.rs
index 382b2e38aa0bac0e040a5998f3f8b5c6f351d6ad..ec1bceb3e4063f562ae667d1780c1915d6517e23 100644
--- a/crates/canvas/src/language.rs
+++ b/crates/canvas/src/language.rs
@@ -104,7 +104,7 @@ const LCIDS: &[(&str, u32)] = &[
];
/// en-US, what OneNote records when nothing better is known.
-const EN_US: u32 = 1033;
+pub(crate) const EN_US: u32 = 1033;
/// The Windows LCID of a BCP-47 tag such as an input source's language (`de`, `en-GB`,
/// `zh-Hans`), matched by region, then script, then language, else en-US.
@@ -133,6 +133,15 @@ pub fn lcid(tag: &str) -> u32 {
.unwrap_or(EN_US)
}
+/// The BCP-47 tag of a Windows LCID; a bare language stands for the locale Windows picks
+/// for it. None for LCIDs outside the table, such as math's.
+pub fn tag(lcid: u32) -> Option<&'static str> {
+ LCIDS
+ .iter()
+ .find(|(_, known)| *known == lcid)
+ .map(|(tag, _)| *tag)
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -158,5 +167,8 @@ mod tests {
] {
assert_eq!(super::lcid(tag), lcid, "{tag}");
}
+ for (lcid, tag) in [(1033, Some("en")), (2057, Some("en-GB")), (0x1007f, None)] {
+ assert_eq!(super::tag(lcid), tag);
+ }
}
}
diff --git a/crates/canvas/src/layout.rs b/crates/canvas/src/layout.rs
index 3f4170e52f601a5afda9d6069b80dbbead1c031e..3f6f40114280f49b46e608687695dee5652ae0c6 100644
--- a/crates/canvas/src/layout.rs
+++ b/crates/canvas/src/layout.rs
@@ -638,6 +638,16 @@ impl TextLayout {
rect
}
+ /// Each line's part of `selection` as a mark under the text runs: its left, its right
+ /// and the line's baseline.
+ pub fn underlines(&self, selection: Selection) -> Vec<[f32; 3]> {
+ selection
+ .geometry(&self.shaped)
+ .into_iter()
+ .map(|(rect, index)| [rect.x0 as f32, rect.x1 as f32, self.lines[index].baseline])
+ .collect()
+ }
+
pub fn selection(&self, selection: Selection) -> Vec {
selection
.geometry(&self.shaped)
diff --git a/crates/canvas/src/lib.rs b/crates/canvas/src/lib.rs
index 64424605cccdf8c590921a217b41dcf3d6a01471..8027f0e2606e64a4e0d3dfaf146810a907fc04c9 100644
--- a/crates/canvas/src/lib.rs
+++ b/crates/canvas/src/lib.rs
@@ -6,6 +6,7 @@ pub mod layout;
pub mod math;
pub mod outline;
pub mod search;
+pub mod spelling;
pub mod template;
pub mod date;
diff --git a/crates/canvas/src/outline.rs b/crates/canvas/src/outline.rs
index 28f1a1beaf9b9ba7cbfed02c812a83aee9195b1f..e1409e1d1b7d3e0cd3aab514a1d68ead33cd6086 100644
--- a/crates/canvas/src/outline.rs
+++ b/crates/canvas/src/outline.rs
@@ -66,6 +66,67 @@ pub struct ObjectLayout {
pub kind: ObjectKind,
/// Outline-local bottom of the whole object, label included.
pub bottom: f32,
+ pub tags: Option,
+}
+
+/// The note tags of a table, picture or file, which OneNote centres on it in the tag column.
+#[derive(Clone)]
+pub struct BlockTags {
+ /// The paragraph holding the block.
+ pub paragraph: ExGuid,
+ /// Its siblings' group, whose list markers the tags clear.
+ parent: Option,
+ /// The block's left edge, outline-local.
+ x: f32,
+ /// Origins are outline-local.
+ pub tags: Vec,
+}
+
+impl BlockTags {
+ /// `node`'s tags and those of its content, `content`, shaped as a tagged paragraph of
+ /// `node`'s format would show them; `None` without any.
+ fn new(
+ node: &PageParagraph,
+ content: &[onestore::document::Tag],
+ x: f32,
+ shape: &mut impl FnMut(
+ &PageParagraph,
+ Option<&Count>,
+ f32,
+ &[f32],
+ ) -> Result,
+ ) -> Result, LayoutError> {
+ if node.tags.is_empty() && content.is_empty() {
+ return Ok(None);
+ }
+ let mut tagged = caption(node.id, node.id, "", node.format.clone());
+ tagged.tags.clone_from(&node.tags);
+ if let ParagraphContent::Text(text) = &mut tagged.content {
+ text.tags = content.to_vec();
+ }
+ let tags = shape(&tagged, None, ATTACHMENT_WIDTH, &[0.0, 0.0])?.tags;
+ Ok(Some(Self {
+ paragraph: node.id,
+ parent: node.parent,
+ x,
+ tags,
+ }))
+ }
+
+ /// Centres the tags on a block spanning `top..bottom`.
+ fn centre(&mut self, top: f32, bottom: f32) {
+ for tag in &mut self.tags {
+ tag.origin[1] = (top + bottom - tag.size) / 2.0;
+ }
+ }
+
+ fn offset(&mut self, [x, y]: [f32; 2]) {
+ self.x += x;
+ for tag in &mut self.tags {
+ tag.origin[0] += x;
+ tag.origin[1] += y;
+ }
+ }
}
#[derive(Clone)]
@@ -121,6 +182,10 @@ impl ObjectLayout {
if let ObjectKind::File(label) | ObjectKind::Unsupported(label) = &mut self.kind {
label.origin[1] = label_top;
}
+ let [_, top, _, bottom] = self.bounds();
+ if let Some(tags) = &mut self.tags {
+ tags.centre(top, bottom);
+ }
flow
}
}
@@ -131,19 +196,27 @@ fn verticals<'a>(
tables: &'a mut [TableLayout],
objects: &'a mut [ObjectLayout],
) -> impl Iterator
- {
- let cells = tables.iter_mut().flat_map(|table| &mut table.cells);
+ let tags = |tags: &'a mut Option| {
+ tags.iter_mut()
+ .flat_map(|tags| &mut tags.tags)
+ .map(|tag| &mut tag.origin[1])
+ };
paragraphs
.iter_mut()
.map(|paragraph| &mut paragraph.origin[1])
- .chain(cells.flat_map(|cell| {
- let [_, top, _, bottom] = &mut cell.rect;
- [top, bottom]
+ .chain(tables.iter_mut().flat_map(move |table| {
+ let cells = table.cells.iter_mut().flat_map(|cell| {
+ let [_, top, _, bottom] = &mut cell.rect;
+ [top, bottom]
+ });
+ cells.chain(tags(&mut table.tags))
}))
- .chain(objects.iter_mut().flat_map(|object| {
+ .chain(objects.iter_mut().flat_map(move |object| {
let ObjectLayout {
rect: [_, top, _, end],
bottom,
kind,
+ tags: block,
..
} = object;
let label = match kind {
@@ -152,7 +225,10 @@ fn verticals<'a>(
}
ObjectKind::Picture | ObjectKind::Ink(_) => None,
};
- [top, end, bottom].into_iter().chain(label)
+ [top, end, bottom]
+ .into_iter()
+ .chain(label)
+ .chain(tags(block))
}))
}
@@ -167,6 +243,7 @@ pub struct TableLayout {
/// Cells are in paragraph order with disjoint visible ranges.
pub cells: Vec,
pub borders: bool,
+ pub tags: Option,
}
#[derive(Clone)]
@@ -515,6 +592,7 @@ fn file_column(
rect: [left, 0.0, left + w, 0.0],
kind: ObjectKind::File(label),
bottom: 0.0,
+ tags: None,
};
Ok((object, h))
}
@@ -1104,13 +1182,16 @@ impl ParagraphLayout {
self.markers.iter().map(|(_, [x, _])| *x).reduce(f32::min)
}
- /// Places the tags for siblings whose leftmost marker starts at `marker`; later tags
- /// follow the first to its right, toward the text.
fn place_tags(&mut self, marker: Option) {
- for (index, tag) in self.tags.iter_mut().enumerate() {
- tag.origin[0] =
- ParagraphTag::column(self.origin[0], marker, tag.size) + tag.size * index as f32;
- }
+ place_tags(&mut self.tags, self.origin[0], marker);
+ }
+}
+
+/// Places the tags of content at `x` among siblings whose leftmost marker starts at
+/// `marker`; later tags follow the first to its right, toward the content.
+fn place_tags(tags: &mut [ParagraphTag], x: f32, marker: Option) {
+ for (index, tag) in tags.iter_mut().enumerate() {
+ tag.origin[0] = ParagraphTag::column(x, marker, tag.size) + tag.size * index as f32;
}
}
@@ -1136,10 +1217,39 @@ impl OutlineLayout {
-self
.paragraphs
.iter()
- .map(|p| p.tags.iter().skip(1).map(|tag| tag.size).sum::())
+ .map(|p| p.tags.as_slice())
+ .chain(self.block_tags().map(|block| block.tags.as_slice()))
+ .map(|tags| tags.iter().skip(1).map(|tag| tag.size).sum::())
.fold(0.0, f32::max)
}
+ fn block_tags(&self) -> impl Iterator
- {
+ let tables = self.tables.iter().filter_map(|table| table.tags.as_ref());
+ tables.chain(
+ self.objects
+ .iter()
+ .filter_map(|object| object.tags.as_ref()),
+ )
+ }
+
+ /// Every note tag the outline draws, with the paragraph it marks and its outline-local
+ /// origin before `tag_column_offset`.
+ pub fn tags(&self) -> impl Iterator
- {
+ let text = self.paragraphs.iter().flat_map(|paragraph| {
+ paragraph.tags.iter().map(move |tag| {
+ let y = paragraph.origin[1] + tag.origin[1];
+ (paragraph.id, [tag.origin[0], y], tag)
+ })
+ });
+ let blocks = self.block_tags().flat_map(|block| {
+ block
+ .tags
+ .iter()
+ .map(|tag| (block.paragraph, tag.origin, tag))
+ });
+ text.chain(blocks)
+ }
+
/// Innermost table cell containing a visible paragraph index.
pub fn paragraph_cell(&self, index: usize) -> Option<&CellLayout> {
self.tables.iter().rev().find_map(|table| {
@@ -1172,15 +1282,22 @@ impl OutlineLayout {
*value += offset;
}
}
+ if let Some(tags) = &mut table.tags {
+ tags.offset(origin);
+ }
}
for object in &mut child.objects {
for (value, offset) in object.rect.iter_mut().zip(origin.into_iter().cycle()) {
*value += offset;
}
object.bottom += origin[1];
+ if let Some(tags) = &mut object.tags {
+ tags.offset(origin);
+ }
if let ObjectKind::File(label) | ObjectKind::Unsupported(label) = &mut object.kind {
+ let y = label.origin[1];
label.reset_origin(label.origin[0] + origin[0]);
- label.origin[1] += origin[1];
+ label.origin[1] = y + origin[1];
}
}
self.paragraphs.extend(child.paragraphs);
@@ -1231,6 +1348,21 @@ impl OutlineLayout {
let marker = markers.get(¶graph.parent).copied();
paragraph.place_tags(marker);
}
+ let tables = self
+ .tables
+ .iter_mut()
+ .filter_map(|table| table.tags.as_mut());
+ let objects = self
+ .objects
+ .iter_mut()
+ .filter_map(|object| object.tags.as_mut());
+ for block in tables.chain(objects) {
+ place_tags(
+ &mut block.tags,
+ block.x,
+ markers.get(&block.parent).copied(),
+ );
+ }
}
/// Lays out `nodes` after the flow `state` and `siblings` stack, hiding the children of
@@ -1299,6 +1431,11 @@ impl OutlineLayout {
let space = spacing(&node.format)?;
let y = top(&mut state, space);
let mut child = Self::table(table, depth + 1, edit, shape)?;
+ child.tables[0].tags =
+ BlockTags::new(node, &table.tags, 0.0, shape)?.map(|mut tags| {
+ tags.centre(0.0, child.size[1]);
+ tags
+ });
if depth == 0 {
block.rel = verticals(
&mut child.paragraphs,
@@ -1325,6 +1462,7 @@ impl OutlineLayout {
rect: [x, 0.0, x + w, 0.0],
kind: ObjectKind::Picture,
bottom: 0.0,
+ tags: None,
};
(object, h, x + w)
}
@@ -1345,6 +1483,7 @@ impl OutlineLayout {
rect: [x, 0.0, x + w, 0.0],
kind: ObjectKind::Ink(ink.clone()),
bottom: 0.0,
+ tags: None,
};
(object, h, x + w)
}
@@ -1372,6 +1511,7 @@ impl OutlineLayout {
rect: [x, 0.0, x + w, 0.0],
kind: ObjectKind::Unsupported(label),
bottom: 0.0,
+ tags: None,
};
(object, h, x + w)
}
@@ -1379,6 +1519,7 @@ impl OutlineLayout {
unreachable!("text and tables are not objects")
}
};
+ object.tags = BlockTags::new(node, &[], x, shape)?;
let flow = object.place(y, height);
result.objects.push(object);
(space, height, flow, extent)
@@ -1755,14 +1896,12 @@ impl OutlineLayout {
{
return Err(LayoutError::InvalidWidth);
}
- if !table.tags.is_empty() {
- return Err(LayoutError::UnsupportedContent);
- }
let mut result = Self {
tables: vec![TableLayout {
id: table.id,
cells: Vec::new(),
borders: table.borders.unwrap_or(true),
+ tags: None,
}],
size: [
(0..table.columns.len())
@@ -1799,6 +1938,17 @@ impl OutlineLayout {
for paragraph in &mut child.paragraphs {
paragraph.parent.get_or_insert(cell.id);
}
+ let tables = child
+ .tables
+ .iter_mut()
+ .filter_map(|table| table.tags.as_mut());
+ let objects = child
+ .objects
+ .iter_mut()
+ .filter_map(|object| object.tags.as_mut());
+ for block in tables.chain(objects) {
+ block.parent.get_or_insert(cell.id);
+ }
let paragraph_start = result.paragraphs.len();
result.append(child, [x, y + 3.54]);
result.tables[0].cells.push(CellLayout {
@@ -2614,6 +2764,7 @@ mod tests {
transparency: None,
pen_tip: None,
raster_operation: None,
+ pressure: Vec::new(),
}],
groups: Vec::new(),
shape: None,
diff --git a/crates/canvas/src/search.rs b/crates/canvas/src/search.rs
index db1a939df1695f98265f9bda7b9843ab24c41dad..90ae50799046f6e7701a126967271dce0442918a 100644
--- a/crates/canvas/src/search.rs
+++ b/crates/canvas/src/search.rs
@@ -77,7 +77,7 @@ impl Query {
}
/// Ideographs and kana are words of their own, as their text has no spaces between words.
-fn ideographic(character: char) -> bool {
+pub(crate) fn ideographic(character: char) -> bool {
matches!(u32::from(character),
0x3040..=0x30ff | 0x3400..=0x4dbf | 0x4e00..=0x9fff | 0xf900..=0xfaff | 0x20000..=0x3ffff)
}
diff --git a/crates/canvas/src/spelling.rs b/crates/canvas/src/spelling.rs
new file mode 100644
index 0000000000000000000000000000000000000000..24d499dd84820ea6d6e4c07baf4ea08413d10f9c
--- /dev/null
+++ b/crates/canvas/src/spelling.rs
@@ -0,0 +1,578 @@
+//! Spelling as OneNote 2010 checks it as you type. Its Proofing defaults decide what is a
+//! word: words in UPPERCASE, words holding numbers, and Internet and file addresses are
+//! left alone, and a word repeating the one before it is marked as repeated. A platform
+//! dictionary checks each paragraph's words on a thread of its own, and results are kept
+//! per paragraph text. Nothing about spelling is stored in the page.
+
+use onestore::page::text::Paragraph;
+use std::collections::{HashMap, HashSet};
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::ops::Range;
+use std::sync::{Arc, Mutex, mpsc};
+
+/// Checked paragraphs kept before the cache starts over.
+const KEPT: usize = 8192;
+/// Paragraphs waiting to be checked that one call to the dictionary takes.
+const BATCH: usize = 64;
+
+/// A platform spell checker, called from the spelling thread and the host's. Languages are
+/// Windows LCIDs, as runs store them.
+pub trait Dictionary: Send + Sync {
+ /// Whether each word is misspelled in its language; a word in a language no dictionary
+ /// serves is not.
+ fn misspelled(&self, words: &[(&str, u32)]) -> Vec;
+ /// Corrections for `word`, best first.
+ fn suggest(&self, word: &str, language: u32) -> Vec;
+ /// Add to Dictionary: accepts `word` from now on.
+ fn learn(&self, word: &str);
+}
+
+/// Which of a platform's dictionaries, named `en_GB`, `en-GB` or `en`, serves `language`, an
+/// LCID: its locale's, else its language's.
+pub fn pick(language: u32, available: &[String]) -> Option<&str> {
+ let tag = crate::language::tag(language)?.replace('-', "_");
+ let (bare, region) = tag.split_once('_').unwrap_or((&tag, ""));
+ // A bare tag is the locale Windows picks, most often the language's own country.
+ let home = match bare {
+ "en" => "US".to_owned(),
+ _ => bare.to_uppercase(),
+ };
+ let wanted = if region.is_empty() {
+ vec![format!("{bare}_{home}"), bare.to_owned()]
+ } else {
+ vec![tag.clone(), bare.to_owned()]
+ };
+ let name = |dictionary: &String| dictionary.replace('-', "_");
+ wanted
+ .iter()
+ .find_map(|wanted| {
+ available
+ .iter()
+ .find(|dictionary| name(dictionary) == *wanted)
+ })
+ .or_else(|| {
+ available
+ .iter()
+ .find(|dictionary| name(dictionary).starts_with(&format!("{bare}_")))
+ })
+ .map(String::as_str)
+}
+
+/// A marked word: misspelled, or repeating the word before it.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Mark {
+ /// Bytes of the paragraph's text.
+ pub range: Range,
+ pub repeated: bool,
+}
+
+/// A word of a paragraph: its bytes, its language, and whether its spelling is checked.
+struct Word {
+ range: Range,
+ language: u32,
+ checked: bool,
+}
+
+/// Letters, digits, underscores and combining marks, as against spaces, punctuation and
+/// symbols.
+fn word_character(character: char) -> bool {
+ !character.is_whitespace()
+ && !character.is_ascii_punctuation()
+ && !matches!(u32::from(character),
+ 0x80..=0xbf | 0xd7 | 0xf7 | 0x2000..=0x2bff | 0x3000..=0x303f | 0xfe30..=0xfe4f
+ | 0xff00..=0xff0f | 0x1f000..=0x1faff)
+ || character == '_'
+}
+
+fn apostrophe(character: char) -> bool {
+ matches!(character, '\'' | '\u{2019}' | '\u{02bc}')
+}
+
+/// An Internet or file address, which OneNote leaves unchecked whole.
+fn address(chunk: &str) -> bool {
+ let lower = chunk.to_lowercase();
+ lower.contains("://")
+ || lower.starts_with("www.")
+ || chunk.contains('\\')
+ || chunk
+ .split_once('@')
+ .is_some_and(|(user, host)| !user.is_empty() && host.contains('.'))
+}
+
+/// The words of `paragraph`'s shown text, in order. Hidden field codes and equations are
+/// not text to check, and a word split by one is two.
+fn words(paragraph: &Paragraph) -> Vec {
+ let text = paragraph.text();
+ let spans = paragraph.spans();
+ let format = |byte: usize| &spans[spans.partition_point(|span| span.end <= byte)].format;
+ // Runs of shown text between spaces, which formatting changes don't split.
+ let mut chunks = Vec::new();
+ let mut start = None;
+ for (byte, character) in text.char_indices() {
+ let format = format(byte);
+ let apart =
+ character.is_whitespace() || format.hidden == Some(true) || format.math == Some(true);
+ match (apart, start) {
+ (true, Some(from)) => {
+ chunks.push(from..byte);
+ start = None;
+ }
+ (false, None) => start = Some(byte),
+ _ => {}
+ }
+ }
+ chunks.extend(start.map(|from| from..text.len()));
+ let mut words = Vec::new();
+ for chunk in chunks {
+ let at = chunk.start;
+ let chunk = &text[chunk];
+ if address(chunk) {
+ continue;
+ }
+ let mut characters = chunk.char_indices().peekable();
+ while let Some((offset, character)) = characters.next() {
+ if !word_character(character) {
+ continue;
+ }
+ let mut end = offset + character.len_utf8();
+ while let Some(&(next, character)) = characters.peek() {
+ let joined = apostrophe(character)
+ && chunk[next + character.len_utf8()..]
+ .chars()
+ .next()
+ .is_some_and(char::is_alphabetic);
+ if !word_character(character) && !joined {
+ break;
+ }
+ end = next + character.len_utf8();
+ characters.next();
+ }
+ let word = &chunk[offset..end];
+ if word
+ .chars()
+ .any(|character| character.is_numeric() || crate::search::ideographic(character))
+ {
+ continue;
+ }
+ words.push(Word {
+ range: at + offset..at + end,
+ language: format(at + offset)
+ .language
+ .unwrap_or(crate::language::EN_US),
+ checked: word.chars().any(char::is_lowercase),
+ });
+ }
+ }
+ words
+}
+
+/// Whether two words are the same word, as a repeated one is.
+fn same(a: &str, b: &str) -> bool {
+ let fold = |word: &str| {
+ word.chars()
+ .flat_map(char::to_lowercase)
+ .map(|character| {
+ if apostrophe(character) {
+ '\''
+ } else {
+ character
+ }
+ })
+ .collect::()
+ };
+ fold(a) == fold(b)
+}
+
+/// Which of `words` repeat the word before them, with only spaces between.
+fn repeated(text: &str, words: &[Word]) -> Vec {
+ words
+ .iter()
+ .enumerate()
+ .map(|(index, word)| {
+ index.checked_sub(1).is_some_and(|previous| {
+ let previous = &words[previous].range;
+ text[previous.end..word.range.start]
+ .chars()
+ .all(char::is_whitespace)
+ && same(&text[previous.clone()], &text[word.range.clone()])
+ })
+ })
+ .collect()
+}
+
+/// The marks `dictionary` gives each of `paragraphs`, asking it once: each word repeating
+/// the one before it, and each other checked word it finds misspelled.
+fn check(paragraphs: &[&Paragraph], dictionary: &dyn Dictionary) -> Vec> {
+ let words: Vec<(Vec, Vec)> = paragraphs
+ .iter()
+ .map(|paragraph| {
+ let words = words(paragraph);
+ let repeated = repeated(paragraph.text(), &words);
+ (words, repeated)
+ })
+ .collect();
+ let asked: Vec<(&str, u32)> = paragraphs
+ .iter()
+ .zip(&words)
+ .flat_map(|(paragraph, (words, repeated))| {
+ words
+ .iter()
+ .zip(repeated)
+ .filter(|(word, repeated)| word.checked && !**repeated)
+ .map(|(word, _)| (¶graph.text()[word.range.clone()], word.language))
+ })
+ .collect();
+ let mut misspelled = dictionary.misspelled(&asked).into_iter();
+ words
+ .into_iter()
+ .map(|(words, repeated)| {
+ words
+ .into_iter()
+ .zip(repeated)
+ .filter_map(|(word, repeated)| {
+ let marked = repeated || word.checked && misspelled.next().unwrap_or(false);
+ marked.then_some(Mark {
+ range: word.range,
+ repeated,
+ })
+ })
+ .collect()
+ })
+ .collect()
+}
+
+/// What a paragraph's marks are kept under: its text and the formatting that decides them.
+fn key(paragraph: &Paragraph) -> u64 {
+ let mut hasher = DefaultHasher::new();
+ paragraph.text().hash(&mut hasher);
+ for span in paragraph.spans() {
+ (
+ span.end,
+ span.format.language,
+ span.format.hidden,
+ span.format.math,
+ )
+ .hash(&mut hasher);
+ }
+ hasher.finish()
+}
+
+struct Checked {
+ text: String,
+ marks: Vec,
+}
+
+#[derive(Default)]
+struct State {
+ checked: HashMap,
+ pending: HashSet,
+ /// Words Ignore or Add to Dictionary accepted, misspelled or repeated, left unmarked
+ /// everywhere.
+ accepted: HashSet,
+}
+
+impl State {
+ /// The marks kept for `paragraph` under `key`, less accepted words.
+ fn marks(&self, key: u64, paragraph: &Paragraph) -> Option> {
+ let checked = self
+ .checked
+ .get(&key)
+ .filter(|checked| checked.text == paragraph.text())?;
+ Some(
+ checked
+ .marks
+ .iter()
+ .filter(|mark| {
+ !self
+ .accepted
+ .contains(¶graph.text()[mark.range.clone()])
+ })
+ .cloned()
+ .collect(),
+ )
+ }
+
+ fn keep(&mut self, key: u64, paragraph: &Paragraph, marks: Vec) {
+ if self.checked.len() >= KEPT {
+ self.checked.clear();
+ }
+ self.checked.insert(
+ key,
+ Checked {
+ text: paragraph.text().to_owned(),
+ marks,
+ },
+ );
+ }
+}
+
+struct Shared {
+ dictionary: Box,
+ state: Mutex,
+}
+
+/// Spell checking shared by the pages of one app. Paragraphs are checked when first asked
+/// for, on a thread of its own, which wakes `redraw` when marks are ready.
+#[derive(Clone)]
+pub struct Spelling {
+ shared: Arc,
+ jobs: mpsc::Sender<(u64, Paragraph)>,
+}
+
+impl Spelling {
+ pub fn new(dictionary: Box, redraw: std::task::Waker) -> Self {
+ let shared = Arc::new(Shared {
+ dictionary,
+ state: Mutex::default(),
+ });
+ let (jobs, receiver) = mpsc::channel::<(u64, Paragraph)>();
+ let worker = Arc::clone(&shared);
+ std::thread::Builder::new()
+ .name("spelling".into())
+ .spawn(move || {
+ while let Ok(first) = receiver.recv() {
+ let jobs: Vec<(u64, Paragraph)> = std::iter::once(first)
+ .chain(receiver.try_iter().take(BATCH - 1))
+ .collect();
+ let paragraphs: Vec<&Paragraph> =
+ jobs.iter().map(|(_, paragraph)| paragraph).collect();
+ let marks = check(¶graphs, &*worker.dictionary);
+ let mut state = worker.state.lock().unwrap();
+ for ((key, paragraph), marks) in jobs.iter().zip(marks) {
+ state.pending.remove(key);
+ state.keep(*key, paragraph, marks);
+ }
+ drop(state);
+ redraw.wake_by_ref();
+ }
+ })
+ .expect("the spelling thread starts");
+ Self { shared, jobs }
+ }
+
+ /// The marks on `paragraph` once it is checked, less accepted words; until then none,
+ /// and it is checked.
+ pub fn marks(&self, paragraph: &Paragraph) -> Vec {
+ let key = key(paragraph);
+ let mut state = self.shared.state.lock().unwrap();
+ if let Some(marks) = state.marks(key, paragraph) {
+ return marks;
+ }
+ if state.pending.insert(key) {
+ let _ = self.jobs.send((key, paragraph.clone()));
+ }
+ Vec::new()
+ }
+
+ /// The marks on `paragraph`, checked on this thread where not yet checked, as the
+ /// Spelling pane walks the page.
+ pub fn marks_now(&self, paragraph: &Paragraph) -> Vec {
+ let key = key(paragraph);
+ if let Some(marks) = self.shared.state.lock().unwrap().marks(key, paragraph) {
+ return marks;
+ }
+ let marks = check(&[paragraph], &*self.shared.dictionary).remove(0);
+ let mut state = self.shared.state.lock().unwrap();
+ state.keep(key, paragraph, marks);
+ state.marks(key, paragraph).unwrap_or_default()
+ }
+
+ /// Corrections for `word` in `language`, best first.
+ pub fn suggest(&self, word: &str, language: Option) -> Vec {
+ self.shared
+ .dictionary
+ .suggest(word, language.unwrap_or(crate::language::EN_US))
+ }
+
+ /// Ignore: leaves `word` unmarked everywhere until the app quits.
+ pub fn ignore(&self, word: &str) {
+ self.shared
+ .state
+ .lock()
+ .unwrap()
+ .accepted
+ .insert(word.to_owned());
+ }
+
+ /// Add to Dictionary: the platform's dictionary accepts `word` from now on.
+ pub fn learn(&self, word: &str) {
+ self.shared.dictionary.learn(word);
+ self.ignore(word);
+ }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+ use super::*;
+ use onestore::document::Format;
+
+ /// Knows a few English and French words; English only by default.
+ pub(crate) struct Fake;
+
+ const ENGLISH: &[&str] = &[
+ "this", "sentence", "has", "the", "typos", "word", "don't", "i", "a", "bar", "is", "here",
+ "well", "known", "hello",
+ ];
+ const FRENCH: &[&str] = &["bonjour", "le", "monde", "une", "phrase"];
+
+ impl Dictionary for Fake {
+ fn misspelled(&self, words: &[(&str, u32)]) -> Vec {
+ words
+ .iter()
+ .map(|(word, language)| {
+ let known = match language {
+ 1033 => ENGLISH,
+ 1036 => FRENCH,
+ _ => return false,
+ };
+ !known.contains(&word.to_lowercase().replace('\u{2019}', "'").as_str())
+ })
+ .collect()
+ }
+
+ fn suggest(&self, word: &str, _: u32) -> Vec {
+ match word {
+ "Ths" => vec!["This".into(), "Thus".into()],
+ "sentense" => vec!["sentence".into()],
+ _ => Vec::new(),
+ }
+ }
+
+ fn learn(&self, _: &str) {}
+ }
+
+ #[test]
+ fn languages_pick_their_locale_then_their_language() {
+ let available: Vec = ["en", "en_GB", "fr", "de-AT", "de_DE", "pt_BR"]
+ .map(String::from)
+ .into();
+ for (lcid, picked) in [
+ (1033, Some("en")),
+ (2057, Some("en_GB")),
+ (3081, Some("en")),
+ (3084, Some("fr")),
+ (1031, Some("de_DE")),
+ (3079, Some("de-AT")),
+ (2070, Some("pt_BR")),
+ (1049, None),
+ (0x1007f, None),
+ ] {
+ assert_eq!(pick(lcid, &available), picked, "{lcid}");
+ }
+ let hunspell: Vec = ["en_AU", "en_US", "fr_FR"].map(String::from).into();
+ assert_eq!(pick(1033, &hunspell), Some("en_US"));
+ assert_eq!(pick(1036, &hunspell), Some("fr_FR"));
+ }
+
+ fn marked(paragraph: &Paragraph) -> Vec<(&str, bool)> {
+ check(&[paragraph], &Fake)
+ .remove(0)
+ .into_iter()
+ .map(|mark| (¶graph.text()[mark.range], mark.repeated))
+ .collect()
+ }
+
+ /// OneNote 2010 under its default Proofing options (`/tmp/snowbound-spelling/lab`).
+ #[test]
+ fn words_are_marked_as_onenote_marks_them() {
+ let paragraph = Paragraph::new(
+ "Ths sentense has the typos. HELLO WRLD NASA abc123 x86 3rd foo_bar \
+ www.exmple.com http://exmple.com/qwrt a@exmple.com C:\\Users\\qwrt \
+ don't dont word word the The don't don\u{2019}t well-knwn (sentense) \
+ \u{65e5}\u{672c}\u{8a9e}"
+ .into(),
+ Format::default(),
+ );
+ assert_eq!(
+ marked(¶graph),
+ [
+ ("Ths", false),
+ ("sentense", false),
+ ("foo_bar", false),
+ ("dont", false),
+ ("word", true),
+ ("The", true),
+ ("don\u{2019}t", true),
+ ("knwn", false),
+ ("sentense", false),
+ ]
+ );
+ }
+
+ #[test]
+ fn each_run_is_checked_in_its_language_and_hidden_codes_are_not_text() {
+ let french = Format {
+ language: Some(1036),
+ ..Format::default()
+ };
+ let paragraph = Paragraph::from_runs([
+ ("bonjour le monde ".to_owned(), french.clone()),
+ ("bonjjour ".to_owned(), french),
+ (
+ "hello ".to_owned(),
+ Format {
+ language: Some(1061),
+ ..Format::default()
+ },
+ ),
+ (
+ "wo".to_owned(),
+ Format {
+ bold: Some(true),
+ ..Format::default()
+ },
+ ),
+ ("rd ".to_owned(), Format::default()),
+ (
+ "HYPERLINK \"qwrt\"".to_owned(),
+ Format {
+ hidden: Some(true),
+ ..Format::default()
+ },
+ ),
+ ("heere".to_owned(), Format::default()),
+ ]);
+ assert_eq!(marked(¶graph), [("bonjjour", false), ("heere", false)]);
+ }
+
+ #[test]
+ fn marks_arrive_from_the_thread_and_accepted_words_drop_out() {
+ struct Wake(mpsc::Sender<()>);
+ impl std::task::Wake for Wake {
+ fn wake(self: Arc) {
+ let _ = self.0.send(());
+ }
+ }
+ let (woken, wakes) = mpsc::channel();
+ let spelling = Spelling::new(Box::new(Fake), Arc::new(Wake(woken)).into());
+ let paragraph = Paragraph::new("Ths sentense here".into(), Format::default());
+ assert!(spelling.marks(¶graph).is_empty());
+ wakes
+ .recv_timeout(std::time::Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ let words = |spelling: &Spelling| {
+ spelling
+ .marks(¶graph)
+ .into_iter()
+ .map(|mark| paragraph.text()[mark.range].to_owned())
+ .collect::>()
+ };
+ assert_eq!(words(&spelling), ["Ths", "sentense"]);
+ spelling.ignore("sentense");
+ assert_eq!(words(&spelling), ["Ths"]);
+ assert_eq!(spelling.suggest("Ths", None), ["This", "Thus"]);
+ // The same text in another language is checked again.
+ let french = Paragraph::new(
+ "Ths sentense here".into(),
+ Format {
+ language: Some(1036),
+ ..Format::default()
+ },
+ );
+ assert!(spelling.marks(&french).is_empty());
+ wakes
+ .recv_timeout(std::time::Duration::from_secs(10))
+ .expect("the spelling thread wakes the host");
+ assert_eq!(spelling.marks(&french).len(), 2);
+ }
+}
diff --git a/crates/canvas/src/template.rs b/crates/canvas/src/template.rs
index 606d505950712fd2d0ccf4b3b576aec621ca97d7..e2bfca3ff3e08f5a31f99ee798af5b610d425b8b 100644
--- a/crates/canvas/src/template.rs
+++ b/crates/canvas/src/template.rs
@@ -43,8 +43,10 @@ impl Template {
},
size: art.size,
bytes: Some(bytes.into()),
+ display: None,
alt: None,
background: true,
+ printout: None,
})
})
.collect()
diff --git a/crates/canvas/tests/cross_container.rs b/crates/canvas/tests/cross_container.rs
new file mode 100644
index 0000000000000000000000000000000000000000..df51c18a52daa17b07d6df620ef7f3797e1322d3
--- /dev/null
+++ b/crates/canvas/tests/cross_container.rs
@@ -0,0 +1,169 @@
+//! Deleting or typing over a selection that crosses a table's edge does what OneNote 2010 did
+//! with the same keys (`tools/native_cross_container.py`, `corpus/cross-container`): nothing
+//! joins across the edge, cells inside are emptied, and where the selection runs on past the
+//! table its rows inside go, the table with them when all do.
+
+use canvas::{document::TextPosition, editor::CanvasEditor, layout::TextEngine};
+use onestore::{
+ Arena, ExGuid, Section, Store,
+ op::{Edit, Op},
+ page::{Page, PageObject, PageParagraph, ParagraphContent},
+};
+
+const CROSS: &[u8] = include_bytes!("../../../corpus/cross-container/native/notebook/Cross.one");
+
+/// The body's paragraphs in order: a text, or a table's rows of cell texts.
+#[derive(Debug, PartialEq)]
+enum Block {
+ Text(String),
+ Table(Vec>),
+}
+
+fn blocks(page: &Page) -> Vec {
+ let text = |node: &PageParagraph| node.text().unwrap().text.text().to_owned();
+ page.objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) => Some(&outline.paragraphs),
+ _ => None,
+ })
+ .unwrap()
+ .iter()
+ .map(|node| match &node.content {
+ ParagraphContent::Table(table) => Block::Table(
+ table
+ .rows
+ .iter()
+ .map(|row| {
+ row.cells
+ .iter()
+ .map(|cell| cell.paragraphs.iter().map(text).collect())
+ .collect()
+ })
+ .collect(),
+ ),
+ _ => Block::Text(text(node)),
+ })
+ .collect()
+}
+
+fn at(paragraph: usize, offset: u32) -> TextPosition {
+ TextPosition { paragraph, offset }
+}
+
+#[test]
+fn deleting_across_a_tables_edge_keeps_each_side() {
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, CROSS.to_vec()).unwrap();
+ let pages = section.pages().unwrap();
+ let mut engine = TextEngine::default();
+ let text = |value: &str| Block::Text(value.into());
+ let table = |rows: &[[&str; 2]]| {
+ Block::Table(
+ rows.iter()
+ .map(|row| row.iter().map(|cell| cell.to_string()).collect())
+ .collect(),
+ )
+ };
+ // Each page's selection, whether Delete is pressed, and what is typed then.
+ let cases = [
+ (
+ "Delete into a table",
+ [at(0, 6), at(1, 5)],
+ true,
+ "",
+ vec![
+ text("Before"),
+ table(&[[" one", "Alpha two"], ["Beta one", "Beta two"]]),
+ text("After text"),
+ ],
+ ),
+ (
+ "Delete out of a table",
+ [at(2, 5), at(5, 5)],
+ true,
+ "X",
+ vec![
+ text("Before text"),
+ table(&[["Alpha one", "AlphaX"]]),
+ text(" text"),
+ ],
+ ),
+ (
+ "Type over a row",
+ [at(0, 6), at(3, 4)],
+ false,
+ "Y",
+ vec![
+ text("BeforeY"),
+ table(&[["", ""], [" one", "Beta two"]]),
+ text("After text"),
+ ],
+ ),
+ (
+ "Delete a whole table",
+ [at(0, 6), at(5, 5)],
+ true,
+ "",
+ vec![text("Before"), text(" text")],
+ ),
+ ];
+ let mut expected = Vec::new();
+ for (index, (title, selection, delete, typed, blocks_after)) in cases.into_iter().enumerate() {
+ let space: ExGuid = pages.iter().find(|page| page.1 == title).unwrap().0;
+ let page = section.page(space).unwrap();
+ let body = page
+ .objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) => Some(outline.id),
+ _ => None,
+ })
+ .unwrap();
+ let mut editor = CanvasEditor::from_page(page, &mut engine).unwrap();
+ editor.focus_outline(body).unwrap();
+ editor.select(selection.into()).unwrap();
+ if delete {
+ editor.delete(&mut engine, false).unwrap();
+ }
+ if !typed.is_empty() {
+ editor.insert(&mut engine, typed).unwrap();
+ }
+ assert_eq!(
+ editor.selection().positions[1].paragraph,
+ selection[0].paragraph
+ );
+ let ops = editor
+ .take_ops()
+ .unwrap()
+ .into_iter()
+ .map(|op| Op::Page { space, op })
+ .collect();
+ let at = 134_000_000_000_000_000 + index as u64 * 10_000_000;
+ section.apply("Author", &Edit { at, ops }).unwrap();
+ assert_eq!(
+ blocks(§ion.page(space).unwrap()),
+ blocks_after,
+ "{title}"
+ );
+ expected.push((space, blocks_after));
+ }
+ section.seal().unwrap();
+ let written = section.image();
+ let reread = Section::open(&arena, written.clone()).unwrap();
+ for (space, blocks_after) in &expected {
+ assert_eq!(blocks(&reread.page(*space).unwrap()), *blocks_after);
+ }
+ if let Some(directory) = std::env::var_os("SNOWBOUND_CROSS_CONTAINER_EXPORT") {
+ let directory = std::path::PathBuf::from(directory);
+ std::fs::create_dir(&directory).unwrap();
+ std::fs::write(directory.join("Cross.one"), &written).unwrap();
+ let file_id = Store::parse(&written).unwrap().header.file_id;
+ std::fs::write(
+ directory.join("Open Notebook.onetoc2"),
+ onestore::create_table_of_contents("Open Notebook.onetoc2", &[("Cross.one", file_id)])
+ .unwrap(),
+ )
+ .unwrap();
+ }
+}
diff --git a/crates/canvas/tests/custom_tags.rs b/crates/canvas/tests/custom_tags.rs
index 497eca80577736ead41d66dad5fdfa57ff2b61f4..d8dafca0276dfd2aff8836de105a030fd7b1d98f 100644
--- a/crates/canvas/tests/custom_tags.rs
+++ b/crates/canvas/tests/custom_tags.rs
@@ -24,6 +24,7 @@ fn list() -> Vec {
shape,
color,
highlight,
+ art: None,
};
vec![
tag("Snow check", 61, Some(0x0000_0080), Some(0x00ff_cc00)),
@@ -173,6 +174,7 @@ fn onenotes_custom_tags_read_back() {
shape: 61,
color: Some(0x0000_0080),
highlight: Some(0x00ff_cc00),
+ art: None,
};
let to_do = NoteTag::defaults()[0].clone();
// Snow check went in at the top of the list, then moved below To Do.
diff --git a/crates/canvas/tests/ink_tools.rs b/crates/canvas/tests/ink_tools.rs
index 89862e0eb5759f4e56b631f098c3212eb06967cf..52ed15ebff42dfcca520b48366cc7f33fa75ce79 100644
--- a/crates/canvas/tests/ink_tools.rs
+++ b/crates/canvas/tests/ink_tools.rs
@@ -285,3 +285,39 @@ fn drawing_tools_store_each_stroke_and_undo_it_in_one_step() {
assert!(lab.view.editor.take_ops().unwrap().is_empty());
assert_eq!(lab.view.ink_selection(), [drawn[5].id]);
}
+
+/// A pen reporting pressure stores it at each point, following the pen between reports; a
+/// mouse's stroke after it keeps the pen's width, as OneNote stores one (`corpus/ink-pressure`).
+#[test]
+fn a_pressure_pen_stores_its_pressure_and_a_mouse_its_width() {
+ let source = onestore::create_section("ink.one", "Pressure", "Author").unwrap();
+ let arena = Arena::default();
+ let mut lab = open(&arena, source);
+ let _ = lab.view.set_tool(Tool::Pen(FAVORITES[0]));
+ let path = line([60.0, 150.0], [220.0, 150.0], 4);
+ let view = &mut lab.view;
+ view.set_pressure(Some(0.2));
+ let _ = view.pointer_moved(path[0]).unwrap();
+ let _ = view.pointer_pressed(Instant::now()).unwrap();
+ for (point, pressure) in path[1..]
+ .iter()
+ .zip([Some(0.4), None, Some(1.0), Some(0.9)])
+ {
+ if pressure.is_some() {
+ view.set_pressure(pressure);
+ }
+ let _ = view.pointer_moved(*point).unwrap();
+ }
+ let _ = view.pointer_released().unwrap();
+ lab.store();
+ lab.view.set_pressure(None);
+ lab.drag(&line([60.0, 200.0], [220.0, 200.0], 4));
+ lab.store();
+ let drawn = lab.drawings();
+ let level = onestore::page::ink::level;
+ assert_eq!(
+ drawn[0].strokes[0].pressure,
+ [0.2, 0.4, 0.4, 1.0, 0.9].map(level)
+ );
+ assert!(drawn[1].strokes[0].pressure.is_empty());
+}
diff --git a/crates/canvas/tests/links_equations.rs b/crates/canvas/tests/links_equations.rs
index bd1f22a71483efcb34c2176a75c92e328f6f1a5e..7a76e09f8056b72dfc3d9b700f140ab484940337 100644
--- a/crates/canvas/tests/links_equations.rs
+++ b/crates/canvas/tests/links_equations.rs
@@ -156,7 +156,10 @@ fn links_and_equations_save_as_the_editor_shows_them() {
let at = line(&mut editor, engine);
typed(&mut editor, engine, "Read the Rust book today");
select(&mut editor, at, 9..18);
- assert_eq!(editor.link_prefill(), ("Rust book".into(), String::new()));
+ assert_eq!(
+ editor.link_prefill(),
+ Some(("Rust book".into(), String::new()))
+ );
editor
.set_link(engine, "Rust book", "https://doc.rust-lang.org/book/")
.unwrap();
@@ -500,6 +503,265 @@ fn enter_at_and_inside_equations_and_links_stores_what_onenote_stored() {
assert_eq!(written, native);
}
+/// Enter and Shift+Enter inside a link's label leave it whole, as in OneNote 2010, where
+/// Shift+Enter does nothing and Enter follows the link; at its end Enter splits as anywhere
+/// else.
+#[test]
+fn enter_inside_a_link_is_ignored() {
+ let mut engine = TextEngine::default();
+ let engine = &mut engine;
+ let mut editor = CanvasEditor::new(
+ engine,
+ canvas::document::TextDocument::new(vec![onestore::page::Paragraph::new(
+ String::new(),
+ Default::default(),
+ )])
+ .unwrap(),
+ 400.0,
+ )
+ .unwrap();
+ typed(&mut editor, engine, "Visit the example site today");
+ select(&mut editor, 0, 10..22);
+ editor
+ .set_link(engine, "example site", "https://example.com/")
+ .unwrap();
+ editor.take_ops().unwrap();
+ let document = editor.active_outline().document().clone();
+ let text = document.paragraphs().next().unwrap();
+ let end = text
+ .utf16_offset(text.text().find(" today").unwrap())
+ .unwrap();
+ let label = editor
+ .link_at(TextPosition {
+ paragraph: 0,
+ offset: end,
+ })
+ .unwrap()
+ .label;
+ let inside = label.start + 7;
+ for soft in [false, true] {
+ select(&mut editor, 0, inside..inside);
+ editor.enter(engine, soft).unwrap();
+ assert_eq!(*editor.active_outline().document(), document);
+ assert!(editor.take_ops().unwrap().is_empty());
+ }
+ select(&mut editor, 0, label.end..label.end);
+ editor.enter(engine, false).unwrap();
+ assert_eq!(editor.active_outline().document().paragraphs().count(), 2);
+}
+
+/// Link over a selection across paragraphs does nothing, as OneNote 2010's does.
+#[test]
+fn link_over_paragraphs_does_nothing() {
+ let mut engine = TextEngine::default();
+ let engine = &mut engine;
+ let mut editor = CanvasEditor::new(
+ engine,
+ canvas::document::TextDocument::new(vec![
+ onestore::page::Paragraph::new("One two".into(), Default::default()),
+ onestore::page::Paragraph::new("Three four".into(), Default::default()),
+ ])
+ .unwrap(),
+ 400.0,
+ )
+ .unwrap();
+ let document = editor.active_outline().document().clone();
+ editor
+ .select(
+ [
+ TextPosition {
+ paragraph: 0,
+ offset: 4,
+ },
+ TextPosition {
+ paragraph: 1,
+ offset: 5,
+ },
+ ]
+ .into(),
+ )
+ .unwrap();
+ assert_eq!(editor.link_prefill(), None);
+ editor.set_link(engine, "", "https://example.com/").unwrap();
+ assert_eq!(*editor.active_outline().document(), document);
+ assert!(editor.take_ops().unwrap().is_empty());
+}
+
+/// Deleting from inside one equation into the next joins them into one, as OneNote 2010
+/// joined "aa+bb" and "cc+dd" to "aa++dd" in the lab; the section it stores reopens in OneNote
+/// (`corpus/equation-join`, exported to `CANVAS_EQUATION_JOIN_EXPORT`).
+#[test]
+fn deleting_between_equations_joins_them() {
+ let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("../..");
+ let source = std::fs::read(root.join("corpus/link-edit/candidate/links.one")).unwrap();
+ let (space, page) = pages(&source).remove(0);
+ let mut engine = TextEngine::default();
+ let engine = &mut engine;
+ let mut editor = CanvasEditor::from_page(page, engine).unwrap();
+ let body = editor
+ .outlines()
+ .iter()
+ .find(|outline| !outline.title)
+ .unwrap()
+ .id;
+ editor.focus_outline(body).unwrap();
+ let first = line(&mut editor, engine);
+ editor.insert_equation(engine).unwrap();
+ typed(&mut editor, engine, "aa+bb ");
+ let second = line(&mut editor, engine);
+ editor.insert_equation(engine).unwrap();
+ typed(&mut editor, engine, "cc+dd ");
+ let text = |editor: &CanvasEditor, paragraph: usize| {
+ editor
+ .active_outline()
+ .document()
+ .paragraphs()
+ .nth(paragraph)
+ .unwrap()
+ .clone()
+ };
+ let before = |editor: &CanvasEditor, paragraph: usize, needle: &str| {
+ let text = text(editor, paragraph);
+ text.utf16_offset(text.text().find(needle).unwrap())
+ .unwrap()
+ };
+ let (from, to) = (before(&editor, first, "𝑏𝑏"), before(&editor, second, "+𝑑"));
+ editor
+ .select(
+ [
+ TextPosition {
+ paragraph: first,
+ offset: from,
+ },
+ TextPosition {
+ paragraph: second,
+ offset: to,
+ },
+ ]
+ .into(),
+ )
+ .unwrap();
+ editor.delete(engine, false).unwrap();
+ let joined = text(&editor, first);
+ assert_eq!(joined.text().trim_end(), "𝑎𝑎++𝑑𝑑");
+ assert!(
+ joined
+ .spans()
+ .iter()
+ .all(|span| span.format.math == Some(true))
+ );
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, source).unwrap();
+ let ops = editor
+ .take_ops()
+ .unwrap()
+ .into_iter()
+ .map(|op| onestore::op::Op::Page { space, op })
+ .collect();
+ section
+ .apply(
+ "Author",
+ &onestore::op::Edit {
+ at: 134_000_000_000_000_000,
+ ops,
+ },
+ )
+ .unwrap();
+ section.seal().unwrap();
+ let written = section.image();
+ let (_, stored) = pages(&written).remove(0);
+ let equations: Vec = stored
+ .objects
+ .iter()
+ .filter_map(|object| match object {
+ PageObject::Outline(outline) if !outline.title => Some(outline),
+ _ => None,
+ })
+ .flat_map(|outline| &outline.paragraphs)
+ .filter_map(|paragraph| paragraph.text())
+ .filter(|text| {
+ text.text
+ .spans()
+ .iter()
+ .any(|span| span.format.math == Some(true))
+ })
+ .map(|text| text.text.text().trim_end().to_owned())
+ .collect();
+ assert_eq!(equations, ["𝑎𝑎++𝑑𝑑"]);
+ if let Some(directory) = std::env::var_os("CANVAS_EQUATION_JOIN_EXPORT") {
+ let directory = std::path::PathBuf::from(directory);
+ std::fs::create_dir(&directory).unwrap();
+ std::fs::write(directory.join("links.one"), &written).unwrap();
+ let file_id = Store::parse(&written).unwrap().header.file_id;
+ std::fs::write(
+ directory.join("Open Notebook.onetoc2"),
+ onestore::create_table_of_contents("Open Notebook.onetoc2", &[("links.one", file_id)])
+ .unwrap(),
+ )
+ .unwrap();
+ }
+}
+
+/// Alt+= over a selection across paragraphs makes each paragraph's part an equation of its
+/// own, as OneNote 2010 does, and one undo takes them back.
+#[test]
+fn equation_over_paragraphs_makes_one_each() {
+ let mut engine = TextEngine::default();
+ let engine = &mut engine;
+ let mut editor = CanvasEditor::new(
+ engine,
+ canvas::document::TextDocument::new(vec![
+ onestore::page::Paragraph::new("One two".into(), Default::default()),
+ onestore::page::Paragraph::new("Three four".into(), Default::default()),
+ ])
+ .unwrap(),
+ 400.0,
+ )
+ .unwrap();
+ let document = editor.active_outline().document().clone();
+ editor
+ .select(
+ [
+ TextPosition {
+ paragraph: 0,
+ offset: 4,
+ },
+ TextPosition {
+ paragraph: 1,
+ offset: 5,
+ },
+ ]
+ .into(),
+ )
+ .unwrap();
+ editor.insert_equation(engine).unwrap();
+ let math: Vec> = editor
+ .active_outline()
+ .document()
+ .paragraphs()
+ .map(|text| {
+ let mut start = 0;
+ text.spans()
+ .iter()
+ .map(|span| {
+ let part = text.text()[start..span.end].to_owned();
+ start = span.end;
+ (part, span.format.math == Some(true))
+ })
+ .collect()
+ })
+ .collect();
+ assert_eq!(
+ math,
+ [
+ vec![("One ".to_owned(), false), ("𝑡𝑤𝑜".to_owned(), true)],
+ vec![("𝑇ℎ𝑟𝑒𝑒".to_owned(), true), (" four".to_owned(), false)],
+ ]
+ );
+ assert!(editor.undo(engine).unwrap());
+ assert_eq!(*editor.active_outline().document(), document);
+}
+
/// An equation among text draws in its line, which grows to hold it, and URL text shows as a
/// link without being stored as one.
#[test]
diff --git a/crates/canvas/tests/object_outlines.rs b/crates/canvas/tests/object_outlines.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2737cb05816f6a24ebc933b8c494974c5eccf2e1
--- /dev/null
+++ b/crates/canvas/tests/object_outlines.rs
@@ -0,0 +1,100 @@
+//! An outline holding only a picture or a file edits like any other: a click beside the object
+//! puts the caret in a paragraph after it, stored only once typed in, as OneNote 2010 adds one
+//! (`corpus/object-outline`).
+
+use canvas::{document::TextPosition, editor::CanvasEditor, layout::TextEngine};
+use onestore::{
+ Arena, Section, Store,
+ op::{Edit, Op},
+ page::{Page, PageObject, ParagraphContent},
+};
+
+const ALONE: &[u8] = include_bytes!("../../../corpus/object-outline/native/notebook/Alone.one");
+
+/// The body outline's paragraphs: an object's kind, or text.
+fn body(page: &Page) -> Vec {
+ page.objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) => Some(&outline.paragraphs),
+ _ => None,
+ })
+ .unwrap()
+ .iter()
+ .map(|node| match &node.content {
+ ParagraphContent::Text(text) => text.text.text().to_owned(),
+ ParagraphContent::Image(_) => "picture".into(),
+ ParagraphContent::Attachment(_) => "file".into(),
+ _ => "other".into(),
+ })
+ .collect()
+}
+
+/// `SNOWBOUND_OBJECT_OUTLINE_EXPORT` names a new directory receiving the candidate for a cold
+/// reopen.
+#[test]
+fn typing_beside_an_outlines_only_object_adds_a_paragraph() {
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, ALONE.to_vec()).unwrap();
+ let pages = section.pages().unwrap();
+ let mut engine = TextEngine::default();
+ for (index, (title, object)) in [("File alone", "file"), ("Picture alone", "picture")]
+ .into_iter()
+ .enumerate()
+ {
+ let space = pages.iter().find(|page| page.1 == title).unwrap().0;
+ let page = section.page(space).unwrap();
+ assert_eq!(body(&page), [object]);
+ let outline = page
+ .objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) => Some(outline.id),
+ _ => None,
+ })
+ .unwrap();
+ let mut editor = CanvasEditor::from_page(page.clone(), &mut engine).unwrap();
+ assert!(editor.has_page_outline(outline));
+ // The paragraph the caret stands in is not stored until typed in.
+ assert_eq!(editor.page().unwrap(), page);
+ editor.focus_outline(outline).unwrap();
+ let at = TextPosition {
+ paragraph: 0,
+ offset: 0,
+ };
+ editor.select([at; 2].into()).unwrap();
+ assert!(editor.take_ops().unwrap().is_empty());
+ let mut publish = |editor: &mut CanvasEditor, step: u64| {
+ let ops = editor
+ .take_ops()
+ .unwrap()
+ .into_iter()
+ .map(|op| Op::Page { space, op })
+ .collect();
+ let at = 134_000_000_000_000_000 + (index as u64 * 4 + step) * 10_000_000;
+ section.apply("Author", &Edit { at, ops }).unwrap();
+ body(§ion.page(space).unwrap())
+ };
+ editor.insert(&mut engine, "abc").unwrap();
+ assert_eq!(publish(&mut editor, 0), [object, "abc"]);
+ // Undoing the typing removes the paragraph again, as OneNote 2010's undo does.
+ assert!(editor.undo(&mut engine).unwrap());
+ assert_eq!(publish(&mut editor, 1), [object]);
+ assert!(editor.redo(&mut engine).unwrap());
+ assert_eq!(publish(&mut editor, 2), [object, "abc"]);
+ }
+ section.seal().unwrap();
+ let written = section.image();
+ if let Some(directory) = std::env::var_os("SNOWBOUND_OBJECT_OUTLINE_EXPORT") {
+ let directory = std::path::PathBuf::from(directory);
+ std::fs::create_dir(&directory).unwrap();
+ std::fs::write(directory.join("Alone.one"), &written).unwrap();
+ let file_id = Store::parse(&written).unwrap().header.file_id;
+ std::fs::write(
+ directory.join("Open Notebook.onetoc2"),
+ onestore::create_table_of_contents("Open Notebook.onetoc2", &[("Alone.one", file_id)])
+ .unwrap(),
+ )
+ .unwrap();
+ }
+}
diff --git a/crates/canvas/tests/ops_differential.rs b/crates/canvas/tests/ops_differential.rs
index db899cfb0fbd64ead4264b331a529e006b5c0081..173fc4271a02d75d6376a89b162d4cb3231854a8 100644
--- a/crates/canvas/tests/ops_differential.rs
+++ b/crates/canvas/tests/ops_differential.rs
@@ -598,8 +598,10 @@ fn perform(
},
size: Some([174.5, 640.0]),
bytes: Some(std::sync::Arc::from(ART.as_slice())),
+ display: None,
alt: None,
background: true,
+ printout: None,
};
let shown = editor.page().unwrap().objects.iter().any(|object| {
matches!(object, onestore::page::PageObject::Image(image) if image.background)
@@ -710,10 +712,16 @@ fn perform(
let points: Vec<[f32; 2]> = (0..12)
.map(|step| [x + 6.0 * step as f32, y + 9.0 * (step as f32 / 2.0).sin()])
.collect();
+ // Every other stroke a pressure pen's.
+ let pressure: Vec = if random.below(2) == 0 {
+ (0..12).map(|step| step as f32 / 11.0).collect()
+ } else {
+ Vec::new()
+ };
let ink = onestore::page::Ink {
id: onestore::page::text::new_id().unwrap(),
layout: Default::default(),
- strokes: vec![pen.stroke(&points).unwrap()],
+ strokes: vec![pen.stroke(&points, &pressure).unwrap()],
groups: Vec::new(),
shape: None,
};
@@ -735,7 +743,7 @@ fn perform(
from[0] + 18.0 * (1 + random.below(6)) as f32,
from[1] + 18.0 * (1 + random.below(4)) as f32,
];
- let pen = Pen::new(50.0, Some(0x7a9a1f)).stroke(&[]).unwrap();
+ let pen = Pen::new(50.0, Some(0x7a9a1f)).stroke(&[], &[]).unwrap();
let ink = onestore::page::Ink::drawn(kinds[random.below(4)], from, to, &pen).unwrap();
editor.draw(ink).is_ok()
}
diff --git a/crates/canvas/tests/printouts.rs b/crates/canvas/tests/printouts.rs
new file mode 100644
index 0000000000000000000000000000000000000000..82e27cbac05f1db6892d8a2ed523b6ddd5b97827
--- /dev/null
+++ b/crates/canvas/tests/printouts.rs
@@ -0,0 +1,121 @@
+//! A file printout, whose pictures OneNote 2010 stores as pages of an XPS package with a PNG
+//! rendering of each beside it (WebPictureContainer14), shows that rendering and edits like
+//! any picture: its pages stay printouts when moved, and a page deleted comes back on undo
+//! as the picture OneNote showed of it (`corpus/printout`).
+
+use canvas::{document::TextPosition, editor::CanvasEditor, layout::TextEngine};
+use onestore::{
+ Arena, Section, Store,
+ op::{Edit, Op},
+ page::{Image, Page, PageObject},
+};
+
+const PRINTOUTS: &[u8] = include_bytes!("../../../corpus/printout/native/notebook/Printouts.one");
+
+fn pictures(page: &Page) -> Vec<&Image> {
+ page.objects
+ .iter()
+ .filter_map(|object| match object {
+ PageObject::Image(image) => Some(image),
+ _ => None,
+ })
+ .collect()
+}
+
+/// `SNOWBOUND_PRINTOUT_EXPORT` names a new directory receiving the candidate for a cold
+/// reopen.
+#[test]
+fn printouts_show_onenotes_rendering_and_move_as_pictures() {
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, PRINTOUTS.to_vec()).unwrap();
+ let (space, ..) = section
+ .pages()
+ .unwrap()
+ .into_iter()
+ .find(|page| page.1 == "Printout")
+ .unwrap();
+ let page = section.page(space).unwrap();
+ let printed = pictures(&page);
+ assert_eq!(printed.len(), 2);
+ for picture in &printed {
+ let (stored, shown) = (
+ picture.bytes.as_ref().unwrap(),
+ picture.display.as_ref().unwrap(),
+ );
+ // The stored picture is the XPS package; the shown one a PNG.
+ assert!(stored.starts_with(b"PK\x03\x04"));
+ assert!(shown.starts_with(b"\x89PNG"));
+ }
+ assert!(Iterator::eq(
+ printed.iter().map(|picture| picture.bytes.as_ref()),
+ [printed[0].bytes.as_ref(); 2]
+ ));
+ let (moved, layout) = (printed[1].id, printed[1].layout.clone());
+ let origin = [layout.x.unwrap(), layout.y.unwrap() + 36.0];
+ let size = [layout.max_width.unwrap(), layout.max_height.unwrap()];
+
+ let mut engine = TextEngine::default();
+ let mut editor = CanvasEditor::from_page(page.clone(), &mut engine).unwrap();
+ #[cfg(feature = "gpu")]
+ {
+ let (scene, editor) =
+ canvas::gpu::page::PageScene::from_page(page.clone(), &mut engine).unwrap();
+ assert_eq!(scene.read_only(Some(&editor)).count(), 0);
+ }
+ editor
+ .place_image(&mut engine, moved, origin, size)
+ .unwrap();
+ let restored = printed[0].id;
+ editor.remove_image(&mut engine, restored).unwrap();
+ assert!(editor.undo(&mut engine).unwrap());
+ let body = editor.outlines().iter().find(|o| !o.title).unwrap().id;
+ editor.focus_outline(body).unwrap();
+ let at = TextPosition {
+ paragraph: 0,
+ offset: 0,
+ };
+ editor.select([at; 2].into()).unwrap();
+ editor.insert(&mut engine, "Printed ").unwrap();
+ let ops = editor
+ .take_ops()
+ .unwrap()
+ .into_iter()
+ .map(|op| Op::Page { space, op })
+ .collect();
+ section
+ .apply(
+ "Author",
+ &Edit {
+ at: 134_000_000_000_000_000,
+ ops,
+ },
+ )
+ .unwrap();
+ section.seal().unwrap();
+ let written = section.image();
+ let reread = Section::open(&arena, written.clone()).unwrap();
+ let page = reread.page(space).unwrap();
+ let after = pictures(&page);
+ assert_eq!(after.len(), 2);
+ let moved = after.iter().find(|picture| picture.id == moved).unwrap();
+ assert_eq!([moved.layout.x, moved.layout.y], origin.map(Some));
+ assert!(moved.printout.is_some() && moved.display.is_some());
+ let restored = after.iter().find(|picture| picture.id == restored).unwrap();
+ assert_eq!(restored.printout, None);
+ assert_eq!(restored.bytes, printed[0].display);
+ if let Some(directory) = std::env::var_os("SNOWBOUND_PRINTOUT_EXPORT") {
+ let directory = std::path::PathBuf::from(directory);
+ std::fs::create_dir(&directory).unwrap();
+ std::fs::write(directory.join("Printouts.one"), &written).unwrap();
+ let file_id = Store::parse(&written).unwrap().header.file_id;
+ std::fs::write(
+ directory.join("Open Notebook.onetoc2"),
+ onestore::create_table_of_contents(
+ "Open Notebook.onetoc2",
+ &[("Printouts.one", file_id)],
+ )
+ .unwrap(),
+ )
+ .unwrap();
+ }
+}
diff --git a/crates/canvas/tests/recording.rs b/crates/canvas/tests/recording.rs
index e11ce61f9de844fdf262312058b2814e3be4a9d8..8695865cd4716d05b203c6022a938a8a151f3758 100644
--- a/crates/canvas/tests/recording.rs
+++ b/crates/canvas/tests/recording.rs
@@ -185,3 +185,68 @@ fn a_recording_from_the_title_goes_to_the_body_s_start() {
assert_eq!(shown[3].1.time_ms, Some(20131));
assert_eq!(shown[1].1, MediaIndex::default());
}
+
+/// A note written while recording is paused links to nothing, and the pause is left out of
+/// later moments, as OneNote 2010 links them (`corpus/recording/native/read/paused-while-recording.xml`).
+/// See Playback then highlights the note linked last at or before the moment playing.
+#[test]
+fn notes_written_while_paused_stay_unlinked_and_see_playback_follows_the_rest() {
+ let source = onestore::create_section("files.one", "Recorded", "Author").unwrap();
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, source).unwrap();
+ let (space, ..) = section.pages().unwrap()[0].clone();
+ let mut engine = TextEngine::default();
+ let mut editor = CanvasEditor::from_page(section.page(space).unwrap(), &mut engine).unwrap();
+ let outline = editor
+ .outlines()
+ .iter()
+ .find(|outline| !outline.title)
+ .unwrap()
+ .id;
+ editor.focus_outline(outline).unwrap();
+ editor
+ .move_selection(&mut engine, Movement::DocumentEnd, false)
+ .unwrap();
+ let id = editor.start_recording(&mut engine, "Started").unwrap();
+ let wait = |ms| std::thread::sleep(std::time::Duration::from_millis(ms));
+ wait(30);
+ editor.insert(&mut engine, "Before the pause").unwrap();
+ editor.pause_recording(true);
+ assert!(editor.recording_paused());
+ let paused_at = editor.recording_ms().unwrap();
+ editor.insert(&mut engine, "\nWhile paused").unwrap();
+ wait(300);
+ assert_eq!(editor.recording_ms(), Some(paused_at));
+ editor.pause_recording(false);
+ wait(30);
+ editor.insert(&mut engine, "\nAfter the pause").unwrap();
+ let page = editor.page().unwrap();
+ let shown = body(&page);
+ let moment = |text: &str| {
+ shown
+ .iter()
+ .find(|(shown, _)| shown == text)
+ .unwrap()
+ .1
+ .time_ms
+ };
+ let before = moment("Before the pause").unwrap();
+ let after = moment("After the pause").unwrap();
+ assert_eq!(moment("While paused"), None);
+ assert!(
+ before >= 30 && after >= before + 30 && after < before + 300,
+ "{before} {after}"
+ );
+
+ let note = |at| {
+ editor
+ .played_note(id, at)
+ .and_then(|note| canvas::search::paragraph_match(&editor, note))
+ .map(|(_, selection)| selection.positions[0].paragraph)
+ };
+ // Before the first note only the line saying when, which is never highlighted.
+ assert_eq!(note(before - 1), None);
+ let first = note(before).unwrap();
+ assert_eq!(note(after - 1), Some(first));
+ assert!(note(after).unwrap() > first);
+}
diff --git a/crates/canvas/tests/table_tags.rs b/crates/canvas/tests/table_tags.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f7540d6dbc0cffc01132626bc294c13cf645edf0
--- /dev/null
+++ b/crates/canvas/tests/table_tags.rs
@@ -0,0 +1,170 @@
+//! Tables carrying note tags edit like any other: the tag draws in the tag column centred on
+//! the table, a click checks its box, typing in a cell keeps the table's tags, and deleting a
+//! table and undoing brings its tags back (`corpus/table-tags`).
+
+use canvas::{
+ document::TextPosition,
+ editor::{CanvasEditor, Whole},
+ layout::TextEngine,
+};
+use onestore::{
+ Arena, ExGuid, Section, Store,
+ document::Tag,
+ op::{Edit, Op},
+ page::{Page, PageObject, PageParagraph, ParagraphContent},
+};
+
+const TABLES: &[u8] = include_bytes!("../../../corpus/table-tags/native/notebook/Tables.one");
+
+/// Each table's cell texts and tags, their arena positions cleared, in page order.
+fn tables(page: &Page) -> Vec<(Vec, Vec)> {
+ fn walk(nodes: &[PageParagraph], out: &mut Vec<(Vec, Vec)>) {
+ for node in nodes {
+ if let ParagraphContent::Table(table) = &node.content {
+ let cells = table.rows.iter().flat_map(|row| &row.cells);
+ let texts = cells
+ .clone()
+ .flat_map(|cell| &cell.paragraphs)
+ .filter_map(|paragraph| Some(paragraph.text()?.text.text().to_owned()))
+ .collect();
+ let tags = node
+ .tags
+ .iter()
+ .chain(&table.tags)
+ .map(|tag| Tag {
+ extra_set: 0,
+ ..tag.clone()
+ })
+ .collect();
+ out.push((texts, tags));
+ for cell in cells {
+ walk(&cell.paragraphs, out);
+ }
+ }
+ }
+ }
+ let mut out = Vec::new();
+ for object in &page.objects {
+ if let PageObject::Outline(outline) = object {
+ walk(&outline.paragraphs, &mut out);
+ }
+ }
+ out
+}
+
+fn body(page: &Page) -> ExGuid {
+ page.objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) => Some(outline.id),
+ _ => None,
+ })
+ .unwrap()
+}
+
+fn publish(section: &mut Section<'_>, space: ExGuid, editor: &mut CanvasEditor, at: u64) {
+ let ops = editor
+ .take_ops()
+ .unwrap()
+ .into_iter()
+ .map(|op| Op::Page { space, op })
+ .collect();
+ section.apply("Author", &Edit { at, ops }).unwrap();
+}
+
+/// `SNOWBOUND_TABLE_TAGS_EXPORT` names a new directory receiving the candidate for a cold
+/// reopen.
+#[test]
+fn tagged_tables_draw_check_and_survive_edits() {
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, TABLES.to_vec()).unwrap();
+ let pages = section.pages().unwrap();
+ let space = |title: &str| pages.iter().find(|page| page.1 == title).unwrap().0;
+ let (check, edit, restore) = (
+ space("Check a table"),
+ space("Edit a tagged table"),
+ space("Delete and undo"),
+ );
+ let mut engine = TextEngine::default();
+
+ let page = section.page(check).unwrap();
+ let [(_, tags)] = &tables(&page)[..] else {
+ panic!("one table")
+ };
+ assert_eq!(tags.len(), 1);
+ assert_eq!(tags[0].status & 1, 0);
+ let mut editor = CanvasEditor::from_page(page.clone(), &mut engine).unwrap();
+ assert!(editor.has_page_outline(body(&page)));
+ let outline = editor
+ .outlines()
+ .iter()
+ .find(|outline| outline.id == body(&page))
+ .unwrap();
+ let holder = outline.document().nodes()[1].id;
+ let [(tagged, origin, tag)] = &outline.shaped().tags().collect::>()[..] else {
+ panic!("one tag drawn")
+ };
+ assert_eq!(*tagged, holder);
+ // Centred on the table, in the column left of it.
+ let table = &outline.shaped().tables[0];
+ let [top, bottom] = [table.cells[0].rect[1], table.cells[0].rect[3]];
+ assert!((origin[1] + tag.size / 2.0 - (top + bottom) / 2.0).abs() < 2.0);
+ assert!(origin[0] + tag.size < table.cells[0].rect[0]);
+ editor
+ .click_check(&mut engine, body(&page), holder)
+ .unwrap();
+ publish(&mut section, check, &mut editor, 134_000_000_000_000_000);
+ let checked = tables(§ion.page(check).unwrap());
+ assert_eq!(checked[0].1[0].status & 1, 1);
+ assert!(checked[0].1[0].completed.is_some_and(|time| time > 0));
+
+ let page = section.page(edit).unwrap();
+ let before = tables(&page);
+ let mut editor = CanvasEditor::from_page(page.clone(), &mut engine).unwrap();
+ editor.focus_outline(body(&page)).unwrap();
+ let at = TextPosition {
+ paragraph: 1,
+ offset: 0,
+ };
+ editor.select([at; 2].into()).unwrap();
+ editor.insert(&mut engine, "Now ").unwrap();
+ editor.enter(&mut engine, false).unwrap();
+ publish(&mut section, edit, &mut editor, 134_000_000_010_000_000);
+ let after = tables(§ion.page(edit).unwrap());
+ assert_eq!(after[0].0[..2], ["Now ", "Typed into"]);
+ assert_eq!(after[0].1, before[0].1);
+
+ let original = section.page(restore).unwrap();
+ let kept = tables(&original);
+ assert_eq!(kept.len(), 2);
+ let mut editor = CanvasEditor::from_page(original.clone(), &mut engine).unwrap();
+ editor.focus_outline(body(&original)).unwrap();
+ while editor.whole() != Some(Whole::Page) {
+ editor.widen_selection().unwrap();
+ }
+ editor.delete(&mut engine, false).unwrap();
+ publish(&mut section, restore, &mut editor, 134_000_000_020_000_000);
+ assert!(tables(§ion.page(restore).unwrap()).is_empty());
+ assert!(editor.undo(&mut engine).unwrap());
+ publish(&mut section, restore, &mut editor, 134_000_000_030_000_000);
+ assert_eq!(tables(§ion.page(restore).unwrap()), kept);
+
+ section.seal().unwrap();
+ let written = section.image();
+ let reread = Section::open(&arena, written.clone()).unwrap();
+ assert_eq!(tables(&reread.page(check).unwrap()), checked);
+ assert_eq!(tables(&reread.page(edit).unwrap()), after);
+ assert_eq!(tables(&reread.page(restore).unwrap()), kept);
+ if let Some(directory) = std::env::var_os("SNOWBOUND_TABLE_TAGS_EXPORT") {
+ let directory = std::path::PathBuf::from(directory);
+ std::fs::create_dir(&directory).unwrap();
+ std::fs::write(directory.join("Tables.one"), &written).unwrap();
+ let file_id = Store::parse(&written).unwrap().header.file_id;
+ std::fs::write(
+ directory.join("Open Notebook.onetoc2"),
+ onestore::create_table_of_contents("Open Notebook.onetoc2", &[("Tables.one", file_id)])
+ .unwrap(),
+ )
+ .unwrap();
+ }
+}
diff --git a/crates/draw/Cargo.toml b/crates/draw/Cargo.toml
index 921a396249999895b00680336faf6bb6a63af64c..641b9351add7ddf34cce3c689fd15eaf458bddde 100644
--- a/crates/draw/Cargo.toml
+++ b/crates/draw/Cargo.toml
@@ -8,12 +8,13 @@ publish = false
default = ["wgpu"]
# The renderer; `edit` needs only parley. It submits through wgpu, or without it through
# OpenGL 2.1, for Mac OS X 10.6.
-render = ["dep:bytemuck", "dep:image", "dep:linebender_resource_handle", "dep:roxmltree", "dep:swash"]
+render = ["dep:base64", "dep:bytemuck", "dep:image", "dep:linebender_resource_handle", "dep:roxmltree", "dep:swash"]
wgpu = ["render", "dep:wgpu"]
[dependencies]
parley.workspace = true
+base64 = { version = "0.22.1", optional = true }
bytemuck = { version = "1.25", features = ["derive"], optional = true }
image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "tiff"], optional = true }
linebender_resource_handle = { version = "0.1.1", optional = true }
diff --git a/crates/draw/src/draw.glsl b/crates/draw/src/draw.glsl
index d4c6f0848512fe15ec48251a62dcab894747b818..f03bea893220b31320300b1fc1c18b2e5e9f32d1 100644
--- a/crates/draw/src/draw.glsl
+++ b/crates/draw/src/draw.glsl
@@ -82,11 +82,34 @@ float shadow(vec2 p, vec2 half_size, float corner, float sigma) {
return value;
}
+// Distance from `p` to the tapered capsule from (-h, 0) to (h, 0) with round ends of radii
+// `r0` and `r1` (Inigo Quilez's uneven capsule).
+float taper(vec2 p, float h, float r0, float r1) {
+ vec2 q = vec2(abs(p.y), p.x + h);
+ float span = 2.0 * h;
+ float b = (r0 - r1) / max(span, 1e-6);
+ float far = length(q - vec2(0.0, span)) - r1;
+ if (abs(b) >= 1.0) {
+ return min(length(q) - r0, far);
+ }
+ float a = sqrt(1.0 - b * b);
+ float k = dot(q, vec2(-b, a));
+ if (k < 0.0) {
+ return length(q) - r0;
+ }
+ if (k > a * span) {
+ return far;
+ }
+ return dot(q, vec2(a, b)) - r0;
+}
+
void main() {
vec4 color = texture2D(atlas, v_uv) * v_color;
vec4 shape = v_shape;
if (v_blur > 1e-6) {
color *= shadow(v_local, shape.xy, shape.z, v_blur);
+ } else if (v_blur < -0.5) {
+ color *= clamp(0.5 - taper(v_local, shape.x, shape.y, shape.z), 0.0, 1.0);
} else if (shape.x > 0.0 && shape.y > 0.0) {
vec2 q = abs(v_local) - shape.xy + shape.zw;
float distance;
diff --git a/crates/draw/src/draw.wgsl b/crates/draw/src/draw.wgsl
index 489e6ed81004e6ba6fd06bcc56346e6b1c5549f2..8e11ab1a41bf24eb9935a4eb6d0925a7017b951e 100644
--- a/crates/draw/src/draw.wgsl
+++ b/crates/draw/src/draw.wgsl
@@ -67,11 +67,34 @@ fn shadow(p: vec2, half: vec2, corner: f32, sigma: f32) -> f32 {
return value;
}
+// Distance from `p` to the tapered capsule from (-h, 0) to (h, 0) with round ends of radii
+// `r0` and `r1` (Inigo Quilez's uneven capsule).
+fn taper(p: vec2, h: f32, r0: f32, r1: f32) -> f32 {
+ let q = vec2(abs(p.y), p.x + h);
+ let span = 2.0 * h;
+ let b = (r0 - r1) / max(span, 1e-6);
+ let far = length(q - vec2(0.0, span)) - r1;
+ if abs(b) >= 1.0 {
+ return min(length(q) - r0, far);
+ }
+ let a = sqrt(1.0 - b * b);
+ let k = dot(q, vec2(-b, a));
+ if k < 0.0 {
+ return length(q) - r0;
+ }
+ if k > a * span {
+ return far;
+ }
+ return dot(q, vec2(a, b)) - r0;
+}
+
@fragment
fn fragment(input: Vertex) -> @location(0) vec4 {
var color = textureSample(atlas, atlas_sampler, input.uv) * input.color;
if input.blur > 0.0 {
color *= shadow(input.local, input.shape.xy, input.shape.z, input.blur);
+ } else if input.blur < 0.0 {
+ color *= clamp(0.5 - taper(input.local, input.shape.x, input.shape.y, input.shape.z), 0.0, 1.0);
} else if input.shape.x > 0.0 && input.shape.y > 0.0 {
let q = abs(input.local) - input.shape.xy + input.shape.zw;
var distance: f32;
diff --git a/crates/draw/src/edit.rs b/crates/draw/src/edit.rs
index a20da7df81ec0f3236b2bd9026e9ec27002de318..80e24eaff251b44f1a1c4501f12451642c3320f8 100644
--- a/crates/draw/src/edit.rs
+++ b/crates/draw/src/edit.rs
@@ -32,6 +32,7 @@ pub enum NamedKey {
End,
PageUp,
PageDown,
+ F7,
F11,
/// Shift, Control, Option or Command pressed alone.
Modifier,
diff --git a/crates/draw/src/render.rs b/crates/draw/src/render.rs
index 17bbdf9467395887b6cc8e7483ad5af8dff92206..0a1563b061f99fdd25f2978fb6cec2d1c1f8ea6c 100644
--- a/crates/draw/src/render.rs
+++ b/crates/draw/src/render.rs
@@ -13,7 +13,7 @@ use gl as backend;
use webgpu as backend;
pub use backend::Target;
-pub use icon::Palette;
+pub use icon::{Palette, picture_icon};
pub use text::{Decoration, Glyph, GlyphRun, Glyphs, paint_parley_run};
#[cfg(feature = "wgpu")]
pub use translucent::Translucent;
@@ -205,7 +205,8 @@ struct Vertex {
/// that rectangle's half size and corner radius; a zero half size paints everywhere.
clip_local: [f32; 2],
clip: [f32; 3],
- /// The standard deviation, in device pixels, of the blur that makes `shape` a shadow.
+ /// The standard deviation, in device pixels, of the blur that makes `shape` a shadow;
+ /// negative, `shape` is a tapered capsule's half length and end radii.
blur: f32,
}
@@ -429,6 +430,14 @@ pub enum Primitive<'a> {
round: bool,
color: [f32; 4],
},
+ /// A round pen's stroke between two points, `widths` units across at each, joined by the
+ /// lines touching both ends, as a pressure pen's width changes along a stroke.
+ Taper {
+ from: [f32; 2],
+ to: [f32; 2],
+ widths: [f32; 2],
+ color: [f32; 4],
+ },
/// A highlighter's stroke between two points, `width` units across with square ends:
/// its opaque `color` multiplies what lies beneath, so text under it stays dark.
Highlight {
@@ -860,7 +869,13 @@ impl Renderer {
width,
round,
color,
- } => self.segment(space, *from, *to, *width, *round, *color)?,
+ } => self.segment(space, *from, *to, [*width; 2], *round, *color)?,
+ Primitive::Taper {
+ from,
+ to,
+ widths,
+ color,
+ } => self.segment(space, *from, *to, *widths, true, *color)?,
Primitive::Highlight {
from,
to,
@@ -868,7 +883,7 @@ impl Renderer {
color,
} => {
blend = Blend::Multiply;
- self.segment(space, *from, *to, *width, false, *color)?;
+ self.segment(space, *from, *to, [*width; 2], false, *color)?;
}
Primitive::Image { image, rect } => {
if let Some(rect) = space.visible_rect(*rect)? {
@@ -1348,13 +1363,14 @@ impl Renderer {
Ok(())
}
- /// Draws the segment as a capsule in its own frame, reusing the rounded-rectangle distance.
+ /// Draws the segment as a capsule in its own frame, reusing the rounded-rectangle distance;
+ /// ends of two widths make it a tapered capsule, which the shader marks by a negative blur.
fn segment(
&mut self,
space: Space,
from: [f32; 2],
to: [f32; 2],
- width: f32,
+ widths: [f32; 2],
round: bool,
color: [f32; 4],
) -> Result<(), RenderError> {
@@ -1366,8 +1382,15 @@ impl Renderer {
};
let [from, to] = [pixel(from), pixel(to)];
// Hairlines stay one device pixel wide.
- let radius = (width * space.scale).max(1.0) * 0.5;
- if from.iter().chain(&to).chain(&color).any(|v| !v.is_finite()) || !radius.is_finite() {
+ let radii = widths.map(|width| (width * space.scale).max(1.0) * 0.5);
+ let radius = radii[0].max(radii[1]);
+ if from
+ .iter()
+ .chain(&to)
+ .chain(&color)
+ .chain(&radii)
+ .any(|v| !v.is_finite())
+ {
return Err(RenderError::InvalidPrimitive);
}
let pad = radius + 1.0;
@@ -1392,6 +1415,12 @@ impl Renderer {
let center = [(from[0] + to[0]) * 0.5, (from[1] + to[1]) * 0.5];
let half = [length * 0.5 + radius, radius];
let corner = if round { radius } else { 0.0 };
+ let tapered = radii[0] != radii[1];
+ let (shape, blur) = if tapered {
+ ([length * 0.5, radii[0], radii[1], 0.0], -1.0)
+ } else {
+ ([half[0], half[1], corner, corner], 0.0)
+ };
let [hx, hy] = [half[0] + 1.0, half[1] + 1.0];
for local in [
[-hx, -hy],
@@ -1411,11 +1440,11 @@ impl Renderer {
uv: [0.5 / self.atlas_side() as f32; 2],
color,
local,
- shape: [half[0], half[1], corner, corner],
+ shape,
stroke: 0.0,
clip_local: [0.0; 2],
clip: [0.0; 3],
- blur: 0.0,
+ blur,
});
}
Ok(())
diff --git a/crates/draw/src/render/icon.rs b/crates/draw/src/render/icon.rs
index b9a97c18d0bfab5511beb37060b12e6ab2b602ad..fb5c47a6184bd03dd676a496a497c4fd4bad4bd1 100644
--- a/crates/draw/src/render/icon.rs
+++ b/crates/draw/src/render/icon.rs
@@ -35,7 +35,8 @@ impl Palette {
/// `gradientTransform`). `fill-opacity` and `stroke-opacity` apply, and strokes have round
/// caps and joins. A slot's paths keep the shading among their colours: the hue turn,
/// saturation scale and lightness shift that carry the mean of the slot's colours in a
-/// source onto the palette's colour apply to each of them.
+/// source onto the palette's colour apply to each of them. A source's `image`s of PNG
+/// `data:` URLs, as `picture_icon` writes them, paint beneath its paths.
pub(crate) fn rasterize(sources: &[&str], size: u32, ink: [f32; 3], palette: &Palette) -> Image {
let side = size;
let size = size as f32;
@@ -43,6 +44,9 @@ pub(crate) fn rasterize(sources: &[&str], size: u32, ink: [f32; 3], palette: &Pa
for source in sources {
let svg = roxmltree::Document::parse(source).expect("Bundled icon SVG must be valid");
assert_eq!(svg.root_element().attribute("viewBox"), Some("0 0 16 16"));
+ for image in svg.descendants().filter(|node| node.has_tag_name("image")) {
+ picture(image, side, &mut pixels);
+ }
let paint = |value: &str| -> Option {
match value {
"none" => None,
@@ -174,6 +178,61 @@ pub(crate) fn rasterize(sources: &[&str], size: u32, ink: [f32; 3], palette: &Pa
}
}
+/// An icon source drawing the PNG `png` centred in the icon at its own proportions; none
+/// where it is not a picture.
+pub fn picture_icon(png: &[u8]) -> Option {
+ use base64::Engine;
+ let [width, height] = super::RasterImage::measure(png)
+ .ok()?
+ .map(|side| side as f32);
+ let scale = 16.0 / width.max(height);
+ let [width, height] = [width * scale, height * scale];
+ Some(format!(
+ r#""#,
+ (16.0 - width) / 2.0,
+ (16.0 - height) / 2.0,
+ base64::engine::general_purpose::STANDARD.encode(png),
+ ))
+}
+
+/// Paints `node`, a picture of `picture_icon`'s, over `pixels`, an icon `side` pixels
+/// square, filtered to the whole pixels its box covers.
+fn picture(node: roxmltree::Node, side: u32, pixels: &mut [[f32; 4]]) {
+ use base64::Engine;
+ let scale = side as f32 / 16.0;
+ let at = |name| {
+ let value: f32 = node.attribute(name).unwrap().parse().unwrap();
+ value * scale
+ };
+ let [x, y] = [at("x"), at("y")];
+ let [left, top, right, bottom] = [x, y, x + at("width"), y + at("height")]
+ .map(|edge| edge.round().clamp(0.0, side as f32) as u32);
+ let decoded = node
+ .attribute("href")
+ .and_then(|href| href.strip_prefix("data:image/png;base64,"))
+ .and_then(|data| base64::engine::general_purpose::STANDARD.decode(data).ok())
+ .and_then(|png| image::load_from_memory_with_format(&png, image::ImageFormat::Png).ok());
+ let Some(decoded) = decoded.filter(|_| right > left && bottom > top) else {
+ return;
+ };
+ let shown = image::imageops::resize(
+ &decoded.into_rgba8(),
+ right - left,
+ bottom - top,
+ image::imageops::FilterType::Triangle,
+ );
+ for (column, row, color) in shown.enumerate_pixels() {
+ let pixel = &mut pixels[((top + row) * side + left + column) as usize];
+ let [r, g, b, a] = color.0;
+ let alpha = f32::from(a) / 255.0;
+ let color = super::srgb(r, g, b);
+ for channel in 0..3 {
+ pixel[channel] = color[channel] * alpha + pixel[channel] * (1.0 - alpha);
+ }
+ pixel[3] = alpha + pixel[3] * (1.0 - alpha);
+ }
+}
+
fn hex(value: &str) -> [f32; 4] {
let [_, r, g, b] = u32::from_str_radix(value.strip_prefix('#').unwrap(), 16)
.unwrap()
@@ -550,6 +609,37 @@ mod tests {
assert_eq!(alpha(1, 8), 64);
}
+ /// A 2×1 PNG, red then half-transparent blue, fits the icon's width, centred, and paints
+ /// beneath the paths of later sources.
+ #[test]
+ fn pictures_fill_their_box_at_their_proportions() {
+ let mut png = Vec::new();
+ let mut encoder = png::Encoder::new(&mut png, 2, 1);
+ encoder.set_color(png::ColorType::Rgba);
+ encoder
+ .write_header()
+ .unwrap()
+ .write_image_data(&[255, 0, 0, 255, 0, 0, 255, 128])
+ .unwrap();
+ let source = picture_icon(&png).unwrap();
+ let image = rasterize(&[&source, MARK], 32, [1.0; 3], &Palette::default());
+ let pixel = |x: usize, y: usize| &image.data[(y * 32 + x) * 4..][..4];
+ // The picture spans rows 8 to 24 of 32.
+ assert_eq!(pixel(2, 4)[3], 0);
+ assert_eq!(pixel(2, 12), [255, 0, 0, 255]);
+ assert_eq!(pixel(30, 20), [0, 0, 255, 128]);
+ assert_eq!(pixel(30, 28)[3], 0);
+ let marked = rasterize(&[MARK], 32, [1.0; 3], &Palette::default());
+ let covered: Vec<_> = (0..32 * 32)
+ .filter(|at| marked.data[at * 4 + 3] == 255)
+ .collect();
+ assert!(!covered.is_empty());
+ for at in covered {
+ assert_eq!(image.data[at * 4..][..4], marked.data[at * 4..][..4]);
+ }
+ assert!(picture_icon(b"not a picture").is_none());
+ }
+
#[test]
fn icons_keep_transparency_and_overlays_across_scales() {
for size in [8, 16, 32, 57] {
diff --git a/crates/mobile/Cargo.toml b/crates/mobile/Cargo.toml
index 17bbb9869db37d1ab4c1d238b5f9dc82a8234b78..17872d7bc3d090968c663c7d63b04966b765163a 100644
--- a/crates/mobile/Cargo.toml
+++ b/crates/mobile/Cargo.toml
@@ -20,5 +20,9 @@ resvg = { version = "0.48.1", default-features = false }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
+[target.'cfg(target_os = "ios")'.dependencies]
+objc2 = "0.5.2"
+objc2-foundation = { version = "0.2.2", default-features = false, features = ["std", "NSArray", "NSEnumerator", "NSRange", "NSString", "NSThread"] }
+
[dev-dependencies]
tempfile = "3"
diff --git a/crates/mobile/include/snowbound.h b/crates/mobile/include/snowbound.h
index 6fe7efd7c1f32e635d4f04ca2d1cbed9438fd88a..8fc62185998e1927a29306bf237fe1b532fb035a 100644
--- a/crates/mobile/include/snowbound.h
+++ b/crates/mobile/include/snowbound.h
@@ -15,6 +15,9 @@ void sb_string_free(char *text);
typedef void (*sb_coordinator)(const char *path, bool write, void (*body)(void *), void *context);
void sb_set_coordinator(sb_coordinator coordinator);
void sb_set_sync_wake(void (*wake)(void));
+typedef void (*sb_versions)(const char *path, void (*found)(void *, const char *id, const char *device), void *context);
+typedef bool (*sb_retire)(const char *path, const char *id, bool keep);
+void sb_set_versions(sb_versions versions, sb_retire retire);
char *sb_tags(void);
char *sb_pens(uint32_t section);
bool sb_tag_icon(uint16_t shape, bool checked, uint32_t pixels, uint8_t *rgba);
@@ -22,6 +25,9 @@ bool sb_tag_icon(uint16_t shape, bool checked, uint32_t pixels, uint8_t *rgba);
const Library *sb_library_open(const char *path, const char *cache, bool local, char **error);
const Library *sb_library_server(const char *address, const char *share, const char *user, const char *password,
const char *domain, const char *root, const char *cache, char **error);
+bool sb_notebook_create(const char *path, const char *cache, const char *author, const char *date, const char *time,
+ char **error);
+bool sb_notebook_moved(const char *cache, const char *from, const char *to, char **error);
char *sb_library_sections(const Library *library);
char *sb_library_new_section(const Library *library, const char *folder, const char *name, const char *author,
const char *date, const char *time);
@@ -31,6 +37,7 @@ char *sb_library_sync_status(const Library *library);
void sb_library_set_offline(const Library *library, bool offline);
void sb_library_touched(const Library *library, const char *path);
void sb_library_sync_now(const Library *library);
+bool sb_library_close(const Library *library, double seconds, char **error);
void sb_library_free(const Library *library);
Share *sb_share_connect(const char *address, const char *share, const char *user, const char *password,
@@ -62,6 +69,7 @@ void sb_view_content(View *view, float bounds[4]);
bool sb_view_block(const View *view, float x, float y, float rect[4]);
void sb_view_set_transform(View *view, float zoom, float x, float y);
uint8_t sb_view_target(const View *view, float x, float y);
+void sb_view_pressure(View *view, float pressure);
bool sb_view_press(View *view, float x, float y);
bool sb_view_drag(View *view, float x, float y);
bool sb_view_release(View *view);
@@ -69,6 +77,8 @@ bool sb_view_undo(View *view, bool redo);
bool sb_view_can_undo(const View *view, bool redo);
uint64_t sb_view_format(const View *view);
bool sb_view_apply(View *view, uint8_t command);
+char *sb_view_correction(const View *view);
+bool sb_view_correct(View *view, uint8_t command, const char *text);
char *sb_view_title(const View *view);
bool sb_view_focus_title(View *view);
bool sb_view_find(View *view, const char *query);
diff --git a/crates/mobile/src/lib.rs b/crates/mobile/src/lib.rs
index a4f04877bd300fff70f13306d0f8566da053d739..b61e49bba1a45f71b8f78c9249aa1421f44d5ef6 100644
--- a/crates/mobile/src/lib.rs
+++ b/crates/mobile/src/lib.rs
@@ -8,6 +8,8 @@
//! the host redraws and rereads `sb_view_content`.
mod library;
+#[cfg(target_os = "ios")]
+mod spell;
use library::Shared;
pub use library::{Library, Section, Share};
@@ -512,8 +514,10 @@ impl Canvas {
},
size: Some(size),
bytes: Some(bytes.into()),
+ display: None,
alt: None,
background: false,
+ printout: None,
};
let page = &mut self.page;
page.editor.insert_picture(&mut page.engine, image)?;
@@ -681,11 +685,21 @@ impl View {
.ok_or("No supported surface configuration")?;
surface.configure(&gpu.renderer.device, &config);
let (page, read_only) = section.shared.page(space)?;
+ let frame = Arc::::default();
+ #[cfg_attr(not(target_os = "ios"), expect(unused_mut))]
+ let mut canvas = Canvas::new(space, page, pixels, scale)?;
+ #[cfg(target_os = "ios")]
+ {
+ canvas.page.spelling = Some(canvas::spelling::Spelling::new(
+ spell::dictionary(),
+ Waker::from(frame.clone()),
+ ));
+ }
Ok(Self {
- canvas: ManuallyDrop::new(Canvas::new(space, page, pixels, scale)?),
+ canvas: ManuallyDrop::new(canvas),
surface,
config,
- frame: Arc::default(),
+ frame,
section: Arc::clone(§ion.shared),
read_only,
})
@@ -916,6 +930,15 @@ pub extern "C" fn sb_view_press(view: &mut View, x: f32, y: f32) -> bool {
view.stored(result)
}
+/// The Pencil's pressure at the touch's next point, from 0 to 1; below 0 for a finger, whose
+/// strokes keep their pen's width.
+#[unsafe(no_mangle)]
+pub extern "C" fn sb_view_pressure(view: &mut View, pressure: f32) {
+ view.canvas
+ .page
+ .set_pressure((pressure >= 0.0).then_some(pressure));
+}
+
#[unsafe(no_mangle)]
pub extern "C" fn sb_view_drag(view: &mut View, x: f32, y: f32) -> bool {
report(view.canvas.drag([x, y])).unwrap_or(false)
@@ -960,6 +983,60 @@ pub extern "C" fn sb_view_apply(view: &mut View, command: u8) -> bool {
view.stored(result)
}
+/// The marked word at the caret, or selected, as JSON `{"word", "suggestions",
+/// "repeated"}`; null where there is none.
+#[unsafe(no_mangle)]
+pub extern "C" fn sb_view_correction(view: &View) -> *mut c_char {
+ #[derive(serde::Serialize)]
+ struct Shown {
+ word: String,
+ suggestions: Vec,
+ repeated: bool,
+ }
+ view.canvas
+ .page
+ .selected_correction()
+ .map_or(std::ptr::null_mut(), |correction| {
+ library::json(Ok(Shown {
+ word: correction.word,
+ suggestions: correction.suggestions,
+ repeated: correction.repeated,
+ }))
+ })
+}
+
+/// Acts on the word `sb_view_correction` names: 0 replaces it with `text`, empty to delete a
+/// repeated word; 1 ignores it; 2 adds it to the dictionary. True where the text changed.
+///
+/// # Safety
+/// `text` is NUL-terminated UTF-8, or null for 1 and 2.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sb_view_correct(
+ view: &mut View,
+ command: u8,
+ text: *const c_char,
+) -> bool {
+ let page = &mut view.canvas.page;
+ let (Some(correction), Some(spelling)) = (page.selected_correction(), page.spelling.clone())
+ else {
+ return false;
+ };
+ match command {
+ 0 => {
+ let result = page.correct(&correction, &string(text));
+ view.stored(result.map(moved))
+ }
+ 1 => {
+ spelling.ignore(&correction.word);
+ false
+ }
+ _ => {
+ spelling.learn(&correction.word);
+ false
+ }
+ }
+}
+
/// The page title's text; null on a page without an editable title.
#[unsafe(no_mangle)]
pub extern "C" fn sb_view_title(view: &View) -> *mut c_char {
diff --git a/crates/mobile/src/library.rs b/crates/mobile/src/library.rs
index ca383a9249493d73592f22cd10b72a16c05afbf8..d1a556f5ca2bb65245c55b06e071a5ea48236a15 100644
--- a/crates/mobile/src/library.rs
+++ b/crates/mobile/src/library.rs
@@ -6,7 +6,7 @@ use crate::{Result, owned, report, string};
use canvas::search::{Entry, Index, Query, Tagged};
use notebook::{
Remote, Replica,
- discover::{Folder, SectionState},
+ discover::{Folder, Reason, SectionState},
session::{self, Background, Event, Known, Notebook, SyncStatus},
smb::{Client, Credentials},
};
@@ -87,6 +87,28 @@ pub(crate) fn coordinated T, T>(path: &Path, write: bool, work: F
.ok_or_else(|| io::Error::other("Another app is using the notebook's file; try again."))
}
+/// Calls `found(context, id, device)` for each conflict version the host's file provider keeps
+/// beside the file at `path`, as iCloud Drive keeps another device's commit that lost:
+/// `id` is a file the version's contents read from, `device` who saved it or null.
+pub type Versions = extern "C" fn(
+ path: *const c_char,
+ found: extern "C" fn(*mut c_void, *const c_char, *const c_char),
+ context: *mut c_void,
+);
+
+/// Marks version `id` of the file at `path` resolved and removes it, first keeping a copy
+/// beside the file when `keep`; false when it could not.
+pub type Retire = extern "C" fn(path: *const c_char, id: *const c_char, keep: bool) -> bool;
+
+static VERSIONS: OnceLock<(Versions, Retire)> = OnceLock::new();
+
+/// Merges the conflict versions the host lists into their files from now on, then has the
+/// host retire them; set once, before any library opens.
+#[unsafe(no_mangle)]
+pub extern "C" fn sb_set_versions(versions: Versions, retire: Retire) {
+ let _ = VERSIONS.set((versions, retire));
+}
+
/// A local section file read and published under the host's file coordination.
struct Coordinated(PathBuf);
@@ -116,6 +138,42 @@ impl Remote for Coordinated {
fn confirm(&mut self, base: &Stamp) -> std::result::Result<(), CommitError> {
coordinated(&self.0, true, || onestore::confirm_file(&self.0, base)).map_err(uncommitted)?
}
+
+ fn versions(&mut self) -> io::Result> {
+ let Some((versions, _)) = VERSIONS.get() else {
+ return Ok(Vec::new());
+ };
+ extern "C" fn found(context: *mut c_void, id: *const c_char, device: *const c_char) {
+ // SAFETY: `context` is the list below, alive for the host's call.
+ let listed = unsafe { &mut *context.cast::>() };
+ listed.push(notebook::Version {
+ id: string(id),
+ device: (!device.is_null()).then(|| string(device)),
+ });
+ }
+ let mut listed: Vec = Vec::new();
+ let path = CString::new(self.0.as_os_str().as_encoded_bytes())?;
+ versions(path.as_ptr(), found, (&raw mut listed).cast());
+ Ok(listed)
+ }
+
+ /// A version's contents never change: they read without coordination.
+ fn version(&mut self, id: &str) -> io::Result> {
+ std::fs::read(id)
+ }
+
+ fn retire(&mut self, id: &str, keep: bool) -> io::Result<()> {
+ let Some((_, retire)) = VERSIONS.get() else {
+ return Ok(());
+ };
+ let path = CString::new(self.0.as_os_str().as_encoded_bytes())?;
+ let id = CString::new(id)?;
+ if retire(path.as_ptr(), id.as_ptr(), keep) {
+ Ok(())
+ } else {
+ Err(io::Error::other("The version could not be retired"))
+ }
+ }
}
fn uncommitted(error: io::Error) -> CommitError {
@@ -169,7 +227,7 @@ enum Place {
#[derive(serde::Serialize, serde::Deserialize)]
struct Listed {
tabs: Vec,
- /// Each section's file identity in hex, which names its replica, by catalog path.
+ /// Each readable section's file identity in hex, which names its replica, by catalog path.
files: BTreeMap,
}
@@ -177,10 +235,14 @@ fn hex(bytes: &[u8]) -> String {
bytes.iter().map(|byte| format!("{byte:02x}")).collect()
}
-/// Every section's file identity in `folder` and its groups, by catalog path.
-fn files(folder: &Folder, files: &mut BTreeMap) {
+/// Every readable section's file identity in `folder` and its groups, by catalog path, as
+/// `Notebook::replicas` lists a local notebook's. `Client::read` answers a protected section
+/// as it does one mid-write (WouldBlock), so syncing one would show it in use for good.
+pub(crate) fn files(folder: &Folder, files: &mut BTreeMap) {
for section in &folder.sections {
- files.insert(section.path.clone(), hex(§ion.file_id));
+ if matches!(section.state, SectionState::Readable { .. }) {
+ files.insert(section.path.clone(), hex(§ion.file_id));
+ }
}
for group in &folder.groups {
self::files(group, files);
@@ -205,8 +267,15 @@ pub struct Library {
open: Mutex)>>,
/// Work Offline, which sections opened later follow too.
offline: AtomicBool,
+ /// How long edits wait for a pause in typing before they publish (`Section::set_pause`):
+ /// a file provider such as iCloud Drive uploads each publication, and makes one concurrent
+ /// with another device's a conflict version.
+ pause: Duration,
}
+/// The pause edits to a file a provider keeps elsewhere wait for.
+const PAUSE: Duration = Duration::from_secs(3);
+
#[derive(serde::Serialize, serde::Deserialize)]
pub(crate) struct Tab {
pub(crate) name: String,
@@ -218,6 +287,15 @@ pub(crate) struct Tab {
pub(crate) color: [u8; 3],
/// Password-protected or unreadable sections list but do not open.
pub(crate) readable: bool,
+ /// Not on this device yet, as iCloud Drive keeps it elsewhere; the host downloads it.
+ #[serde(default)]
+ pub(crate) downloading: bool,
+ /// The name of the section this file copies, which opens instead.
+ #[serde(default)]
+ pub(crate) copy: Option,
+ /// Why the file could not be read, where retrying or repair may help.
+ #[serde(default)]
+ pub(crate) problem: Option,
}
fn rgb(colorref: u32) -> [u8; 3] {
@@ -246,6 +324,9 @@ fn tabs(folder: &Folder, tabs: &mut Vec) {
group: folder.path.clone(),
color: rgb(color.unwrap_or(SECTION_COLOR)),
readable,
+ downloading: false,
+ copy: None,
+ problem: None,
});
}
for entry in folder.unavailable.iter().filter(|entry| !entry.group) {
@@ -255,6 +336,16 @@ fn tabs(folder: &Folder, tabs: &mut Vec) {
group: folder.path.clone(),
color: rgb(SECTION_COLOR),
readable: false,
+ downloading: entry.reason == Reason::Evicted,
+ copy: match &entry.reason {
+ Reason::Copy { of } => Some(stem(of)),
+ _ => None,
+ },
+ problem: match entry.reason {
+ Reason::InUse => Some("Section in use".into()),
+ Reason::Unreadable => Some("Can’t read this section".into()),
+ _ => None,
+ },
});
}
for group in &folder.groups {
@@ -294,6 +385,7 @@ impl Library {
background,
open: Mutex::default(),
offline: AtomicBool::new(false),
+ pause: if local { Duration::ZERO } else { PAUSE },
})
}
@@ -315,6 +407,7 @@ impl Library {
background: Some(background),
open: Mutex::default(),
offline: AtomicBool::new(false),
+ pause: Duration::ZERO,
};
let reached = library.with_notebook(false, |_| Ok(()));
match library.listed() {
@@ -326,16 +419,15 @@ impl Library {
/// Has the background sync a share notebook's sections, `files` as `Listed` keeps them.
fn watch(&self, files: &BTreeMap) {
- let Some(background) = &self.background else {
+ let (Some(background), Some(replicas)) = (&self.background, self.share_replicas()) else {
return;
};
- let smb = self.cache.join("smb");
background.watch(
files
.iter()
.map(|(path, identity)| Known {
path: path.clone(),
- replica: Some(smb.join(format!("{identity}.sqlite"))),
+ replica: Some(replicas.join(format!("{identity}.sqlite"))),
found: None,
image: None,
})
@@ -343,6 +435,15 @@ impl Library {
);
}
+ /// The cache folder of a share notebook's replicas.
+ fn share_replicas(&self) -> Option {
+ let Place::Share { server, root, .. } = &self.place else {
+ return None;
+ };
+ let location = notebook::location::smb(&server.address, &server.share, root);
+ Some(notebook::location::folder(&self.cache, &location))
+ }
+
/// Where a share notebook's last listing is kept.
fn listing(&self) -> Option {
let Place::Share { server, root, .. } = &self.place else {
@@ -418,6 +519,9 @@ impl Library {
group: String::new(),
color: rgb(SECTION_COLOR),
readable: true,
+ downloading: false,
+ copy: None,
+ problem: None,
}]);
}
let listed = self.with_notebook(false, |notebook| {
@@ -472,6 +576,7 @@ impl Library {
}
};
section.set_offline(self.offline.load(Ordering::Relaxed));
+ section.set_pause(self.pause);
if let Some(background) = &self.background {
background.hold(path, §ion);
}
@@ -505,13 +610,15 @@ impl Library {
.listed()
.and_then(|mut listed| listed.files.remove(path))
.ok_or("The notebook hasn’t listed this section")?;
- let cache = self.cache.join("smb").join(format!("{identity}.sqlite"));
+ let replicas = self.share_replicas().ok_or("Not a share")?;
+ let cache = replicas.join(format!("{identity}.sqlite"));
let replica = if cache.exists() {
Replica::open(&cache)?
} else {
let client = self
.client()
.ok_or("The server can’t be reached, and this section hasn’t been opened here before.")?;
+ std::fs::create_dir_all(&replicas)?;
Replica::create(&cache, &client.read_storage(&file, LIMIT)?)?
};
let server = Arc::clone(server);
@@ -904,6 +1011,71 @@ impl Library {
.collect()
}
+ /// Publishes every edit the notebook's replicas hold within `limit`, then lets go of the
+ /// notebook as OneNote closes one: nothing syncs from then on, and each replica holding
+ /// nothing unpublished is deleted once no session holds it. An error leaves it syncing.
+ pub(crate) fn close(&self, limit: Duration) -> Result<()> {
+ const WAITING: &str = "Some changes haven’t been saved to the notebook yet.";
+ let deadline = Instant::now() + limit;
+ let open = self.open_sections();
+ for (_, shared) in &open {
+ while !shared.section.pending()?.is_empty() {
+ if Instant::now() >= deadline {
+ return Err(WAITING.into());
+ }
+ shared.section.wake();
+ std::thread::sleep(Duration::from_millis(50));
+ }
+ }
+ let Some(background) = &self.background else {
+ return Ok(());
+ };
+ let before: HashMap> = background
+ .status()
+ .into_iter()
+ .map(|(path, status)| (path, status.synced))
+ .collect();
+ // Sections without a replica hold nothing to publish.
+ let replicas: Vec<&String> = {
+ let notebook = self.notebook();
+ before
+ .keys()
+ .filter(|path| !open.iter().any(|(held, _)| held == *path))
+ .filter(|path| {
+ notebook
+ .as_ref()
+ .and_then(|notebook| notebook.replica_path(path).ok())
+ .is_some_and(|replica| replica.exists())
+ })
+ .collect()
+ };
+ loop {
+ // Working offline, the background checks only when woken.
+ background.wake();
+ let status = background.status();
+ let mut waiting = replicas.iter().filter_map(|path| {
+ match status.iter().find(|(listed, _)| listed == *path) {
+ Some((_, status))
+ if status.queued == 0
+ && status.error.is_none()
+ && status.synced > before[*path] =>
+ {
+ None
+ }
+ Some((_, status)) => Some(status.error.as_ref().map(ToString::to_string)),
+ None => Some(None),
+ }
+ });
+ let Some(error) = waiting.next() else { break };
+ if Instant::now() >= deadline {
+ return Err(error.unwrap_or_else(|| WAITING.to_owned()).into());
+ }
+ std::thread::sleep(Duration::from_millis(50));
+ }
+ background.discard();
+ Ok(())
+ }
+
fn open_sections(&self) -> Vec<(String, Arc)> {
let mut open = self.open.lock().unwrap_or_else(|error| error.into_inner());
open.retain(|(_, shared)| shared.strong_count() > 0);
@@ -1091,8 +1263,56 @@ pub unsafe extern "C" fn sb_library_server(
}
}
+/// Creates the notebook folder `path` holding one section with one page titled with `date`
+/// and `time`, as OneNote's New Notebook does; `sb_library_open` opens it. False, with
+/// `error` set, when it cannot be made.
+///
+/// # Safety
+/// Every string is NUL-terminated UTF-8; `error` is null or a place for a string.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sb_notebook_create(
+ path: *const c_char,
+ cache: *const c_char,
+ author: *const c_char,
+ date: *const c_char,
+ time: *const c_char,
+ error: *mut *mut c_char,
+) -> bool {
+ let created = dated(&string(author), &string(date), &string(time)).and_then(|page| {
+ Notebook::create(string(path), string(cache), Notebook::NEW_COLOR, &page)?;
+ Ok(())
+ });
+ created.map_err(|cause| failed(cause, error)).is_ok()
+}
+
+/// Moves the replicas of the notebook folder or lone section file the app has just moved
+/// from `from` to `to`, so that its edits waiting there still publish. False, with `error`
+/// set, when they cannot be moved.
+///
+/// # Safety
+/// Every string is NUL-terminated UTF-8; `error` is null or a place for a string.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sb_notebook_moved(
+ cache: *const c_char,
+ from: *const c_char,
+ to: *const c_char,
+ error: *mut *mut c_char,
+) -> bool {
+ let moved = || -> Result<()> {
+ let from = notebook::location::local(Path::new(&string(from)))?;
+ let to = notebook::location::local(Path::new(&string(to)))?;
+ Ok(notebook::location::moved(
+ Path::new(&string(cache)),
+ &from,
+ &to,
+ )?)
+ };
+ moved().map_err(|cause| failed(cause, error)).is_ok()
+}
+
/// The notebook's sections read again, as JSON: each with `name`, `path`, `group`,
-/// `color` as sRGB bytes and `readable`, in the notebook's order; null if it cannot be read.
+/// `color` as sRGB bytes, `readable`, `downloading` and `copy`, in the notebook's order; null
+/// if it cannot be read.
#[unsafe(no_mangle)]
pub extern "C" fn sb_library_sections(library: &Library) -> *mut c_char {
json(library.tabs())
@@ -1202,6 +1422,24 @@ pub extern "C" fn sb_library_sync_now(library: &Library) {
}
}
+/// Publishes every edit the notebook holds within `seconds`, then lets go of it
+/// (`Library::close`) so its folder can be moved or deleted: false, with `error` set, while
+/// an edit is still unpublished, and the notebook syncs on.
+///
+/// # Safety
+/// `error` is null or a place for a string.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sb_library_close(
+ library: &Library,
+ seconds: f64,
+ error: *mut *mut c_char,
+) -> bool {
+ library
+ .close(Duration::from_secs_f64(seconds))
+ .map_err(|cause| failed(cause, error))
+ .is_ok()
+}
+
/// # Safety
/// `library` came from `sb_library_open` or `sb_library_server` and is not used again.
#[unsafe(no_mangle)]
diff --git a/crates/mobile/src/spell.rs b/crates/mobile/src/spell.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b9645c707f327c385c33e2706c61949532ef6d7f
--- /dev/null
+++ b/crates/mobile/src/spell.rs
@@ -0,0 +1,105 @@
+//! Spelling through UIKit's UITextChecker, which the spelling thread reaches on the main
+//! thread, as UIKit's objects expect.
+
+use canvas::spelling::{Dictionary, pick};
+use objc2::{class, msg_send, msg_send_id, rc::Retained, runtime::AnyObject};
+use objc2_foundation::{MainThreadMarker, NSArray, NSRange, NSString};
+use std::ffi::c_void;
+
+unsafe extern "C" {
+ /// The main queue; only its address matters.
+ static _dispatch_main_q: u8;
+ fn dispatch_sync_f(queue: *mut c_void, context: *mut c_void, work: extern "C" fn(*mut c_void));
+}
+
+/// Runs `work` on the main thread, waiting for it.
+fn on_main R + Send, R: Send>(work: F) -> R {
+ if MainThreadMarker::new().is_some() {
+ return work();
+ }
+ extern "C" fn run R, R>(context: *mut c_void) {
+ let (work, result) = unsafe { &mut *context.cast::<(Option, Option)>() };
+ *result = work.take().map(|work| work());
+ }
+ let mut slot = (Some(work), None);
+ unsafe {
+ dispatch_sync_f(
+ (&raw const _dispatch_main_q).cast_mut().cast(),
+ (&raw mut slot).cast(),
+ run::,
+ );
+ }
+ slot.1.expect("the main queue ran the work")
+}
+
+fn checker() -> Retained {
+ unsafe { msg_send_id![class!(UITextChecker), new] }
+}
+
+struct Checker {
+ /// The spelling languages the system has, as `en_US`.
+ languages: Vec,
+}
+
+impl Dictionary for Checker {
+ fn misspelled(&self, words: &[(&str, u32)]) -> Vec {
+ on_main(|| {
+ let checker = checker();
+ words
+ .iter()
+ .map(|(word, lcid)| {
+ let Some(language) = pick(*lcid, &self.languages) else {
+ return false;
+ };
+ let word = NSString::from_str(word);
+ let found: NSRange = unsafe {
+ msg_send![&checker,
+ rangeOfMisspelledWordInString: &*word,
+ range: NSRange::new(0, word.length()),
+ startingAt: 0isize,
+ wrap: false,
+ language: &*NSString::from_str(language)]
+ };
+ found.length > 0
+ })
+ .collect()
+ })
+ }
+
+ fn suggest(&self, word: &str, lcid: u32) -> Vec {
+ on_main(|| {
+ let Some(language) = pick(lcid, &self.languages) else {
+ return Vec::new();
+ };
+ let word = NSString::from_str(word);
+ let guesses: Option>> = unsafe {
+ msg_send_id![&checker(),
+ guessesForWordRange: NSRange::new(0, word.length()),
+ inString: &*word,
+ language: &*NSString::from_str(language)]
+ };
+ guesses.map_or_else(Vec::new, |guesses| {
+ guesses.iter().map(|guess| guess.to_string()).collect()
+ })
+ })
+ }
+
+ fn learn(&self, word: &str) {
+ on_main(|| unsafe {
+ let _: () = msg_send![class!(UITextChecker), learnWord: &*NSString::from_str(word)];
+ });
+ }
+}
+
+/// UIKit's spell checker with the languages the system has.
+pub fn dictionary() -> Box {
+ let languages = on_main(|| {
+ let languages: Retained> =
+ unsafe { msg_send_id![class!(UITextChecker), availableLanguages] };
+ languages
+ .iter()
+ .map(|language| language.to_string())
+ .collect()
+ });
+ Box::new(Checker { languages })
+}
diff --git a/crates/mobile/src/tests.rs b/crates/mobile/src/tests.rs
index 8168d3391e6990d4210a9f0969b1f53b9c45d869..8a0acf7c282f2e2158de67ee10c8498a633a4e66 100644
--- a/crates/mobile/src/tests.rs
+++ b/crates/mobile/src/tests.rs
@@ -104,6 +104,35 @@ fn a_notebook_folder_lists_sections_in_order_with_groups_and_colours() {
assert_eq!(lone.tabs().unwrap().len(), 1);
}
+#[test]
+fn a_new_notebook_opens_with_one_section_and_refuses_a_taken_name() {
+ let directory = tempfile::tempdir().unwrap();
+ let root = directory.path().join("Mine");
+ let cache = directory.path().join("cache");
+ std::fs::create_dir(&cache).unwrap();
+ let c = |path: &Path| CString::new(path.to_str().unwrap()).unwrap();
+ let create = |error: &mut *mut c_char| unsafe {
+ library::sb_notebook_create(
+ c(&root).as_ptr(),
+ c(&cache).as_ptr(),
+ c"Clover Test".as_ptr(),
+ c"Tuesday, September 29, 2026".as_ptr(),
+ c"9:41 AM".as_ptr(),
+ error,
+ )
+ };
+ let mut error = std::ptr::null_mut();
+ assert!(create(&mut error));
+ assert!(error.is_null());
+ let library = Library::open(&root, &cache, true).unwrap();
+ let tabs = library.tabs().unwrap();
+ assert_eq!(tabs.len(), 1);
+ assert!(tabs[0].readable);
+ assert!(!create(&mut error));
+ assert!(!error.is_null());
+ unsafe { sb_string_free(error) };
+}
+
#[test]
fn touches_route_to_text_the_page_and_the_focused_outlines_grip() {
let (_directory, section) = features();
@@ -496,22 +525,24 @@ fn to_do_marks_a_new_pages_body() {
assert_eq!(tags, 1);
}
-/// Against the Samba lab (`ONESTORE_SMB_LAB=127.0.0.1:PORT`, share `agent`, guest): a
-/// notebook folder copied to the share lists, a section opens and publishes typing, and the
-/// listing kept in the cache opens the section again while the server cannot be reached.
+/// Against a disposable share `agent` (`ONESTORE_SMB_LAB=HOST:PORT`, as
+/// `SNOWBOUND_TEST_SMB_USER` with `SNOWBOUND_TEST_SMB_PASSWORD`, or a guest): a notebook
+/// folder copied to the share lists, a section opens and publishes typing, and the listing
+/// kept in the cache opens the section again while the server cannot be reached.
#[test]
-#[ignore = "requires ONESTORE_SMB_LAB pointing to disposable Samba"]
+#[ignore = "requires ONESTORE_SMB_LAB pointing to a disposable share"]
fn a_notebook_on_a_share_saves_and_opens_offline() {
let address = std::env::var("ONESTORE_SMB_LAB").unwrap();
+ let variable = |name| std::env::var(name).unwrap_or_default();
let server = |address: &str| library::Server {
address: address.into(),
share: "agent".into(),
- user: String::new(),
- password: String::new(),
+ user: variable("SNOWBOUND_TEST_SMB_USER"),
+ password: variable("SNOWBOUND_TEST_SMB_PASSWORD"),
domain: String::new(),
};
let client = server(&address).connect().unwrap();
- let root = format!("mobile-{}", std::process::id());
+ let root = format!("snowbound-test-mobile-{}", std::process::id());
client.create_directory(&root).unwrap();
let source = corpus("media-edit/candidate/Features.one");
client
@@ -552,6 +583,12 @@ fn a_notebook_on_a_share_saves_and_opens_offline() {
))
};
std::fs::copy(listing(&address), listing(&format!("{host}:9"))).unwrap();
+ notebook::location::moved(
+ cache.path(),
+ ¬ebook::location::smb(&address, "agent", &root),
+ ¬ebook::location::smb(&format!("{host}:9"), "agent", &root),
+ )
+ .unwrap();
let offline = Arc::new(Library::server(unreachable, &root, cache.path()).unwrap());
assert_eq!(offline.tabs().unwrap()[0].path, "Features.one");
let reopened = open(&offline, "Features.one");
@@ -561,6 +598,23 @@ fn a_notebook_on_a_share_saves_and_opens_offline() {
.unwrap()
.0;
assert!(canvas::search::page_text(&page).contains("Shared "));
+ client.delete(&format!("{root}/Features.one")).unwrap();
+ client.delete(&root).unwrap();
+}
+
+#[test]
+fn a_share_notebook_syncs_only_its_readable_sections() {
+ let (directory, root) = copy("native-encrypted/cold-encrypted-02/notebook");
+ std::fs::copy(
+ corpus("m6/native-features-01/notebook/Empty.one"),
+ root.join("Empty.one"),
+ )
+ .unwrap();
+ let notebook =
+ notebook::session::Notebook::open(&root, directory.path().join("cache")).unwrap();
+ let mut files = std::collections::BTreeMap::new();
+ library::files(notebook.catalog(), &mut files);
+ assert_eq!(files.keys().collect::>(), ["Empty.one"]);
}
/// Paths the test coordinator was asked for, with whether to write.
@@ -965,3 +1019,72 @@ fn the_accent_pen_and_shapes_draw_as_the_desktop_and_a_cancelled_sweep_stores_no
assert!(!canvas.page.editor.can_redo());
assert_eq!(stored_ink(§ion, space).len(), before + 2);
}
+
+/// Queues an offline edit to Features.one and closes its session, leaving the edit to the
+/// background; the replicas in the cache, and the text edited in.
+fn unpublished_edit() -> (tempfile::TempDir, PathBuf, Arc, ExGuid) {
+ let (directory, root, library, section) = notebook_open("Features.one");
+ sb_library_set_offline(&library, true);
+ let mut canvas = canvas(§ion, "Paragraph controls");
+ focus(&mut canvas, "Collapsed parent");
+ canvas.insert("Unpublished ".into()).unwrap();
+ section
+ .shared
+ .apply(canvas.edit().unwrap().unwrap())
+ .unwrap();
+ assert!(eventually(|| !section
+ .shared
+ .section
+ .pending()
+ .unwrap()
+ .is_empty()));
+ let space = canvas.space;
+ drop(canvas);
+ drop(section);
+ (directory, root, library, space)
+}
+
+fn replicas(directory: &tempfile::TempDir) -> usize {
+ let Ok(folders) = std::fs::read_dir(directory.path().join("cache/replicas")) else {
+ return 0;
+ };
+ folders
+ .filter_map(|folder| std::fs::read_dir(folder.ok()?.path()).ok())
+ .flatten()
+ .filter(|entry| {
+ entry
+ .as_ref()
+ .is_ok_and(|entry| entry.path().extension() == Some("sqlite".as_ref()))
+ })
+ .count()
+}
+
+#[test]
+fn closing_publishes_a_pending_edit_so_the_notebook_renames_without_orphans() {
+ let (directory, root, library, space) = unpublished_edit();
+ library.close(Duration::from_secs(20)).unwrap();
+ assert!(stored_text(&root.join("Features.one"), space).contains("Unpublished "));
+ drop(library);
+ assert!(eventually(|| replicas(&directory) == 0));
+ let renamed = directory.path().join("Renamed");
+ std::fs::rename(&root, &renamed).unwrap();
+ let library = Arc::new(Library::open(&renamed, &directory.path().join("cache"), true).unwrap());
+ let section = open(&library, "Features.one");
+ let canvas = canvas(§ion, "Paragraph controls");
+ assert!(stored_text(&renamed.join("Features.one"), canvas.space).contains("Unpublished "));
+}
+
+#[test]
+fn closing_refuses_while_an_edit_cannot_publish_then_deletes_nothing_pending() {
+ let (directory, root, library, space) = unpublished_edit();
+ let away = directory.path().join("Away");
+ std::fs::rename(&root, &away).unwrap();
+ assert!(library.close(Duration::from_secs(2)).is_err());
+ assert!(replicas(&directory) > 0);
+ std::fs::rename(&away, &root).unwrap();
+ library.close(Duration::from_secs(20)).unwrap();
+ assert!(stored_text(&root.join("Features.one"), space).contains("Unpublished "));
+ drop(library);
+ std::fs::remove_dir_all(&root).unwrap();
+ assert!(eventually(|| replicas(&directory) == 0));
+}
diff --git a/crates/notebook/Cargo.toml b/crates/notebook/Cargo.toml
index be20d9945a195e6b3cecd1af67c01d0e0a5df09a..9258c4f86855d4698660c154e6e8d3fff601ca21 100644
--- a/crates/notebook/Cargo.toml
+++ b/crates/notebook/Cargo.toml
@@ -20,6 +20,9 @@ smb2 = { version = "=0.21.0", optional = true }
tokio = { version = "1", features = ["rt-multi-thread", "time"], optional = true }
zeroize = { version = "1.9.0", optional = true }
+[target.'cfg(target_vendor = "apple")'.dependencies]
+nix = { version = "0.31", default-features = false, features = ["fs"] }
+
[dev-dependencies]
libc = "0.2"
serde_json = "1"
diff --git a/crates/notebook/README.md b/crates/notebook/README.md
index d279763268590404e74b0d14ed21860c6ac29b6e..36badc0f89383ffc5ee76954de3e35740f331c9c 100644
--- a/crates/notebook/README.md
+++ b/crates/notebook/README.md
@@ -62,6 +62,8 @@ failures; `notify` runs on a background thread whenever an event waits.
removes; `release(id, archive, Resolution)` ends an uncertain attempt. The author an
edit names is the host's: the app passes the account's full name.
`import_page` creates a page holding a copy of another; `delete_pages` removes pages.
+`set_pause(pause)` has edits publish once `pause` passes without another (at most 30 s after the
+first waiting), as a notebook on a cloud drive does; `wake()` publishes them at once.
`sync_status()` gives when the section file was last reached, why it could not be since
and how many edits wait for it. `set_offline(true)` works offline as OneNote does: the
worker stops connecting and edits queue until `wake()` (Sync Now) or `set_offline(false)`.
@@ -115,6 +117,17 @@ the remote left in place, or last, and a page the remote removed comes back as a
of the local one, placed the same way (`corpus/conflict-page/native-pages`,
`native-restore`). Nothing blocks the queue.
+A remote a file provider keeps may list versions of the file beside it (`Remote::versions`,
+`version`, `retire`), as iCloud Drive keeps a commit that lost to another device's. Each step
+merges them first (`resolve.rs`): per object space, the newest revision of the version's that
+the file holds, or holds merged, is where the two last agreed; the section opened at those
+revisions (`onestore::Section::open_at`) is the base the version's changes lower from
+(`lower_page`), and they replay on the file through the rebase rules above, conflict pages where
+they clash. The revisions the merge writes are named after the version's it merged
+(`Section::seal_as`), so a version merged once, here or on another device, merges as nothing
+again. It is published on the file's stamp, then retired; one of another section, or one that
+cannot be read, is retired with `keep` for the remote to keep beside the file.
+
Publication attempts are recorded before network I/O. An attempt confirms only
when the remote holds its revisions, or every page it changed as it changed them,
followed by `Remote::confirm`; otherwise it stays `AwaitingConfirmation` and is never
@@ -273,9 +286,12 @@ cache as it was.
Each file read must be a consistent, bounded snapshot. The result is an
observation across multiple files, not an atomic notebook transaction or
-authorization to publish an edit. Refresh rejects observed topology changes and
-duplicate physical files with the same logical identity. Retain the last accepted
-catalog if discovery fails; a connection failure does not mean files were deleted.
+authorization to publish an edit. Refresh rejects observed topology changes. Of
+several files with one identity (a `Name 2.one` copy), the one its folder's TOC names,
+else the newest, lists; the others list in `unavailable` as `Reason::Copy`. iOS's
+`.Name.one.icloud` placeholders list there under their real names as `Reason::Evicted`.
+Retain the last accepted catalog if discovery fails; a connection failure does not mean
+files were deleted.
`read_external_asset` resolves a validated UUID `.onebin` filename beneath the
selected section's sibling `_onefiles` folder and returns exact bounded bytes.
@@ -342,6 +358,30 @@ is `Reordered`. A failed read returns the error and keeps
the previous catalog, so an unreachable share never reads as an emptied
notebook.
+## Snowbound's folder
+
+`sidecar` keeps Snowbound-only data in the notebook's `.snowbound` folder, which
+OneNote 2010 skips because it has the Windows hidden attribute: `Storage::hide` sets it
+through `smb::Client::hide` (SET_INFO FileBasicInformation, always, since Samba reports a
+dot name hidden without storing it) or macOS's `UF_HIDDEN`, which an smbfs mount passes
+to the share; Linux keeps no such attribute. Discovery skips dot names, and a notebook
+without the folder is whole.
+
+```text
+.snowbound/
+├ tags.json [{ name, shape, art, mapped }]: a tag's name and symbol → its art
+└ tags/ .png | .svg, written through a temporary name, never rewritten
+```
+
+`Notebook::map_tag_art(name, shape, bytes, extension)` makes the folder and hides it,
+keeps the picture, then rereads `tags.json`, merges its mapping and replaces the file,
+reading it back and merging again until its own holds. `sidecar::merge` keeps every tag
+either side mapped; one tag mapped by both keeps the later `mapped`, then the greater art
+name. A mapping two writers replace within one round trip of each other can still lose
+one side's new tag until that side maps it again. `tag_art` reads the mappings, passing
+over entries that name no picture, and `tag_art_file` returns a picture once its bytes
+match its name.
+
## SMB (feature `smb`)
`notebook::smb` provides blocking SMB access for OneNote sections and
@@ -399,6 +439,12 @@ are rejected with `ResourceBusy`. Notebook identities come from the files, not
directory names or sizes. Missing paths, denied access and non-directory paths
have distinct I/O error kinds.
+`smb::shares(address, credentials, timeout)` lists the disk shares a server offers the
+account, over `IPC$` and srvsvc. `smb::Refusal::of(&error)` names why `Client::connect`,
+`shares` or `read_dir` failed as a person remedies it: unreachable, SMB1 only, sign-in
+refused, no such share, denied, no such folder. A server that turns SMB2's negotiation
+away is asked for SMB1's `NT LM 0.12` once, which an SMB1-only server agrees to.
+
`Client::watch(path, changed)` arms one CHANGE_NOTIFY with WATCH_TREE on a directory, as
OneNote 2010 watches a notebook's folder, and keeps it armed on the client's runtime without
probing the connection, so an idle watch sends nothing. `changed` hears each batch of changed
diff --git a/crates/notebook/src/background.rs b/crates/notebook/src/background.rs
index a5861d97cf7a7eda4b2e84f158b8b6e2e7247351..278860329fcffce16017a78c9012de30d4ef9b08 100644
--- a/crates/notebook/src/background.rs
+++ b/crates/notebook/src/background.rs
@@ -849,8 +849,15 @@ fn step(
Err(error) => (None, Err(error)),
};
}
+ // A version kept beside the file leaves its stamp as it was.
+ let versions = match remote.versions() {
+ Ok(versions) => versions,
+ Err(error) => return (None, Err(Error::RemoteIo(error))),
+ };
match crate::peek(replica) {
- Ok((base, 0)) if base == stamp => return (Some(0), Ok((stamp, moved))),
+ Ok((base, 0)) if base == stamp && versions.is_empty() => {
+ return (Some(0), Ok((stamp, moved)));
+ }
Err(error) if error.busy() => return (None, Ok((stamp, false))),
_ => {}
}
@@ -907,6 +914,18 @@ impl Remote for Discovered<'_, R> {
fn confirm(&mut self, base: &Stamp) -> std::result::Result<(), onestore::CommitError> {
self.remote.confirm(base)
}
+
+ fn versions(&mut self) -> io::Result> {
+ self.remote.versions()
+ }
+
+ fn version(&mut self, id: &str) -> io::Result> {
+ self.remote.version(id)
+ }
+
+ fn retire(&mut self, id: &str, keep: bool) -> io::Result<()> {
+ self.remote.retire(id, keep)
+ }
}
#[cfg(test)]
diff --git a/crates/notebook/src/discover.rs b/crates/notebook/src/discover.rs
index 7c0720dd9fcba71cd63aa9bae1c03fe8a480aa0b..e0dcc97d0faf93d38f722c11ee8fe0229f4ac974 100644
--- a/crates/notebook/src/discover.rs
+++ b/crates/notebook/src/discover.rs
@@ -8,12 +8,14 @@ use serde::{Deserialize, Serialize};
use std::{
collections::{BTreeMap, BTreeSet},
io,
+ time::Duration,
};
mod source;
pub use source::Local;
#[cfg(feature = "smb")]
pub use source::Smb;
+pub(crate) use source::placeholder;
#[derive(Debug, Serialize)]
pub struct Section {
@@ -21,6 +23,10 @@ pub struct Section {
/// Header.guidFile, also used by FileIdentityGuid in a parent TOC.
pub file_id: [u8; 16],
pub state: SectionState,
+ /// Another section of the catalog holds the same file, as a copy made beside it does, and
+ /// is the one its folder's TOC lists by that identity (or else has the shorter path). OneNote
+ /// opens both; the copy's TOC entry, where one exists, is its own.
+ pub copy: bool,
}
#[derive(Debug, Serialize)]
@@ -54,6 +60,31 @@ pub struct Unavailable {
pub path: String,
pub group: bool,
pub error: String,
+ pub reason: Reason,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize)]
+pub enum Reason {
+ /// Access denied, or gone mid-listing.
+ Denied,
+ /// Not yet on this device (`EntryKind::Evicted`), for the host to download.
+ Evicted,
+ /// Mid-write through every retry.
+ InUse,
+ /// Not a notebook file this can read: corrupt, or too large.
+ Unreadable,
+ /// Another group at `of` holds the same TOC; the catalog lists that one.
+ Copy { of: String },
+}
+
+/// A section file or group folder holding an identity, one of the copies discovery chooses
+/// among.
+struct Claim {
+ path: String,
+ group: bool,
+ /// Its folder's TOC lists the identity under its name.
+ listed: bool,
+ modified: u64,
}
#[derive(Debug, Serialize)]
@@ -77,6 +108,9 @@ pub enum EntryKind {
File,
Directory,
Other,
+ /// A notebook file kept elsewhere and not yet on this device, as iOS lists one that
+ /// iCloud Drive evicted.
+ Evicted,
}
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -107,6 +141,9 @@ pub struct Cache {
/// The most bytes of images a cache holds for `Cache::take`.
const HELD: usize = 64 << 20;
+/// How many more times a read that meets a commit in progress is tried, and how far apart.
+const RETRIES: usize = 3;
+const RETRY: Duration = Duration::from_millis(250);
/// A notebook file as discovery read it.
#[derive(Clone, Serialize, Deserialize)]
@@ -135,17 +172,18 @@ impl Cache {
/// A failed discovery leaves the cache as it was.
pub fn discover(&mut self, source: &mut impl Source, limits: Limits) -> Result {
let mut remaining = limits.entries;
- let mut identities = BTreeMap::new();
+ let mut claims = BTreeMap::new();
let mut found = Cache::default();
- let folder = scan(
+ let mut folder = scan(
source,
"",
&limits,
0,
&mut remaining,
- &mut identities,
+ &mut claims,
(&self.read, &mut found),
)?;
+ set_aside(&mut folder, &claims);
*self = found;
Ok(folder)
}
@@ -259,12 +297,6 @@ pub enum Error {
Changed { path: String },
#[error("Invalid or unsupported directory entry: {path}")]
Entry { path: String },
- #[error("File identity occurs at both {first} and {second}")]
- DuplicateIdentity {
- file: [u8; 16],
- first: String,
- second: String,
- },
}
/// Discovers rooted notebook topology within caller-specified work and size limits.
@@ -279,7 +311,7 @@ fn scan(
limits: &Limits,
depth: usize,
remaining: &mut usize,
- identities: &mut BTreeMap<[u8; 16], String>,
+ claims: &mut BTreeMap<[u8; 16], Vec>,
(cached, found): (&BTreeMap, &mut Cache),
) -> Result {
if depth > limits.depth {
@@ -324,18 +356,19 @@ fn scan(
limits,
depth + 1,
remaining,
- identities,
+ claims,
(cached, found),
) {
Ok(group) => result.groups.push(group),
- Err(error @ Error::Io { .. }) if unavailable(&error) => {
- result.unavailable.push(Unavailable {
+ Err(error) => match unavailable(&error) {
+ Some(reason) => result.unavailable.push(Unavailable {
path: child,
group: true,
error: error.to_string(),
- });
- }
- Err(error) => return Err(error),
+ reason,
+ }),
+ None => return Err(error),
+ },
}
continue;
}
@@ -347,6 +380,19 @@ fn scan(
} else {
continue;
};
+ // Without an evicted TOC the folder lists in path order; nothing writes a second one,
+ // as its placeholder blocks creating it.
+ if entry.kind == EntryKind::Evicted {
+ if expected == FileType::Section {
+ result.unavailable.push(Unavailable {
+ path: child,
+ group: false,
+ error: "Not downloaded to this device yet".into(),
+ reason: Reason::Evicted,
+ });
+ }
+ continue;
+ }
if entry.kind != EntryKind::File
|| (expected == FileType::TableOfContents && result.toc.is_some())
{
@@ -367,41 +413,71 @@ fn scan(
.and_then(Read::file_id)
.and_then(|known| source.copy(&child, known));
let fetched = copied.is_none();
- let bytes =
- match copied.map_or_else(|| source.read(&child, limits.bytes_per_file), Ok) {
- Ok(bytes) => bytes,
- Err(error) => {
- let error = Error::Io {
- path: child.clone(),
- error,
- };
- if expected == FileType::Section && unavailable(&error) {
- result.unavailable.push(Unavailable {
- path: child,
- group: false,
- error: error.to_string(),
- });
- continue;
+ // A section that cannot be read lists as unavailable; the rest still open.
+ let mut list_unavailable = |error: Error| match unavailable(&error) {
+ Some(reason) if expected == FileType::Section => {
+ result.unavailable.push(Unavailable {
+ path: child.clone(),
+ group: false,
+ error: error.to_string(),
+ reason,
+ });
+ Ok(())
+ }
+ _ => Err(error),
+ };
+ let read = copied.map_or_else(
+ || {
+ let mut read = source.read(&child, limits.bytes_per_file);
+ // A read that meets a commit in progress succeeds once it lands.
+ for _ in 0..RETRIES {
+ if !read.as_ref().is_err_and(|error| {
+ matches!(
+ error.kind(),
+ io::ErrorKind::WouldBlock | io::ErrorKind::ResourceBusy
+ )
+ }) {
+ break;
}
- return Err(error);
+ std::thread::sleep(RETRY);
+ read = source.read(&child, limits.bytes_per_file);
}
- };
+ read
+ },
+ Ok,
+ );
+ let bytes = match read {
+ Ok(bytes) => bytes,
+ Err(error) => {
+ list_unavailable(Error::Io {
+ path: child.clone(),
+ error,
+ })?;
+ continue;
+ }
+ };
if bytes.len() > limits.bytes_per_file {
return Err(Error::Limit { path: child });
}
- let store = Store::parse(&bytes).map_err(|error| Error::Document {
- path: child.clone(),
- error,
- })?;
- if store.header.file_type != expected || !store.checksum_mismatches.is_empty() {
- return Err(Error::Document {
- path: child,
- error: onestore::Error {
+ let parsed = Store::parse(&bytes).and_then(|store| {
+ if store.header.file_type != expected || !store.checksum_mismatches.is_empty() {
+ return Err(onestore::Error {
offset: 0,
message: "Unexpected file type or checksum mismatch",
- },
- });
- }
+ });
+ }
+ Ok(store)
+ });
+ let store = match parsed {
+ Ok(store) => store,
+ Err(error) => {
+ list_unavailable(Error::Document {
+ path: child.clone(),
+ error,
+ })?;
+ continue;
+ }
+ };
let held = held(&store, expected);
let file_id = store.header.file_id;
if let Ok(held) = &held {
@@ -438,11 +514,13 @@ fn scan(
color,
document,
},
+ copy: false,
}),
Ok(Held::Locked) => result.sections.push(Section {
path: child.clone(),
file_id,
state: SectionState::Locked,
+ copy: false,
}),
Ok(Held::Toc(unresolved)) => {
result.toc = Some(Toc {
@@ -455,16 +533,10 @@ fn scan(
path: child.clone(),
file_id,
state: SectionState::Unreadable(error),
+ copy: false,
}),
Err(error) => return Err(Error::Document { path: child, error }),
}
- if let Some(first) = identities.insert(file_id, child.clone()) {
- return Err(Error::DuplicateIdentity {
- file: file_id,
- first,
- second: child,
- });
- }
}
let order: BTreeMap<_, _> = result
.toc
@@ -492,6 +564,39 @@ fn scan(
&b.path,
))
});
+ let listed = |file: [u8; 16], path: &str| {
+ let name = path.rsplit('/').next().unwrap_or(path);
+ result
+ .toc
+ .iter()
+ .flat_map(|toc| &toc.unresolved)
+ .any(|entry| {
+ entry.file == file
+ && entry
+ .filename
+ .as_deref()
+ .is_some_and(|filename| filename.eq_ignore_ascii_case(name))
+ })
+ };
+ let modified = |path: &str| found.read.get(path).map_or(0, |read| read.listed.modified);
+ for section in &result.sections {
+ claims.entry(section.file_id).or_default().push(Claim {
+ path: section.path.clone(),
+ group: false,
+ listed: listed(section.file_id, §ion.path),
+ modified: modified(§ion.path),
+ });
+ }
+ for group in &result.groups {
+ if let Some(toc) = &group.toc {
+ claims.entry(toc.file_id).or_default().push(Claim {
+ path: group.path.clone(),
+ group: true,
+ listed: listed(toc.file_id, &group.path),
+ modified: modified(&join(&group.path, &toc.filename)),
+ });
+ }
+ }
let present: BTreeSet<_> = result
.sections
.iter()
@@ -528,6 +633,96 @@ fn scan(
Ok(result)
}
+/// Keeps one group of each TOC identity in the catalog, the one its parent's TOC lists or else
+/// the newest; the others list as unavailable copies with their sections. Of sections holding
+/// one file, each lists, and all but the one its folder's TOC lists (or else the one with the
+/// shortest path) are marked as copies: a choice that stands while the files keep their names.
+fn set_aside(folder: &mut Folder, claims: &BTreeMap<[u8; 16], Vec>) {
+ let mut copies = BTreeMap::new();
+ for claims in claims.values() {
+ let mut groups: Vec<_> = claims.iter().filter(|claim| claim.group).collect();
+ groups.sort_by_key(|claim| {
+ (
+ !claim.listed,
+ std::cmp::Reverse(claim.modified),
+ claim.path.len(),
+ &claim.path,
+ )
+ });
+ if let [original, rest @ ..] = &groups[..] {
+ for copy in rest {
+ copies.insert(copy.path.clone(), original.path.clone());
+ }
+ }
+ }
+ if !copies.is_empty() {
+ demote(folder, &copies);
+ }
+ let mut sections = BTreeSet::new();
+ for claims in claims.values() {
+ let mut held: Vec<_> = claims
+ .iter()
+ .filter(|claim| {
+ !claim.group
+ && !copies
+ .keys()
+ .any(|copy: &String| claim.path.starts_with(&format!("{copy}/")))
+ })
+ .collect();
+ held.sort_by_key(|claim| (!claim.listed, claim.path.len(), &claim.path));
+ sections.extend(held.iter().skip(1).map(|claim| claim.path.clone()));
+ }
+ if !sections.is_empty() {
+ mark(folder, §ions);
+ }
+}
+
+fn demote(folder: &mut Folder, copies: &BTreeMap) {
+ folder.groups.retain(|group| {
+ let Some(of) = copies.get(&group.path) else {
+ return true;
+ };
+ let name = of.rsplit('/').next().unwrap_or(of);
+ folder.unavailable.push(Unavailable {
+ path: group.path.clone(),
+ group: true,
+ error: format!("A copy of \u{201c}{name}\u{201d}, which opens instead"),
+ reason: Reason::Copy { of: of.clone() },
+ });
+ false
+ });
+ for group in &mut folder.groups {
+ demote(group, copies);
+ }
+}
+
+fn mark(folder: &mut Folder, copies: &BTreeSet) {
+ for section in &mut folder.sections {
+ section.copy = copies.contains(§ion.path);
+ }
+ for group in &mut folder.groups {
+ mark(group, copies);
+ }
+}
+
+/// Whether `store` holds a password-protected section.
+pub(crate) fn locked(store: &Store) -> bool {
+ RevisionIndex::parse(store)
+ .and_then(|index| {
+ let document = Document::parse(&index)?;
+ Ok(encrypted(document.active(document.root)?))
+ })
+ .unwrap_or(false)
+}
+
+fn encrypted(revision: &onestore::document::Revision<'_>) -> bool {
+ revision
+ .roots
+ .get(&1)
+ .and_then(|id| revision.nodes.get(id))
+ .is_some_and(|node| matches!(node.kind, Kind::Encrypted { .. }))
+}
+
/// What discovery takes from the file `store` holds, a section or a TOC as `expected`.
fn held(store: &Store, expected: FileType) -> Result {
let index = RevisionIndex::parse(store)?;
@@ -540,7 +735,7 @@ fn held(store: &Store, expected: FileType) -> Result {
.and_then(|id| revision.nodes.get(id))
};
if expected == FileType::Section {
- if root(1).is_some_and(|node| matches!(node.kind, Kind::Encrypted { .. })) {
+ if encrypted(revision) {
return Ok(Held::Locked);
}
index.validate_current()?;
@@ -592,12 +787,19 @@ fn held(store: &Store, expected: FileType) -> Result {
Ok(Held::Toc(unresolved))
}
-/// Access denied or a file gone mid-listing; a lost connection stays fatal.
-fn unavailable(error: &Error) -> bool {
- matches!(error, Error::Io { error, .. } if matches!(
- error.kind(),
- io::ErrorKind::PermissionDenied | io::ErrorKind::NotFound
- ))
+/// Why a file or group that failed lists as unavailable; `None` fails the whole discovery,
+/// as a lost connection does.
+fn unavailable(error: &Error) -> Option {
+ match error {
+ Error::Io { error, .. } => match error.kind() {
+ io::ErrorKind::PermissionDenied | io::ErrorKind::NotFound => Some(Reason::Denied),
+ io::ErrorKind::WouldBlock | io::ErrorKind::ResourceBusy => Some(Reason::InUse),
+ io::ErrorKind::InvalidData | io::ErrorKind::FileTooLarge => Some(Reason::Unreadable),
+ _ => None,
+ },
+ Error::Document { .. } => Some(Reason::Unreadable),
+ _ => None,
+ }
}
/// Not the notebook's: dot files, among them macOS's `.DS_Store` and AppleDouble `._`
diff --git a/crates/notebook/src/discover/source.rs b/crates/notebook/src/discover/source.rs
index 711fa91d27d4b5c8444a3862028a771248ea1b41..5ac630f7d2b43a0b68f954ea62de7de965d9ab06 100644
--- a/crates/notebook/src/discover/source.rs
+++ b/crates/notebook/src/discover/source.rs
@@ -1,9 +1,23 @@
use super::{Entry, EntryKind, Listed, Source, component};
use std::{
+ collections::BTreeSet,
io,
path::{Path, PathBuf},
};
+/// The notebook file iOS lists as `.Name.icloud` while iCloud Drive keeps it elsewhere.
+fn evicted(name: &str) -> Option<&str> {
+ let real = name.strip_prefix('.')?.strip_suffix(".icloud")?;
+ let lower = real.to_ascii_lowercase();
+ (lower.ends_with(".one") || lower.ends_with(".onetoc2")).then_some(real)
+}
+
+/// Where iOS lists the file at `path` while iCloud Drive keeps it elsewhere.
+pub(crate) fn placeholder(path: &Path) -> Option {
+ let name = path.file_name()?.to_str()?;
+ Some(path.with_file_name(format!(".{name}.icloud")))
+}
+
/// A canonical local root; symbolic-link entries are not traversed.
pub struct Local {
root: PathBuf,
@@ -62,6 +76,16 @@ impl Source for Local {
},
});
}
+ let present: BTreeSet<_> = entries.iter().map(|entry| entry.name.clone()).collect();
+ entries.retain_mut(|entry| match evicted(&entry.name).map(str::to_owned) {
+ Some(real) if present.contains(&real) => false,
+ Some(real) => {
+ entry.name = real;
+ entry.kind = EntryKind::Evicted;
+ true
+ }
+ None => true,
+ });
Ok(entries)
}
diff --git a/crates/notebook/src/lib.rs b/crates/notebook/src/lib.rs
index 50cc83248f164f2019f39d23de56dfe5329fa9fd..f37c295b0484a2ac9f4ba6dbf55f0edf3ed4356e 100644
--- a/crates/notebook/src/lib.rs
+++ b/crates/notebook/src/lib.rs
@@ -22,13 +22,17 @@ use std::{
mod assets;
mod background;
mod base;
+pub mod location;
mod merge;
mod migrate;
mod queue;
mod recovery;
+mod resolve;
+pub use resolve::Version;
mod schema;
pub mod session;
pub use recovery::{Recovery, RecoverySummary};
+pub mod sidecar;
mod sync;
pub use sync::{EditStatus, Remote, Synced};
mod worker;
@@ -341,6 +345,15 @@ fn lock(connection: &Mutex) -> Result> {
.map_err(|_| io::Error::other("Cache owner panicked").into())
}
+/// Tells the worker a burst of local edits is durable.
+fn edited(worker: &Mutex>) {
+ if let Ok(worker) = worker.lock()
+ && let Some(worker) = worker.upgrade()
+ {
+ worker.edited();
+ }
+}
+
fn wake(worker: &Mutex>) {
if let Ok(worker) = worker.lock()
&& let Some(worker) = worker.upgrade()
diff --git a/crates/notebook/src/location.rs b/crates/notebook/src/location.rs
new file mode 100644
index 0000000000000000000000000000000000000000..30317f9c476f58bcd5aed6fd6660d2558ad0ab25
--- /dev/null
+++ b/crates/notebook/src/location.rs
@@ -0,0 +1,184 @@
+//! Where section replicas live in the app's cache: a folder per notebook location, then a
+//! file per section identity. OneNote lets a notebook folder be copied with its sections
+//! keeping their identities, so identity alone cannot tell a copy's replica from the
+//! original's; the location keeps each copy's queue its own.
+//!
+//! A location is a string naming where a notebook or lone section is reached: the canonical
+//! path of a local folder or file (`local`), or `smb` for one on a share.
+
+use onestore::{Header, Stamp};
+use std::{
+ io,
+ path::{Path, PathBuf},
+};
+
+/// The file in a replica folder naming the location its replicas belong to.
+const LOCATION: &str = "location";
+
+/// The folder in `cache` holding the replicas of the sections at `location`.
+pub fn folder(cache: &Path, location: &str) -> PathBuf {
+ cache
+ .join("replicas")
+ .join(hex(&::digest(location)[..16]))
+}
+
+/// The location of the local folder or file at `path`, which may have just been moved away:
+/// its canonical path, or its folder's with its name.
+pub fn local(path: &Path) -> io::Result {
+ let canonical =
+ path.canonicalize()
+ .or_else(|error| match (path.parent(), path.file_name()) {
+ (Some(parent), Some(name)) => Ok(parent.canonicalize()?.join(name)),
+ _ => Err(error),
+ })?;
+ Ok(canonical.to_string_lossy().into_owned())
+}
+
+/// The location of the notebook folder `root` in `share` on the server at `address`, as its
+/// host names them.
+pub fn smb(address: &str, share: &str, root: &str) -> String {
+ let root = root.replace('\\', "/");
+ format!("smb://{address}/{share}/{}", root.trim_matches('/'))
+}
+
+/// Moves the replicas of the sections at `from` to `to`, as when the app renames or moves a
+/// notebook; each replica `to` already holds for the same section stays. Every replica moved
+/// must be closed.
+pub fn moved(cache: &Path, from: &str, to: &str) -> io::Result<()> {
+ let old = folder(cache, from);
+ if !old.exists() {
+ return Ok(());
+ }
+ let new = claimed(cache, to)?;
+ for entry in std::fs::read_dir(&old)? {
+ let name = entry?.file_name();
+ if Path::new(&name).extension() == Some("sqlite".as_ref()) && !new.join(&name).exists() {
+ adopt(&old.join(&name), &new.join(&name))?;
+ }
+ }
+ tidy(&old);
+ Ok(())
+}
+
+/// The folder for `location`, made and labelled with it where it was not.
+fn claimed(cache: &Path, location: &str) -> io::Result {
+ let folder = folder(cache, location);
+ let label = folder.join(LOCATION);
+ if !label.exists() {
+ std::fs::create_dir_all(&folder)?;
+ std::fs::write(&label, location)?;
+ }
+ Ok(folder)
+}
+
+/// The folder for `location`, having moved into it a replica for each of `sections` it lacks
+/// from where one was left behind:
+///
+/// - the cache's top or its `smb` folder, where replicas were named by identity alone before
+/// locations named folders: taken by the first location to open the section, as that
+/// replica served whichever copy opened then;
+/// - the folder of a local location that no longer exists, as a notebook moved outside the
+/// app leaves: taken only when the section file, as `stamp` reads it, stands as the
+/// replica's base or has moved on from it (a later generation). A replica whose base is
+/// newer than the file, or a different state of the same generation, belongs to another
+/// copy of the section and stays.
+///
+/// A replica another process holds stays where it is.
+pub(crate) fn claim(
+ cache: &Path,
+ location: &str,
+ sections: &[[u8; 16]],
+ stamp: impl Fn(&[u8; 16]) -> Option,
+) -> io::Result {
+ let folder = claimed(cache, location)?;
+ let missing: Vec<&[u8; 16]> = sections
+ .iter()
+ .filter(|identity| !crate::session::replica_file(&folder, identity).exists())
+ .collect();
+ if missing.is_empty() {
+ return Ok(folder);
+ }
+ let orphans = orphans(cache);
+ for identity in missing {
+ let legacy = [cache.to_owned(), cache.join("smb")]
+ .into_iter()
+ .map(|legacy| (crate::session::replica_file(&legacy, identity), true));
+ let left = orphans
+ .iter()
+ .map(|orphan| (crate::session::replica_file(orphan, identity), false));
+ for (replica, legacy) in legacy.chain(left) {
+ if !replica.exists() {
+ continue;
+ }
+ let adoptable = match crate::peek(&replica) {
+ Ok((base, _)) => {
+ legacy || stamp(identity).is_some_and(|file| follows(&file, &base))
+ }
+ Err(error) if error.busy() => false,
+ // An older schema, which opening converts, predates locations.
+ Err(_) => legacy,
+ };
+ if adoptable {
+ adopt(&replica, &crate::session::replica_file(&folder, identity))?;
+ if let Some(parent) = replica.parent().filter(|_| !legacy) {
+ tidy(parent);
+ }
+ break;
+ }
+ }
+ }
+ Ok(folder)
+}
+
+/// The replica folders of local locations that no longer exist.
+fn orphans(cache: &Path) -> Vec {
+ let Ok(entries) = std::fs::read_dir(cache.join("replicas")) else {
+ return Vec::new();
+ };
+ entries
+ .filter_map(|entry| {
+ let folder = entry.ok()?.path();
+ let location = std::fs::read_to_string(folder.join(LOCATION)).ok()?;
+ let path = Path::new(&location);
+ (path.is_absolute() && !path.exists()).then_some(folder)
+ })
+ .collect()
+}
+
+/// Whether the section file standing as `file` may take a replica whose base is `base`.
+fn follows(file: &Stamp, base: &Stamp) -> bool {
+ file == base
+ || matches!(
+ (Header::parse(&file.header), Header::parse(&base.header)),
+ (Ok(file), Ok(base)) if file.generation > base.generation
+ )
+}
+
+/// Moves the replica at `from`, with the write-ahead log a crash may have left, to `to`.
+fn adopt(from: &Path, to: &Path) -> io::Result<()> {
+ for suffix in ["-wal", "-shm", ""] {
+ let (mut source, mut target) = (from.as_os_str().to_owned(), to.as_os_str().to_owned());
+ source.push(suffix);
+ target.push(suffix);
+ match std::fs::rename(&source, &target) {
+ Err(error) if !suffix.is_empty() && error.kind() == io::ErrorKind::NotFound => {}
+ moved => moved?,
+ }
+ }
+ Ok(())
+}
+
+/// Removes a replica folder that holds no replica.
+fn tidy(folder: &Path) {
+ let empty = std::fs::read_dir(folder).is_ok_and(|mut entries| {
+ entries.all(|entry| entry.is_ok_and(|entry| entry.file_name() == LOCATION))
+ });
+ if empty {
+ let _ = std::fs::remove_file(folder.join(LOCATION));
+ let _ = std::fs::remove_dir(folder);
+ }
+}
+
+fn hex(bytes: &[u8]) -> String {
+ bytes.iter().map(|byte| format!("{byte:02x}")).collect()
+}
diff --git a/crates/notebook/src/merge.rs b/crates/notebook/src/merge.rs
index 907fa6c694e1cd75804d27ea204ed7e8108557e2..79eb9c50ac27709f2faff2ed7c4e619e78e63c7d 100644
--- a/crates/notebook/src/merge.rs
+++ b/crates/notebook/src/merge.rs
@@ -187,8 +187,9 @@ fn named(op: &PageOp) -> Vec {
/// applies it to `new`, the merged section: a conflict page under the remote's page
/// marking `objects` where `page` holds them, or, where the remote removed the page, the
/// page put back as a copy before the next page after it in `local`, the section as the
-/// queue leaves it, that the remote did not move (`moved`). Content outside the page model
-/// stays on the remote's page only; `at` is now.
+/// queue leaves it, that the remote did not move (`moved`). The page it makes is in the space
+/// `guid` names, or a fresh one. Content outside the page model stays on the remote's page
+/// only; `at` is now.
#[allow(clippy::too_many_arguments)]
pub(crate) fn conflict_page(
new: &mut Section<'_>,
@@ -199,7 +200,12 @@ pub(crate) fn conflict_page(
author: &str,
objects: &BTreeSet,
at: u64,
+ guid: Option<[u8; 16]>,
) -> Result {
+ let placed = |creation: PageCreation| match guid {
+ Some(guid) => creation.in_space(guid),
+ None => Ok(creation),
+ };
let mut page = page.clone();
page.objects
.retain(|object| !matches!(object, PageObject::Unsupported(_)));
@@ -218,7 +224,11 @@ pub(crate) fn conflict_page(
.any(|object| matches!(object, PageObject::Title(_)));
vec![Op::Section(SectionOp::Conflict {
of: space,
- creation: PageCreation::new(None, titled.then_some(page.title.as_str()), author)?,
+ creation: placed(PageCreation::new(
+ None,
+ titled.then_some(page.title.as_str()),
+ author,
+ )?)?,
page: copy,
objects: marked,
})]
@@ -231,7 +241,8 @@ pub(crate) fn conflict_page(
.iter()
.map(|(next, _)| *next)
.find(|next| !moved.contains(next) && listed.iter().any(|(listed, _)| listed == next));
- let creation = PageCreation::new(before, Some(&page.title), author)?;
+ let before = series_start(new, before)?;
+ let creation = placed(PageCreation::new(before, Some(&page.title), author)?)?;
let mut ops = vec![Op::Section(SectionOp::Import {
creation: creation.clone(),
page: page.copy()?,
@@ -252,7 +263,7 @@ pub(crate) fn conflict_page(
/// Pages the base and the remote both list that the remote moved: into another series or
/// level, or out of base order among the rest. OneNote 2010 and this writer give a moved
/// page a series of its own; older builds of this writer moved a page within its series.
-fn moved(old: &mut Section<'_>, new: &mut Section<'_>) -> Result> {
+pub(crate) fn moved(old: &mut Section<'_>, new: &mut Section<'_>) -> Result> {
let series = (old.series()?, new.series()?);
let base: BTreeMap = order(old)?
.into_iter()
@@ -293,6 +304,26 @@ fn moved(old: &mut Section<'_>, new: &mut Section<'_>) -> Result, before: Option) -> Result> {
+ Ok(starting(&order(section)?, §ion.series()?, before))
+}
+
+fn starting(
+ listed: &Order,
+ series: &BTreeMap