From c8f0c25a854b8e169db08a84d1fdcd915a70aaa0 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Sun, 27 Sep 2026 22:49:49 -0300 Subject: Point docs and comments at the files code moved to Documentation only, no code change: README's reading order and layout, docs/design.typ's paragraph on where pane kinds and editor parts live, docs/helix-keys.md's code map (normalInput and the executors now in normal.zig and edit.zig, insertTab in edit.zig), docs/open-questions.md (execute and ttyForDir in exec.zig), and the comments that named pardes.zig for fold, Cell, takesCommandLine and runBuiltin (tools/gen_themes.zig, themes/helix.zig, detached/wire.zig, host_io.zig, lsp_zls.zig). docs/design.pdf is a retained fixture and is not regenerated. Co-Authored-By: Claude Opus 5.5 --- tools/gen_themes.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/gen_themes.zig b/tools/gen_themes.zig index 3add2040..65e85d1c 100644 --- a/tools/gen_themes.zig +++ b/tools/gen_themes.zig @@ -22,7 +22,7 @@ //! moving when the other source gains or loses a file. helix's own `acme.toml` //! is vendored as `acme_helix.toml` for the same reason, since pardes ships an //! acme of its own; the file is otherwise untouched. Two themes answering to -//! one name is a bug (`Theme ` would silently pick one), so src/pardes.zig +//! one name is a bug (`Theme ` would silently pick one), so src/colors.zig //! asserts the ring's names are distinct at comptime. //! //! Provenance: vendor/themes/*.toml are helix's own runtime themes (from @@ -50,7 +50,7 @@ const Rgb = [3]u8; /// pardes's Theme, minus the type: the generated file spells an anonymous /// `.{...}` because a theme file deliberately imports NOTHING (it is data, not -/// code) — src/pardes.zig's `fold` is what turns it into a real Theme. +/// code) — src/colors.zig's `fold` is what turns it into a real Theme. const Theme = struct { name: []const u8, bg: ?Rgb, @@ -132,7 +132,7 @@ pub fn main(init: std.process.Init) !void { } // the INDEX, and the only reason it is generated rather than written: a zig // file cannot list a directory at comptime, so the imports have to come - // from whoever can. pardes.zig folds its declarations into the ring. + // from whoever can. colors.zig folds its declarations into the ring. buf.clearRetainingCapacity(); try buf.writer.writeAll("// Generated by tools/gen_themes.zig. Do not edit.\n"); for (themes) |t| try buf.writer.print("pub const {s} = @import(\"{s}.zig\");\n", .{ t.name, t.name }); -- cgit v1.3 From b1485c97b493f7eaf65c6afdfb82e3065306b8fe Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Tue, 29 Sep 2026 22:58:53 -0300 Subject: The PDF benches share their clock, fatal exit, hash, count parser and effect drain, and lspprobe is lspbench's probe subcommand B4: test/bench_util.zig holds what pdf_bench, pdf_pointer_bench, pdf_scroll_bench and pdf_sections_bench each copied (nowNs x4, fatal x3 named per bench, mix x3, parsePositive/parseCount x3, drainEffects x2). They stay four entry points: pdf_bench links its own mupdf module (with its C source and c_heap) where the others link the core's, which one executable cannot import under one name, and their reports and identities are each bench's own. pdf_sections_bench had rotted since the pane's cursor and selections moved to its body and the render revision became next_raster_revision; it builds and runs again. C6: tools/lspprobe.zig is lspbench's `probe` subcommand (zig build lspbench -- probe :), and the lspprobe build step goes; docs/lsp.md names the new command. Co-Authored-By: Claude Opus 5.5 --- build.zig | 16 +--- docs/lsp.md | 2 +- test/bench_util.zig | 43 +++++++++++ test/lspbench.zig | 169 ++++++++++++++++++++++++++++++++++++++++ test/pdf_bench.zig | 23 ++---- test/pdf_pointer_bench.zig | 14 +--- test/pdf_scroll_bench.zig | 43 +++-------- test/pdf_sections_bench.zig | 65 +++++----------- tools/lspprobe.zig | 184 -------------------------------------------- 9 files changed, 251 insertions(+), 308 deletions(-) create mode 100644 test/bench_util.zig delete mode 100644 tools/lspprobe.zig (limited to 'tools') diff --git a/build.zig b/build.zig index fcb4b0b7..eef05b44 100644 --- a/build.zig +++ b/build.zig @@ -1370,7 +1370,7 @@ pub fn build(b: *std.Build) void { if (b.args) |args| run_lspbench.addArgs(args); run_lspbench.setCwd(b.path(".")); run_lspbench.has_side_effects = true; - const lspbench_step = b.step("lspbench", "language-backend latency + feature matrix (-- [--json] [--check] [repo-root])"); + const lspbench_step = b.step("lspbench", "language-backend latency + feature matrix (-- [--json] [--check] [repo-root]), or one query (-- probe : [arg] [--reps N])"); lspbench_step.dependOn(&run_lspbench.step); const run_lspbench_check = b.addRunArtifact(lspbench); run_lspbench_check.addArg("--check"); @@ -1380,20 +1380,6 @@ pub fn build(b: *std.Build) void { const lspbench_check_step = b.step("lspbench-check", "require every configured language probe to complete correctly"); lspbench_check_step.dependOn(&run_lspbench_check.step); - const lspprobe = b.addExecutable(.{ - .name = "pardes-lspprobe", - .root_module = b.createModule(.{ - .target = target, - .optimize = optimize, - .root_source_file = b.path("tools/lspprobe.zig"), - .link_libc = true, - }), - }); - lspprobe.root_module.addImport("pardes", core_module); - const run_lspprobe = b.addRunArtifact(lspprobe); - if (b.args) |args| run_lspprobe.addArgs(args); - const lspprobe_step = b.step("lspprobe", "one language query against the real seam (-- : [arg] [--reps N])"); - lspprobe_step.dependOn(&run_lspprobe.step); const locations_bench_step = b.step("locations-bench", "measure cold/warm result formatting (-Doptimize=ReleaseFast; CSV on stderr)"); if (optimize != .ReleaseFast) { diff --git a/docs/lsp.md b/docs/lsp.md index ae350156..22cf1b90 100644 --- a/docs/lsp.md +++ b/docs/lsp.md @@ -51,7 +51,7 @@ position encoding, and handles both push and pull diagnostics. Startup and request waits have deadlines; failed starts back off before retrying. Worker status messages reach the host event queue. -`zig build lspprobe -- gd :` queries the same backend from +`zig build lspbench -- probe gd :` queries the same backend from the command line. `zig build lspbench` measures it. The Zig snapshot tests (lsp, lspcomplete, lspdebug and the rest) run the real `zls`; the protocol ones use a Zig mock server with deterministic answers while exercising the real client, diff --git a/test/bench_util.zig b/test/bench_util.zig new file mode 100644 index 00000000..9b91e621 --- /dev/null +++ b/test/bench_util.zig @@ -0,0 +1,43 @@ +//! What the PDF benches share: a clock, a fatal exit named for the bench, a +//! seeded hash, a count parser and the core's effect drain. +const std = @import("std"); + +pub fn nowNs() u64 { + var ts: std.c.timespec = undefined; + _ = std.c.clock_gettime(.MONOTONIC, &ts); + return @as(u64, @intCast(ts.sec)) *| 1_000_000_000 +| @as(u64, @intCast(ts.nsec)); +} + +/// `fatal` for the bench called `who`: says so, prefixed, and exits 1. +pub fn Fatal(comptime who: []const u8) type { + return struct { + pub fn f(comptime format: []const u8, args: anytype) noreturn { + std.debug.print(who ++ ": " ++ format ++ "\n", args); + std.process.exit(1); + } + }; +} + +/// A seeded hash of `value`'s bytes; a comptime integer hashes as a u64. +pub fn mix(seed: u64, value: anytype) u64 { + const Value = @TypeOf(value); + const Stable = switch (@typeInfo(Value)) { + .comptime_int => u64, + else => Value, + }; + var stable: Stable = value; + return std.hash.Wyhash.hash(seed, std.mem.asBytes(&stable)); +} + +/// A flag's value as a count in 1..`maximum`, or `fatal` saying why not. +pub fn parsePositive(comptime fatal: anytype, name: []const u8, text: []const u8, maximum: usize) usize { + const value = std.fmt.parseUnsigned(usize, text, 10) catch + fatal("{s} expects a positive integer", .{name}); + if (value == 0 or value > maximum) + fatal("{s} must be in 1..{d}", .{ name, maximum }); + return value; +} + +pub fn drainEffects(core: anytype) void { + while (core.nextEffect()) |_| {} +} diff --git a/test/lspbench.zig b/test/lspbench.zig index e094ed69..02138d24 100644 --- a/test/lspbench.zig +++ b/test/lspbench.zig @@ -114,6 +114,7 @@ pub fn main(init: std.process.Init) !void { const gpa = std.heap.page_allocator; const args = try init.minimal.args.toSlice(init.arena.allocator()); + if (args.len > 1 and std.mem.eql(u8, args[1], "probe")) return probeCommand(init); const options = try Options.parse(args[1..]); const rss0 = rssKib(); @@ -295,3 +296,171 @@ fn rssKib() u64 { } return 0; } + +// ---- probe: one query from the command line ---- + +fn nowUs() u64 { + var ts: std.c.timespec = undefined; + _ = std.c.clock_gettime(.MONOTONIC, &ts); + return @as(u64, @intCast(ts.sec)) *| 1_000_000 +| @as(u64, @intCast(ts.nsec)) / 1000; +} + +const aliases = .{ + .{ "gd", lsp.Kind.definition }, + .{ "gD", lsp.Kind.declaration }, + .{ "gy", lsp.Kind.type_definition }, + .{ "gi", lsp.Kind.implementation }, + .{ "gr", lsp.Kind.references }, +}; + +fn probeUsage() noreturn { + std.debug.print( + \\usage: pardes-lspbench probe : [arg] [--reps N] [--warm S] + \\ kind: gd gD gy gi gr, or any lsp.Kind tag (hover, references, + \\ document_symbols, workspace_symbols, incoming_calls, ...) + \\ arg: the new name for rename, the query for workspace_symbols + \\ --warm sleep S seconds after the first (cold) query — long enough + \\ for an indexing server to reach ready, narrated on stderr + \\ + , .{}); + std.process.exit(2); +} + +/// The editor's message row, here: the client's reader threads narrate server +/// state through the same sink the shells register, printed to stderr so the +/// rows on stdout stay clean. +fn statusSink(ctx: ?*anyopaque, text: []const u8) void { + _ = ctx; + std.debug.print("# status: {s}\n", .{text}); +} + +extern "c" fn usleep(usec: c_uint) c_int; + +/// `lspbench probe`: one language query against the real seam, from the +/// command line (the old lspprobe): `probe : [arg] +/// [--reps N] [--warm S]`, rows on stdout, the timing on stderr. +fn probeCommand(init: std.process.Init) !void { + const gpa = std.heap.page_allocator; + const arena = init.arena.allocator(); + const io = std.Io.Threaded.global_single_threaded.io(); + + // args[1] is `probe`: the rest are where lspprobe's were. + const all = try init.minimal.args.toSlice(arena); + const args = all[1..]; + if (args.len < 4) probeUsage(); + + // comma-separated kinds share ONE server instance and its index — the + // whole battery against a big workspace pays the cold cost once + var kinds: [16]lsp.Kind = undefined; + var nkinds: usize = 0; + var kit = std.mem.tokenizeScalar(u8, args[1], ','); + while (kit.next()) |word| { + if (nkinds == kinds.len) probeUsage(); + kinds[nkinds] = blk: { + inline for (aliases) |a| if (std.mem.eql(u8, word, a[0])) break :blk a[1]; + break :blk std.meta.stringToEnum(lsp.Kind, word) orelse probeUsage(); + }; + nkinds += 1; + } + if (nkinds == 0) probeUsage(); + + var pz: [4096:0]u8 = undefined; + const pz_s = std.fmt.bufPrintSentinel(&pz, "{s}", .{args[2]}, 0) catch probeUsage(); + var realbuf: [4096]u8 = undefined; + const path = std.mem.span(realpath(pz_s.ptr, &realbuf) orelse { + std.debug.print("cannot resolve {s}\n", .{args[2]}); + std.process.exit(1); + }); + const source = std.Io.Dir.cwd().readFileAllocOptions( + io, + path, + arena, + .limited(64 << 20), + .of(u8), + 0, + ) catch { + std.debug.print("cannot read {s}\n", .{path}); + std.process.exit(1); + }; + + const colon = std.mem.indexOfScalar(u8, args[3], ':') orelse probeUsage(); + const line = std.fmt.parseInt(u32, args[3][0..colon], 10) catch probeUsage(); + const col = std.fmt.parseInt(u32, args[3][colon + 1 ..], 10) catch probeUsage(); + if (line == 0 or col == 0) probeUsage(); + + var arg: []const u8 = ""; + var reps: u32 = 1; + var warm_s: u32 = 0; + var i: usize = 4; + while (i < args.len) : (i += 1) { + if (std.mem.eql(u8, args[i], "--reps")) { + i += 1; + if (i >= args.len) probeUsage(); + reps = @max(1, std.fmt.parseInt(u32, args[i], 10) catch probeUsage()); + } else if (std.mem.eql(u8, args[i], "--warm")) { + i += 1; + if (i >= args.len) probeUsage(); + warm_s = std.fmt.parseInt(u32, args[i], 10) catch probeUsage(); + } else arg = args[i]; + } + + lsp.setStatusSink(null, statusSink); + + // 1-based line:col -> byte offset + var off: usize = 0; + var ln: u32 = 1; + while (ln < line and off < source.len) : (off += 1) { + if (source[off] == '\n') ln += 1; + } + off = @min(off + col - 1, source.len); + + const root = std.fs.path.dirname(path) orelse "/"; + const timings = try arena.alloc(u64, reps); + var stdout_buf: [64 * 1024]u8 = undefined; + var stdout = std.Io.File.stdout().writer(io, &stdout_buf); + var first_query = true; + + for (kinds[0..nkinds]) |kind| { + var rows: []const u8 = ""; + for (0..reps) |r| { + // one warm pause for the whole battery, right after the very + // first (cold, server-spawning) query — the status lines on + // stderr narrate what the server does with the time + var out: std.Io.Writer.Allocating = .init(gpa); + defer out.deinit(); + var scratch: std.heap.ArenaAllocator = .init(gpa); + defer scratch.deinit(); + const t0 = nowUs(); + try lsp.query(gpa, scratch.allocator(), .{ + .kind = kind, + .path = path, + .source = source, + .offset = @intCast(off), + .arg = arg, + .root = root, + }, &out.writer); + timings[r] = nowUs() -| t0; + rows = try arena.dupe(u8, out.written()); + if (first_query) { + first_query = false; + if (warm_s > 0) for (0..warm_s * 10) |_| { + _ = usleep(100_000); + }; + } + } + + try stdout.interface.print("## {t}\n", .{kind}); + try stdout.interface.writeAll(rows); + try stdout.interface.flush(); + + const n = std.mem.count(u8, rows, "\n"); + const cold = timings[0]; + std.mem.sort(u64, timings[0..reps], {}, std.sort.asc(u64)); + if (reps == 1) + std.debug.print("# {t}: {d} row(s) in {d}us\n", .{ kind, n, cold }) + else + std.debug.print("# {t}: {d} row(s); first {d}us, min {d}us, median {d}us ({d} reps)\n", .{ + kind, n, cold, timings[0], timings[reps / 2], reps, + }); + } +} diff --git a/test/pdf_bench.zig b/test/pdf_bench.zig index 0f09f72a..23565106 100644 --- a/test/pdf_bench.zig +++ b/test/pdf_bench.zig @@ -13,6 +13,9 @@ //! filesystem cache is deliberately uncontrolled), while warm scenarios //! retain one Document. const std = @import("std"); +const bench_util = @import("bench_util.zig"); +const nowNs = bench_util.nowNs; +const fatal = bench_util.Fatal("pdf-bench").f; const pdf = @import("mupdf"); pub const std_options: std.Options = .{ .log_level = .err }; @@ -205,14 +208,6 @@ fn parseArgs(args: []const []const u8) Config { return config; } -fn parsePositive(name: []const u8, text: []const u8, maximum: usize) usize { - const value = std.fmt.parseUnsigned(usize, text, 10) catch - fatal("{s} expects a positive integer", .{name}); - if (value == 0 or value > maximum) - fatal("{s} must be in 1..{d}", .{ name, maximum }); - return value; -} - fn usage() noreturn { printUsage(); std.process.exit(2); @@ -226,13 +221,6 @@ fn printUsage() void { ); } -fn nowNs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) *| 1_000_000_000 +| - @as(u64, @intCast(ts.nsec)); -} - fn measure( config: Config, profile_index: usize, @@ -617,7 +605,6 @@ fn reportJson( std.Io.File.stdout().writeStreamingAll(io, out.buffered()) catch {}; } -fn fatal(comptime format: []const u8, args: anytype) noreturn { - std.debug.print("pdf-bench: " ++ format ++ "\n", args); - std.process.exit(1); +fn parsePositive(name: []const u8, text: []const u8, maximum: usize) usize { + return bench_util.parsePositive(fatal, name, text, maximum); } diff --git a/test/pdf_pointer_bench.zig b/test/pdf_pointer_bench.zig index f1d61229..ae2de2f5 100644 --- a/test/pdf_pointer_bench.zig +++ b/test/pdf_pointer_bench.zig @@ -15,6 +15,9 @@ //! frame each step settles on. It is the no-regression proof: a change to how highlights //! are painted may change what it costs, never one presented pixel. const std = @import("std"); +const bench_util = @import("bench_util.zig"); +const nowNs = bench_util.nowNs; +const mix = bench_util.mix; const pardes = @import("pardes"); const pdf = @import("mupdf"); @@ -208,17 +211,6 @@ fn print(comptime format: []const u8, args: anytype) void { _ = std.c.write(1, line.ptr, line.len); } -fn mix(seed: u64, value: anytype) u64 { - var copy = value; - return std.hash.Wyhash.hash(seed, std.mem.asBytes(©)); -} - -fn nowNs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) * 1_000_000_000 + @as(u64, @intCast(ts.nsec)); -} - comptime { _ = pdf.Document; } diff --git a/test/pdf_scroll_bench.zig b/test/pdf_scroll_bench.zig index 33dfe70a..a4511dbe 100644 --- a/test/pdf_scroll_bench.zig +++ b/test/pdf_scroll_bench.zig @@ -42,6 +42,11 @@ //! //! Setup, teardown, checksumming, and reporting are outside every timer. const std = @import("std"); +const bench_util = @import("bench_util.zig"); +const nowNs = bench_util.nowNs; +const fatal = bench_util.Fatal("pdf-scroll-bench").f; +const mix = bench_util.mix; +const drainEffects = bench_util.drainEffects; const libc = std.c; const pardes = @import("pardes"); const pdf = @import("mupdf"); @@ -211,14 +216,6 @@ fn parseArgs(args: []const []const u8) Config { return config; } -fn parseCount(flag: []const u8, text: []const u8) usize { - const value = std.fmt.parseUnsigned(usize, text, 10) catch - fatal("{s} expects a positive integer", .{flag}); - if (value == 0 or value > 10_000) - fatal("{s} must be in 1..10000", .{flag}); - return value; -} - const Travel = struct { /// Scrollable display pixels: the whole strip minus one screenful. max_scroll: f64, @@ -520,20 +517,6 @@ fn stridedHash(seed: u64, rgba: []const u8) u64 { return hash; } -fn mix(seed: u64, value: anytype) u64 { - const Value = @TypeOf(value); - const Stable = switch (@typeInfo(Value)) { - .comptime_int => u64, - else => Value, - }; - var stable: Stable = value; - return std.hash.Wyhash.hash(seed, std.mem.asBytes(&stable)); -} - -fn drainEffects(core: *pardes.Pardes) void { - while (core.nextEffect()) |_| {} -} - fn verifyIdentity( name: []const u8, expected: *?Identity, @@ -557,13 +540,6 @@ fn verifyIdentity( } else expected.* = got; } -fn nowNs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) *| 1_000_000_000 +| - @as(u64, @intCast(ts.nsec)); -} - fn reportText(config: Config, travel: Travel, results: []const Result) void { std.debug.print("pardes PDF fast-scroll benchmark ({s})\n", .{bench_config.core_optimize}); std.debug.print( @@ -649,13 +625,12 @@ fn reportJson(io: std.Io, config: Config, travel: Travel, results: []const Resul std.Io.File.stdout().writeStreamingAll(io, out.buffered()) catch {}; } -fn fatal(comptime format: []const u8, args: anytype) noreturn { - std.debug.print("pdf-scroll-bench: " ++ format ++ "\n", args); - std.process.exit(1); -} - comptime { // The bench links the real MuPDF wrapper the core uses; keep the import // load-bearing so a build that silently dropped it fails here. _ = pdf.Document; } + +fn parseCount(flag: []const u8, text: []const u8) usize { + return bench_util.parsePositive(fatal, flag, text, 10_000); +} diff --git a/test/pdf_sections_bench.zig b/test/pdf_sections_bench.zig index b08af552..92c9ef7c 100644 --- a/test/pdf_sections_bench.zig +++ b/test/pdf_sections_bench.zig @@ -9,6 +9,11 @@ //! report nanoseconds per operation; `operations_per_sample` makes that //! normalization explicit in both output formats. const std = @import("std"); +const bench_util = @import("bench_util.zig"); +const nowNs = bench_util.nowNs; +const fatal = bench_util.Fatal("pdf-sections-bench").f; +const mix = bench_util.mix; +const drainEffects = bench_util.drainEffects; const libc = std.c; const pardes = @import("pardes"); const pdf = @import("mupdf"); @@ -107,14 +112,6 @@ fn parseArgs(args: []const []const u8) Config { return config; } -fn parseCount(flag: []const u8, text: []const u8) usize { - const value = std.fmt.parseUnsigned(usize, text, 10) catch - fatal("{s} expects a positive integer", .{flag}); - if (value == 0 or value > 10_000) - fatal("{s} must be in 1..10000", .{flag}); - return value; -} - fn measureOutline(path: []const u8, config: Config) !Result { const samples = try gpa.alloc(u64, config.reps); defer gpa.free(samples); @@ -145,7 +142,7 @@ fn measureMaterialize( var expected: ?Identity = null; for (0..config.warmup + config.reps) |round| { const started = nowNs(); - const content = try pardes.PdfSectionRows.render(gpa, path, entries); + const content = try pardes.panes.Pdf.SectionRows.render(gpa, path, entries); const elapsed = nowNs() -| started; const identity = contentIdentity(content); gpa.free(content); @@ -255,7 +252,7 @@ fn measureWorstShape(entries: []const pdf.OutlineEntry, config: Config) !Result var expected: ?Identity = null; for (0..config.warmup + config.reps) |round| { const started = nowNs(); - const content = try pardes.PdfSectionRows.render(gpa, "/tmp/near-limit.pdf", entries); + const content = try pardes.panes.Pdf.SectionRows.render(gpa, "/tmp/near-limit.pdf", entries); const elapsed = nowNs() -| started; const identity = contentIdentity(content); gpa.free(content); @@ -300,11 +297,11 @@ fn perturbReopen(prepared: PreparedReopen, operation: usize) void { const marker: i32 = @intCast(operation % 31 + 1); const output_file = &prepared.output.file.?; output_file.scroll = @intCast(operation % 17 + 1); - prepared.output.cur_row = marker; - prepared.output.cur_col = marker + 1; - prepared.output.msel.active = true; - prepared.output.vsel.active = true; - prepared.output.nsel = 1; + prepared.output.body.cur_row = marker; + prepared.output.body.cur_col = marker + 1; + prepared.output.body.msel.active = true; + prepared.output.body.vsel.active = true; + prepared.output.body.nsel = 1; prepared.owner.search_pane = null; prepared.owner.search_row = operation % 23; prepared.core.active = prepared.output_id; @@ -313,21 +310,17 @@ fn perturbReopen(prepared: PreparedReopen, operation: usize) void { fn observeReopen(prepared: PreparedReopen) u64 { const file = prepared.output.file.?; var observed: u64 = file.scroll; - observed = observed *% 131 +% @as(u64, @intCast(@max(0, prepared.output.cur_row))); - observed = observed *% 131 +% @as(u64, @intCast(@max(0, prepared.output.cur_col))); - observed = observed *% 131 +% @intFromBool(prepared.output.msel.active); - observed = observed *% 131 +% @intFromBool(prepared.output.vsel.active); - observed = observed *% 131 +% prepared.output.nsel; + observed = observed *% 131 +% @as(u64, @intCast(@max(0, prepared.output.body.cur_row))); + observed = observed *% 131 +% @as(u64, @intCast(@max(0, prepared.output.body.cur_col))); + observed = observed *% 131 +% @intFromBool(prepared.output.body.msel.active); + observed = observed *% 131 +% @intFromBool(prepared.output.body.vsel.active); + observed = observed *% 131 +% prepared.output.body.nsel; observed = observed *% 131 +% (prepared.owner.search_pane orelse std.math.maxInt(usize)); observed = observed *% 131 +% (prepared.owner.search_row orelse std.math.maxInt(usize)); observed = observed *% 131 +% prepared.core.active; return observed; } -fn drainEffects(core: *pardes.Pardes) void { - while (core.nextEffect()) |_| {} -} - fn sectionsOutputIdentity(core: *pardes.Pardes) Identity { const owner = core.panes[0] orelse fatal("PDF pane disappeared", .{}); const output_id = owner.search_pane orelse fatal("+PdfSections was not armed", .{}); @@ -347,7 +340,7 @@ fn stepIdentity(core: *pardes.Pardes) Identity { identity.checksum = mix(identity.checksum, view.page); identity.checksum = mix(identity.checksum, @as(u64, @bitCast(view.document_scroll_y))); identity.checksum = mix(identity.checksum, owner.search_row orelse std.math.maxInt(usize)); - identity.checksum = mix(identity.checksum, view.render_revision); + identity.checksum = mix(identity.checksum, view.next_raster_revision); return identity; } @@ -389,16 +382,6 @@ fn outlineIdentity(entries: []const pdf.OutlineEntry) Identity { return .{ .items = entries.len, .bytes = bytes, .checksum = checksum }; } -fn mix(seed: u64, value: anytype) u64 { - const Value = @TypeOf(value); - const Stable = switch (@typeInfo(Value)) { - .comptime_int => u64, - else => Value, - }; - var stable: Stable = value; - return std.hash.Wyhash.hash(seed, std.mem.asBytes(&stable)); -} - fn makeWorstShape() ![]pdf.OutlineEntry { const entries = try gpa.alloc(pdf.OutlineEntry, near_limit_items); for (entries, 0..) |*entry, ordinal| { @@ -457,13 +440,6 @@ fn summarize( }; } -fn nowNs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) *| 1_000_000_000 +| - @as(u64, @intCast(ts.nsec)); -} - /// A host benchmark compiler barrier. MuPDF benchmarks are build-and-run /// steps, so they never target the freestanding web backend; an empty volatile /// asm with only the abstract memory clobber is valid on every native backend @@ -545,7 +521,6 @@ fn unlink(path: []const u8) void { _ = libc.unlink(path_z); } -fn fatal(comptime format: []const u8, args: anytype) noreturn { - std.debug.print("pdf-sections-bench: " ++ format ++ "\n", args); - std.process.exit(1); +fn parseCount(flag: []const u8, text: []const u8) usize { + return bench_util.parsePositive(fatal, flag, text, 10_000); } diff --git a/tools/lspprobe.zig b/tools/lspprobe.zig deleted file mode 100644 index 0b7d772c..00000000 --- a/tools/lspprobe.zig +++ /dev/null @@ -1,184 +0,0 @@ -//! One language query against the REAL seam, from the command line. -//! -//! pardes-lspprobe : [arg] [--reps N] -//! -//! `kind` is an `lsp.Kind` tag (`definition`, `references`, ...) or its helix -//! key (`gd`, `gr`, `gy`, `gi`, `gD`). Line and column are 1-based, the way -//! the rows print them. Rows go to stdout; the timing line goes to stderr so -//! `lspprobe gd f.rs 10:5 | head` still composes. -//! -//! This is the development probe for the PROTOCOL CLIENT: point it at a file -//! in any workspace (a rust crate, a C tree with compile_commands.json) and it -//! exercises exactly what `gd` in the editor would — same seam, same client, -//! same child server. The server is spawned fresh per invocation and kept for -//! the process, so rep 0 is the true cold cost (spawn + handshake + whatever -//! indexing the deadline allows) and later reps are the warm per-press cost. -//! Generic on purpose: no project names anywhere — the workspace is whatever -//! the file's root markers say. -const std = @import("std"); -const lsp = @import("pardes").lsp; - -extern "c" fn realpath(path: [*:0]const u8, resolved: [*]u8) ?[*:0]u8; - -pub const std_options: std.Options = .{ .log_level = .err }; - -fn nowUs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) *| 1_000_000 +| @as(u64, @intCast(ts.nsec)) / 1000; -} - -const aliases = .{ - .{ "gd", lsp.Kind.definition }, - .{ "gD", lsp.Kind.declaration }, - .{ "gy", lsp.Kind.type_definition }, - .{ "gi", lsp.Kind.implementation }, - .{ "gr", lsp.Kind.references }, -}; - -fn usage() noreturn { - std.debug.print( - \\usage: pardes-lspprobe : [arg] [--reps N] [--warm S] - \\ kind: gd gD gy gi gr, or any lsp.Kind tag (hover, references, - \\ document_symbols, workspace_symbols, incoming_calls, ...) - \\ arg: the new name for rename, the query for workspace_symbols - \\ --warm sleep S seconds after the first (cold) query — long enough - \\ for an indexing server to reach ready, narrated on stderr - \\ - , .{}); - std.process.exit(2); -} - -/// The editor's message row, here: the client's reader threads narrate server -/// state through the same sink the shells register, printed to stderr so the -/// rows on stdout stay clean. -fn statusSink(ctx: ?*anyopaque, text: []const u8) void { - _ = ctx; - std.debug.print("# status: {s}\n", .{text}); -} - -extern "c" fn usleep(usec: c_uint) c_int; - -pub fn main(init: std.process.Init) !void { - const gpa = std.heap.page_allocator; - const arena = init.arena.allocator(); - const io = std.Io.Threaded.global_single_threaded.io(); - - const args = try init.minimal.args.toSlice(arena); - if (args.len < 4) usage(); - - // comma-separated kinds share ONE server instance and its index — the - // whole battery against a big workspace pays the cold cost once - var kinds: [16]lsp.Kind = undefined; - var nkinds: usize = 0; - var kit = std.mem.tokenizeScalar(u8, args[1], ','); - while (kit.next()) |word| { - if (nkinds == kinds.len) usage(); - kinds[nkinds] = blk: { - inline for (aliases) |a| if (std.mem.eql(u8, word, a[0])) break :blk a[1]; - break :blk std.meta.stringToEnum(lsp.Kind, word) orelse usage(); - }; - nkinds += 1; - } - if (nkinds == 0) usage(); - - var pz: [4096:0]u8 = undefined; - const pz_s = std.fmt.bufPrintSentinel(&pz, "{s}", .{args[2]}, 0) catch usage(); - var realbuf: [4096]u8 = undefined; - const path = std.mem.span(realpath(pz_s.ptr, &realbuf) orelse { - std.debug.print("cannot resolve {s}\n", .{args[2]}); - std.process.exit(1); - }); - const source = std.Io.Dir.cwd().readFileAllocOptions( - io, - path, - arena, - .limited(64 << 20), - .of(u8), - 0, - ) catch { - std.debug.print("cannot read {s}\n", .{path}); - std.process.exit(1); - }; - - const colon = std.mem.indexOfScalar(u8, args[3], ':') orelse usage(); - const line = std.fmt.parseInt(u32, args[3][0..colon], 10) catch usage(); - const col = std.fmt.parseInt(u32, args[3][colon + 1 ..], 10) catch usage(); - if (line == 0 or col == 0) usage(); - - var arg: []const u8 = ""; - var reps: u32 = 1; - var warm_s: u32 = 0; - var i: usize = 4; - while (i < args.len) : (i += 1) { - if (std.mem.eql(u8, args[i], "--reps")) { - i += 1; - if (i >= args.len) usage(); - reps = @max(1, std.fmt.parseInt(u32, args[i], 10) catch usage()); - } else if (std.mem.eql(u8, args[i], "--warm")) { - i += 1; - if (i >= args.len) usage(); - warm_s = std.fmt.parseInt(u32, args[i], 10) catch usage(); - } else arg = args[i]; - } - - lsp.setStatusSink(null, statusSink); - - // 1-based line:col -> byte offset - var off: usize = 0; - var ln: u32 = 1; - while (ln < line and off < source.len) : (off += 1) { - if (source[off] == '\n') ln += 1; - } - off = @min(off + col - 1, source.len); - - const root = std.fs.path.dirname(path) orelse "/"; - const timings = try arena.alloc(u64, reps); - var stdout_buf: [64 * 1024]u8 = undefined; - var stdout = std.Io.File.stdout().writer(io, &stdout_buf); - var first_query = true; - - for (kinds[0..nkinds]) |kind| { - var rows: []const u8 = ""; - for (0..reps) |r| { - // one warm pause for the whole battery, right after the very - // first (cold, server-spawning) query — the status lines on - // stderr narrate what the server does with the time - var out: std.Io.Writer.Allocating = .init(gpa); - defer out.deinit(); - var scratch: std.heap.ArenaAllocator = .init(gpa); - defer scratch.deinit(); - const t0 = nowUs(); - try lsp.query(gpa, scratch.allocator(), .{ - .kind = kind, - .path = path, - .source = source, - .offset = @intCast(off), - .arg = arg, - .root = root, - }, &out.writer); - timings[r] = nowUs() -| t0; - rows = try arena.dupe(u8, out.written()); - if (first_query) { - first_query = false; - if (warm_s > 0) for (0..warm_s * 10) |_| { - _ = usleep(100_000); - }; - } - } - - try stdout.interface.print("## {t}\n", .{kind}); - try stdout.interface.writeAll(rows); - try stdout.interface.flush(); - - const n = std.mem.count(u8, rows, "\n"); - const cold = timings[0]; - std.mem.sort(u64, timings[0..reps], {}, std.sort.asc(u64)); - if (reps == 1) - std.debug.print("# {t}: {d} row(s) in {d}us\n", .{ kind, n, cold }) - else - std.debug.print("# {t}: {d} row(s); first {d}us, min {d}us, median {d}us ({d} reps)\n", .{ - kind, n, cold, timings[0], timings[reps / 2], reps, - }); - } -} -- cgit v1.3 From f700b2af8e874c586e6996b8311c3983203c6637 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Thu, 1 Oct 2026 13:05:10 -0300 Subject: Builtins are chips that link to a glossary generated from the registry, and the virtual filesystem is drawn as a tree #word draws a builtin as a chip on the tag's ground over a rule (Look and Exec in acme's look green and exec red), a in HTML, and links it to its entry in a new Builtins chapter wherever that chapter is in the same output (the book, the site). The chapter is drawn from docs/typ/builtins-tty.json and builtins-gui.json, which `zig build builtins-json -Dplatform=tty|gui` writes from the registry and the Help rows (src/builtins_json.zig, tools/gen_builtins_json.zig; summaryOf in ninep/ctl.zig is now pub); style.typ merges them, marking the window-only words. The doc steps refresh their build's file first, and each build's unit-test fails when its file is stale. Everyday words first (`everyday` in style.typ), then groups by leader prefix as Help has them, then settings, the words with no path, debugging and internals, and last an A-Z index of every word. `zig build book` joins the doc steps. #fstree draws a directory tree with its connectors, a description column and links to the sections that document each file; reference.typ draws the served tree with it, each pane, pty and column file on its own line, and a test in config.zig checks it against ninep/tree.zig's files both ways. The cheatsheet has a two-level version. On the site the tree reads as `tree` text in w3m and wraps descriptions under the names on a phone. The site's tutor draws its B1, B2, B3 and 1-2 chords as mouse glyphs; the landing credits Plan 9 and acme, as does the book's title page; install.typ no longer lists the mirrors (the footer does). Co-Authored-By: Claude Opus 5.5 --- build.zig | 67 +- docs/site/site.css | 37 +- docs/site/site.typ | 22 +- docs/typ/README | 33 +- docs/typ/book.typ | 4 + docs/typ/builtins-gui.json | 137 +++ docs/typ/builtins-tty.json | 118 +++ docs/typ/builtins.typ | 12 + docs/typ/cheatsheet-a4.pdf | 1937 +++++++++++++++++++++++-------------------- docs/typ/cheatsheet.typ | 23 +- docs/typ/install.typ | 1 - docs/typ/reference.typ | 76 +- docs/typ/style.typ | 221 ++++- src/builtins_json.zig | 97 +++ src/config.zig | 71 +- src/ninep/ctl.zig | 2 +- src/pardes.zig | 3 + tools/gen_builtins_json.zig | 14 + 18 files changed, 1896 insertions(+), 979 deletions(-) create mode 100644 docs/typ/builtins-gui.json create mode 100644 docs/typ/builtins-tty.json create mode 100644 docs/typ/builtins.typ create mode 100644 src/builtins_json.zig create mode 100644 tools/gen_builtins_json.zig (limited to 'tools') diff --git a/build.zig b/build.zig index 73d86937..0246d55f 100644 --- a/build.zig +++ b/build.zig @@ -122,26 +122,38 @@ pub fn build(b: *std.Build) void { const test_build = b.step("test-build", "compile unit-test programs without running them"); const doc_typ_opts = b.addOptions(); doc_typ_opts.addOption([]const u8, "dir", b.pathFromRoot("docs/typ")); + // The docs (docs/typ, docs/site): each output is one typst run, and each + // reads docs/typ/builtins-*.json; `builtins-json` refreshes this build's from the + // registry first (the tool is wired below, once the core module is). + const typst_bin: ?[]const u8 = b.findProgram(&.{"typst"}, &.{}) catch null; + var doc_renders: [3]?*std.Build.Step.Run = @splat(null); const cheatsheet_step = b.step("cheatsheet", "render docs/typ/cheatsheet-a4.typ to /share/doc/pardes/cheatsheet.pdf (needs typst)"); - if (b.findProgram(&.{"typst"}, &.{})) |typst| { - const render = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts" }); - render.addFileArg(b.path("docs/typ/cheatsheet-a4.typ")); - const pdf = render.addOutputFileArg("cheatsheet.pdf"); - render.addFileInput(b.path("docs/typ/cheatsheet.typ")); - render.addFileInput(b.path("docs/typ/style.typ")); - cheatsheet_step.dependOn(&b.addInstallFile(pdf, "share/doc/pardes/cheatsheet.pdf").step); - } else |_| cheatsheet_step.dependOn(&b.addFail("zig build cheatsheet needs typst on PATH").step); + const book_step = b.step("book", "render docs/typ/book.typ to /share/doc/pardes/pardes.pdf (needs typst)"); // The website: one Typst bundle run writes every page, the stylesheet, - // the fonts and the media (docs/site/site.typ). It reads all of docs/typ, - // docs/site and the tutor, so it always runs rather than track them. + // the fonts and the media (docs/site/site.typ). const site_step = b.step("site", "render the docs website to /share/doc/pardes/site (needs typst)"); - if (b.findProgram(&.{"typst"}, &.{})) |typst| { - const render = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", b.pathFromRoot(".") }); - render.addFileArg(b.path("docs/site/site.typ")); - const site = render.addOutputDirectoryArg("site"); - render.has_side_effects = true; - site_step.dependOn(&b.addInstallDirectory(.{ .source_dir = site, .install_dir = .prefix, .install_subdir = "share/doc/pardes/site" }).step); - } else |_| site_step.dependOn(&b.addFail("zig build site needs typst on PATH").step); + if (typst_bin) |typst| { + // They read all of docs/typ, docs/site and the tutor, so they always + // run rather than track every file. + const sheet = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts" }); + sheet.addFileArg(b.path("docs/typ/cheatsheet-a4.typ")); + sheet.has_side_effects = true; + cheatsheet_step.dependOn(&b.addInstallFile(sheet.addOutputFileArg("cheatsheet.pdf"), "share/doc/pardes/cheatsheet.pdf").step); + const book = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts", "--root", b.pathFromRoot(".") }); + book.addFileArg(b.path("docs/typ/book.typ")); + book.has_side_effects = true; + book_step.dependOn(&b.addInstallFile(book.addOutputFileArg("pardes.pdf"), "share/doc/pardes/pardes.pdf").step); + const site = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", b.pathFromRoot(".") }); + site.addFileArg(b.path("docs/site/site.typ")); + const site_dir = site.addOutputDirectoryArg("site"); + site.has_side_effects = true; + site_step.dependOn(&b.addInstallDirectory(.{ .source_dir = site_dir, .install_dir = .prefix, .install_subdir = "share/doc/pardes/site" }).step); + doc_renders = .{ sheet, book, site }; + } else { + cheatsheet_step.dependOn(&b.addFail("zig build cheatsheet needs typst on PATH").step); + book_step.dependOn(&b.addFail("zig build book needs typst on PATH").step); + site_step.dependOn(&b.addFail("zig build site needs typst on PATH").step); + } const test_nonce: ?*std.Build.Module = if (b.option(bool, "test-rebuild", "force fresh Zig test compilation while retaining cached C dependencies") orelse false) blk: { const files = b.addTempFiles(); const source = files.add("test_nonce.zig", b.fmt("pub const nonce = {d};\n", .{std.Io.Clock.awake.now(b.graph.io).nanoseconds})); @@ -976,6 +988,27 @@ pub fn build(b: *std.Build) void { }); } + // docs/typ/builtins-.json: every builtin, from the registry and the Help + // rows (src/builtins_json.zig), rewritten in the source tree so a plain + // `typst compile` reads it too; a unit test fails when it is stale. + // A terminal build writes builtins-tty.json and a window build + // builtins-gui.json; style.typ merges the two into one glossary. + const builtins_json_step = b.step("builtins-json", "rewrite docs/typ/builtins-.json from the builtin registry (-Dplatform=tty or gui)"); + if (requested_platform == .tty or requested_platform == .gui) { + const gen = b.addExecutable(.{ .name = "pardes-gen-builtins-json", .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + .root_source_file = b.path("tools/gen_builtins_json.zig"), + .imports = &.{.{ .name = "pardes", .module = core_module }}, + }) }); + const run_gen = b.addRunArtifact(gen); + const json = run_gen.addOutputFileArg("builtins.json"); + const update = b.addUpdateSourceFiles(); + update.addCopyFileToSource(json, b.fmt("docs/typ/builtins-{s}.json", .{@tagName(platform)})); + builtins_json_step.dependOn(&update.step); + for (doc_renders) |r| if (r) |run| run.step.dependOn(&update.step); + } else builtins_json_step.dependOn(&b.addFail("builtins-json writes one build's list: pass -Dplatform=tty or -Dplatform=gui").step); + const gui_shell_mod: ?*std.Build.Module = gui_mod orelse if (platform == .gui) root_mod else null; if (gui_shell_mod) |gm| { diff --git a/docs/site/site.css b/docs/site/site.css index bab762d0..ae59e79a 100644 --- a/docs/site/site.css +++ b/docs/site/site.css @@ -81,8 +81,13 @@ body { margin:0; min-height:100vh; background:var(--field) radial-gradient(color /* --- the semantic elements (docs/typ/style.typ) ------------------------------ */ .key { display:inline-block; padding:0 .3em; border-radius:4px; background:color-mix(in srgb, var(--leaf) 20%, transparent); color:var(--ink); font-size:.82em; white-space:nowrap; line-height:1.4; } .key .plus, .key .then { color:var(--leaf); opacity:.8; padding:0 .12em; } -.word { background:var(--tag); padding:0 .25em; color:var(--dim); } -.word code { font-size:.82em; color:var(--ink); } +/* a builtin or tag word: a chip to click, on the tag's ground over a rule + (Look and Exec in acme's look green and exec red) */ +:root { --look:#7fd07f; --exec:#ff8a7a; } +@media (prefers-color-scheme: light) { :root { --look:#006600; --exec:#aa0000; } } +.content code.word { font-size:.82em; color:var(--ink); background:var(--tag); padding:.05em .3em; border-radius:2px; border-bottom:2px solid var(--leaf); white-space:nowrap; } +.content code.word.look { border-bottom-color:var(--look); } +.content code.word.exec { border-bottom-color:var(--exec); } .addr code { color:var(--plum); } .file code { color:var(--leaf); } .btn, .chord { display:inline-flex; align-items:center; gap:2px; vertical-align:-.38em; margin-block:-.3em; } @@ -157,3 +162,31 @@ body { margin:0; min-height:100vh; background:var(--field) radial-gradient(color .shot figcaption { padding:3px 8px; font:16px var(--pixel); color:var(--dim); border-top:2px solid var(--leaf); } .shot.light figcaption::after { content:" · light"; color:var(--amber); } .shot .pending { aspect-ratio:960/700; display:flex; align-items:center; justify-content:center; font:15px var(--pixel); color:var(--dim); } + +/* a builtin's chip that links to its glossary entry */ +.content a:has(> code.word) { text-decoration:none; } +.content a:hover > code.word { text-decoration:underline; text-underline-offset:3px; } +.credit { font-size:18px; color:var(--dim); margin:0 0 .3em; } +/* the glossary: each entry's name is a small heading over its line */ +main[data-page="builtins"] .content h4 { font:600 18px var(--mono); color:var(--leaf); margin:1.1em 0 .1em; } +main[data-page="builtins"] .content h4 + p { margin-top:0; } +.content pre.tutor .btn, .content pre.tutor .chord { vertical-align:-.3em; } +.all-words { line-height:2.1; } + +/* the virtual filesystem as a tree: names and connectors, descriptions + in a quiet column; on a phone a description wraps under its name */ +.content pre.fstree { font-size:15px; line-height:1.35; overflow-x:visible; } +.fstree .row { display:grid; grid-template-columns:var(--name) 1fr; align-items:baseline; } +.fstree .nl { display:none; } +.fstree .branch { color:var(--rule); } +.fstree .dir, .fstree .dir a { color:var(--leaf); font-weight:700; } +.fstree a { color:var(--amber); text-decoration:none; } +.fstree a:hover { text-decoration:underline; } +.fstree .desc { color:var(--dim); font-family:var(--hand); font-size:17px; white-space:normal; line-height:1.3; } +@media (max-width:600px) { + .content pre.fstree { font-size:13px; } + .fstree .row { display:block; } + .fstree .name { display:block; } + /* under the name: its prefix is --cols cells of the 13px mono font */ + .fstree .desc { display:block; padding-left:calc(var(--cols) * 7.8px); font-size:15px; margin-bottom:.15em; } +} diff --git a/docs/site/site.typ b/docs/site/site.typ index afcd1041..52e19b01 100644 --- a/docs/site/site.typ +++ b/docs/site/site.typ @@ -4,7 +4,7 @@ // typst compile --root . --format bundle --features bundle,html docs/site/site.typ OUT // Every link is relative and every page sits at the top of OUT, so the site // works from file:// and from any static server. -#import "../typ/style.typ": chapters, tutor-path, doc-links, project +#import "../typ/style.typ": chapters, tutor-path, doc-links, project, btn, chord #let clips = toml("media/clips.toml").clip #let casts = toml("casts/casts.toml").cast @@ -23,6 +23,9 @@ or finds the word) and middle-click runs it (a builtin or a shell command). Read PDFs and source, edit code and use terminals with it, in a terminal or in its own window.], + credit: [It is built on ideas from #link("https://9p.io/plan9/")[Plan 9] from + Bell Labs: #link("https://9p.io/sys/doc/acme/acme.html")[acme]'s text as + the interface, and the 9P protocol.], status: [Linux; macOS in progress. Version #version.], terminal: [In a terminal], window: [In its own window], @@ -154,6 +157,7 @@ #document(href("index"), title: "pardes", shell("index", "pardes")[ #el("h1", (class: "masthead"))[pardes] #el("p", (class: "lead"))[#landing.lead] + #el("p", (class: "credit"))[#landing.credit] #el("p", (class: "runs"))[#landing.status] #el("div", (class: "start"))[ #for s in landing.start { @@ -197,8 +201,22 @@ ]) } +/// The tutor's text with its mouse buttons drawn: B1, B2, B3 and the +/// chords it writes 1-2 (hold 1, click 2) become the docs' mouse glyphs, +/// each with its hidden words, inside the preformatted block. +#let tutor-text(t) = { + let at = 0 + for m in t.matches(regex("\\bB([123])\\b|\\b([123])-([123])\\b")) { + t.slice(at, m.start) + if m.captures.at(0) != none { btn("B" + m.captures.at(0)) } + else { chord("B" + m.captures.at(1), "B" + m.captures.at(2)) } + at = m.end + } + t.slice(at) +} + #document(href("tutor"), title: "The tutor", shell("tutor", "The tutor")[ #heading(level: 1)[The tutor] The tutor as the editor shows it (#raw("Tutor"), or #raw("SPC h t")). - #el("pre", (class: "tutor"))[#read(tutor-path)] + #el("pre", (class: "tutor"))[#tutor-text(read(tutor-path))] ]) diff --git a/docs/typ/README b/docs/typ/README index 522d99ff..5db2cf76 100644 --- a/docs/typ/README +++ b/docs/typ/README @@ -35,14 +35,16 @@ Build (from the repo root): The contract for content files ------------------------------ Start a content file with - #import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs + #import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs, fstree (a content file does not import page setup; the same file goes into the book, the HTML and, for the cheatsheet, the A4 page) and use plain markup (= headings, - lists, `raw`, *strong*) plus these. Never set page, fonts, colours or spacing in a content file; ask for a new function instead. - word(w) a builtin or tag word, drawn as it sits in a tag. + word(w) a builtin or tag word, drawn as a chip on the tag's + ground; a builtin links to its entry in the Builtins + chapter wherever that chapter is in the same output. #word("Save") #word("Tty+bash") key(k) one press, or a sequence of presses separated by spaces, drawn as one pill (Ctrl + w, g › g). @@ -68,12 +70,39 @@ new function instead. config keys detached, mapped in `topics`). A link in the book and the HTML; on the A4 sheet, its name. #doc("building", section: "listeners") + fstree(spec) a directory tree drawn as `tree` draws one, from a raw + block: two spaces of indent per level, the name (a + directory ends in /), two or more spaces, a one-line + description, an optional @label of the section that + documents it (a link where that section is in the + same output). reference.typ's tree is checked against + the files the session serves. + #fstree(``` + index a line per pane @rules + pane/ + new open: a new pane @panes + ```) + theme-gallery() every theme as a picture, on the site's Themes page; + nothing on paper. pairs(split:, ..cells) a two-column table, a thing and its meaning, rows on alternating tints; split: 2 sets it as two tables side by side on paper. Cells alternate left, right. #pairs(key("u"), [undo], keys("i", "a"), [insert]) +Builtins +-------- +builtins-tty.json and builtins-gui.json are every builtin of the terminal +and the window build (name, leader, Help's other shortcuts, arg, scope, +setting, choices, doc), written by `zig build builtins-json -Dplatform=tty` +and `-Dplatform=gui` from the registry and the Help rows +(src/builtins_json.zig). style.typ merges them, marking each word "both", +"tty" or "gui". The doc steps refresh their build's file first, and each +build's unit-test fails when its file is stale. #word takes a name from +either file. builtins.typ draws it as the +glossary; `everyday`, `internals` and `builtin-groups` in style.typ say +in what order. + The drift test -------------- The unit test "docs/typ names only words, keys and default tags that diff --git a/docs/typ/book.typ b/docs/typ/book.typ index 7223ea1d..b2245372 100644 --- a/docs/typ/book.typ +++ b/docs/typ/book.typ @@ -30,6 +30,10 @@ text(size: 34pt, weight: "bold", fill: palette.tag-name)[pardes] v(4mm) text(size: 13pt, style: "italic", fill: palette.tag-fg, tagline) + v(10mm) + text(size: 11pt, fill: palette.ink)[Built on ideas from #link("https://9p.io/plan9/")[Plan 9] from Bell + Labs: #link("https://9p.io/sys/doc/acme/acme.html")[acme]'s text as the interface, and the 9P + protocol.] v(2fr) }) diff --git a/docs/typ/builtins-gui.json b/docs/typ/builtins-gui.json new file mode 100644 index 00000000..ec214069 --- /dev/null +++ b/docs/typ/builtins-gui.json @@ -0,0 +1,137 @@ +[ + {"name": "Ascii", "leader": "SPC t a", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "add the printable ASCII bitmaps to the matcher's glyph set"}, + {"name": "Attach", "leader": "SPC s a", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Attach this terminal to a detached pardes session by name."}, + {"name": "Back", "leader": "SPC j o", "also": ["C-o"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-o: one step back into the history."}, + {"name": "Bloom", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, 0-3", "doc": "The brightest ink glows a little: a level, 0 (off) through 3."}, + {"name": "BootShell", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "keep, replace", "doc": "A document dropped where a lone untouched shell stands: keep the shell, or replace it."}, + {"name": "Callees", "leader": "SPC l C", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the functions the function under the cursor calls."}, + {"name": "Callers", "leader": "SPC l c", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the callers of the function under the cursor."}, + {"name": "Changelog", "leader": "SPC h c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "This build's version and what changed to reach it, printed into an output buffer the same way Config prints the live settings."}, + {"name": "ChipShadow", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a notice chip casts a cell's shadow right and down, on or off."}, + {"name": "ClipPaste", "leader": "SPC p", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Paste the system clipboard after the selection."}, + {"name": "ClipPasteBefore", "leader": "SPC P", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Paste the system clipboard before the selection."}, + {"name": "ClipReplace", "leader": "SPC R", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Replace the selection with the system clipboard."}, + {"name": "ClipYank", "leader": "SPC y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Copy the selection to the system clipboard."}, + {"name": "ClipYankMain", "leader": "SPC Y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "helix `Y`: the PRIMARY selection alone, where `SPC y` joins every cursor's."}, + {"name": "CodeAction", "leader": "SPC l a", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the language server's code actions for the cursor."}, + {"name": "Collapse", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Fold a pane to its tag, or restore its share of the column."}, + {"name": "Colors", "leader": "SPC t c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Syntax colours in text panes, on or off."}, + {"name": "Config", "leader": "SPC f c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the startup file, `init`, in a pane: its pane when it is open, else the file, else a pane of that name for Save to make it and its directory."}, + {"name": "Crt", "leader": "SPC t r", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, 0-3", "doc": "The bundled CRT post pass over the window, on or off."}, + {"name": "CursorBlink", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The cursor blinks, solid while typing, on or off."}, + {"name": "Debug", "leader": "SPC t d", "also": ["topbar"], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A small box of frame statistics at the top right, on or off."}, + {"name": "Del", "leader": "SPC d", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane."}, + {"name": "DelAbove", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane, giving its rows to the pane above it."}, + {"name": "DelBelow", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane, giving its rows to the pane below it."}, + {"name": "Delcol", "leader": "SPC c d", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close this column and its panes, refusing once over unsaved text."}, + {"name": "Detach", "leader": "SPC s D", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Detach this pardes from its terminal, leaving the session running."}, + {"name": "Diagnostics", "leader": "SPC l d", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's diagnostics from the language server."}, + {"name": "Down", "leader": "SPC w j", "also": ["C-w j", "C-w down"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."}, + {"name": "Dump", "leader": "SPC s d", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the session's panes and layout to a dump file, for Restore."}, + {"name": "DumpConfig", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the settings in effect, each a word to click, and the startup file's path."}, + {"name": "DumpDir", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The directory Dump writes to and a relative Restore reads from; bare, the default."}, + {"name": "DumpThemes", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the bundled themes into the config directory's themes, to edit."}, + {"name": "Edit", "leader": null, "also": [], "arg": true, "scope": "both", "setting": false, "choices": null, "doc": "acme's Edit: sam's command language over the pane's body, from a tag, a pane ctl or exec."}, + {"name": "EffectCode", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Open the source of a panel transition or post shader, by name."}, + {"name": "Exec", "leader": null, "also": ["tab", "middle-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Execute its argument as a middle click on it would, a builtin or a shell command."}, + {"name": "Exit", "leader": "SPC q", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Quit the editor, refusing once while a pane holds unsaved text: an Exit with nothing edited since discards it."}, + {"name": "Filter", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Recolour a terminal's program colours to the theme, or show them as sent, flipping between them."}, + {"name": "Find", "leader": "SPC f f", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "List the files below this pane's directory whose names hold its argument, in a +Search."}, + {"name": "FocusTint", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The focused pane's and column's tags are tinted, on or off."}, + {"name": "Font", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The body font, by name or path, and its size."}, + {"name": "Fonts", "leader": "SPC t f", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the fonts in a pane, each a word to click."}, + {"name": "Forward", "leader": "SPC j i", "also": ["C-i"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-i: one step forward again, up to wherever Back started."}, + {"name": "Grain", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, 0-3", "doc": "The page takes a fine, still grain, like paper: a level, 0 (off) through 3."}, + {"name": "Grep", "leader": "SPC f g", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Find's sibling: Find matches file NAMES under this pane's directory, Grep matches file CONTENTS under every pane's directory at once."}, + {"name": "GripWidth", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The grip and scrollbar width, as a percent of the theme's rail."}, + {"name": "Help", "leader": "SPC ?", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the help: every key and every builtin."}, + {"name": "Hover", "leader": "SPC l k", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Ask the language server about the symbol under the cursor."}, + {"name": "HoverGlow", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A soft underline of light under the word a look-hover would open, on or off."}, + {"name": "InactiveDim", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Fade the unfocused panes' text by a percentage, 0 through 100, 0 off."}, + {"name": "Joincol", "leader": "SPC c j", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Fold the active pane's column into the one on its right, keeping its panes."}, + {"name": "JumpTrail", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a jump of the cursor leaves a short trail that fades, on or off."}, + {"name": "Jumplist", "leader": "SPC j l", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the places jumped from, each a place to go."}, + {"name": "Kill", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Kill: stop the commands pardes started -- the lines it typed into a terminal, from an exec, a middle click or a pty/run, while their shell says they run (C mark to D)."}, + {"name": "Last", "leader": "SPC j j", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Go back to the last place jumped from in another pane."}, + {"name": "Left", "leader": "SPC w h", "also": ["C-w h", "C-w left"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."}, + {"name": "Lift", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, shadow, rim, auto", "doc": "How the focused pane stands off the page: off, shadow, rim or auto."}, + {"name": "Ligatures", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A font's programming ligatures draw across their cells, on or off."}, + {"name": "LocationsConfig", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Set how location rows are drawn, or show how they are when bare."}, + {"name": "Look", "leader": null, "also": ["enter", "right-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Look at its argument: open the file or address it names, else find the word, as a right click does."}, + {"name": "LookWord", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "search, list", "doc": "A plain word looked at: search selects its next place in the pane, list lists every place in a +Search."}, + {"name": "Lspinfo", "leader": "SPC l i", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Show which language servers serve this file and their state."}, + {"name": "Lspwhy", "leader": "SPC l w", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Explain how the last language server request was answered, step by step."}, + {"name": "MessageAnimation", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A message falls into its row and dissolves out of it, on or off."}, + {"name": "MessageDissolve", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message takes to dissolve."}, + {"name": "MessageFall", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message takes to fall into its row."}, + {"name": "MessageLinger", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message stays after what dismisses it."}, + {"name": "Messages", "leader": "SPC h m", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the messages shown so far."}, + {"name": "Mini", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Open a minimap of the file in braille dots."}, + {"name": "Mode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Cycle the pane's input modes: terminals add raw tty mode to normal/insert."}, + {"name": "Motion", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "off, crisp, smooth, bouncy, playful", "doc": "How animations move: off, crisp, smooth, bouncy or playful."}, + {"name": "Mount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Mount another pardes's 9P tree under /n/, given its dial address."}, + {"name": "Msg", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show its argument on this pane's message row."}, + {"name": "New", "leader": "SPC f n", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Open an empty scratch pane, /+New, in this pane's directory."}, + {"name": "Newcol", "leader": "SPC c n", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "An empty column right of the keyboard's, its tag taking the keyboard."}, + {"name": "NextColor", "leader": "SPC t n", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Switch to the next bundled theme."}, + {"name": "Occlusion", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Pane bodies darken faintly toward their edges, on or off."}, + {"name": "Pager", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "pardes, off", "doc": "What a terminal's commands page through: pardes, a +Pager pane (pardes -), or off, the environment's own; for terminals started after it."}, + {"name": "PagerColor", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A +Pager keeps its program's colours, on or off; for the next text paged."}, + {"name": "Palette", "leader": "SPC t l", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "the C64 palette or the terminal's own 16"}, + {"name": "PanelAscii", "leader": "SPC a a", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close through a scatter of ASCII, on or off."}, + {"name": "PanelCurtain", "leader": "SPC a c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close like a curtain, on or off."}, + {"name": "PanelDissolve", "leader": "SPC a d", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes dissolve in and out as they open and close, on or off."}, + {"name": "PanelEdges", "leader": "SPC a e", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close from their edges, on or off."}, + {"name": "PanelFall", "leader": "SPC a f", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes fall into place as they open, on or off."}, + {"name": "PanelScramble", "leader": "SPC a r", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close through scrambled text, on or off."}, + {"name": "PanelSlide", "leader": "SPC a s", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes slide in and out as they open and close, on or off."}, + {"name": "PanelType", "leader": "SPC a t", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes type themselves in as they open, on or off."}, + {"name": "PanelVertical", "leader": "SPC a v", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close with a vertical wipe, on or off."}, + {"name": "PanelWave", "leader": "SPC a w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close in a wave, on or off."}, + {"name": "PanelZoom", "leader": "SPC a z", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes zoom in and out as they open and close, on or off."}, + {"name": "Parallax", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A theme's page pattern moves with the text at a quarter of its speed, on or off."}, + {"name": "PdfFit", "leader": "SPC t z", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Fit the PDF page to the pane by width or by height, flipping between them (or to the one named, `width|height`)."}, + {"name": "PdfSections", "leader": "SPC t s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the PDF's sections in a pane, each a place to go."}, + {"name": "PdfTint", "leader": "SPC t i", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Tint the PDF page to the theme, or show it as printed, stepping through them (or to the one named, `disabled|filtered|full`)."}, + {"name": "Pet", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "An optional SDL workspace-tag companion; never consumes input or text cells."}, + {"name": "Petscii", "leader": "SPC t p", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "glyph art over the host's pixels: an image pane's picture, or the kitty graphics a terminal's program placed (yazi's previews)"}, + {"name": "Placement", "leader": "SPC c p", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "acme, pardes", "doc": "Where a new pane goes: acme, as makenewwindow does, or pardes, the older rules."}, + {"name": "Recent", "leader": "SPC f r", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the files opened lately, closed ones too, each a place to open again."}, + {"name": "Redo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Redo the last undone edit."}, + {"name": "Rename", "leader": "SPC l r", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Rename the symbol under the cursor everywhere, to its argument."}, + {"name": "Repl", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Binds this terminal as a language's REPL, so an exec on that language's files is typed into it instead of run."}, + {"name": "Restore", "leader": "SPC s r", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Replace every pane with those of a dump file, the last one Dump wrote when bare."}, + {"name": "Right", "leader": "SPC w l", "also": ["C-w l", "C-w right"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."}, + {"name": "Save", "leader": "SPC f s", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Write the pane's text to its file, or to the file its argument names."}, + {"name": "SelectRefs", "leader": "SPC l h", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select every reference to the symbol under the cursor."}, + {"name": "SelectionGlow", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A soft halo of the selection's colour round it in the body, on or off."}, + {"name": "Shader", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "A Shadertoy file into the post chain, or out of it, compiled again when saved; off empties the chain."}, + {"name": "ShaderAnimation", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "off, on, always", "doc": "When the post chain animates on its own: off, on (while focused) or always."}, + {"name": "Shell", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The shell new terminals run; bare, $SHELL if it is executable, else /bin/sh."}, + {"name": "Subtypes", "leader": "SPC l T", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the subtypes of the type under the cursor."}, + {"name": "Supertypes", "leader": "SPC l t", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the supertypes of the type under the cursor."}, + {"name": "Symbols", "leader": "SPC l s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's symbols from the language server."}, + {"name": "SyntaxBold", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Keywords and the like are drawn bold, on or off."}, + {"name": "Tagbottom", "leader": "SPC t b", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Each pane's tag goes at its foot rather than its head, on or off."}, + {"name": "TaglineSize", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Scale the tag font, a percentage."}, + {"name": "TermImages", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "real, petscii", "doc": "How a new terminal draws its program's kitty graphics: real, as pixels where it can, or petscii, as glyph art."}, + {"name": "Theme", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Switch to the named theme."}, + {"name": "ThemeFile", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Load a theme from a file."}, + {"name": "Themes", "leader": "SPC t t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the themes in a pane, each a word to click."}, + {"name": "ThumbFlash", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a pane's scroll thumb brightens as it scrolls and fades back, on or off."}, + {"name": "Togglettymode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Switch this terminal between raw program input and normal editor mode."}, + {"name": "TreeContext", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show the declarations enclosing the top row at the pane's head, on or off."}, + {"name": "TreeContextTagStyle", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A pane's TreeContext rows draw in the tag's style, on or off."}, + {"name": "Tty", "leader": "SPC n t", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "A shell in the calling pane's directory, raw from the first frame."}, + {"name": "Tty9p", "leader": "SPC n 9", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "A Linux terminal with the current session mounted through kernel v9fs."}, + {"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."}, + {"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."}, + {"name": "Unmount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Unmount the 9P tree mounted under /n/."}, + {"name": "Up", "leader": "SPC w k", "also": ["C-w k", "C-w up"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."}, + {"name": "Verbose", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A builtin says its own name on the message row as it runs, on or off."}, + {"name": "Vignette", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, 0-3", "doc": "The window's corners fall into shade: a level, 0 (off) through 3."}, + {"name": "WindowOpacity", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The window's opacity, a percentage."}, + {"name": "Wrap", "leader": "SPC t w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Long lines wrap onto the next row, on or off."}, + {"name": "WsDiagnostics", "leader": "SPC l D", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the workspace's diagnostics from the language server."}, + {"name": "WsSymbols", "leader": "SPC l S", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Search the workspace's symbols for its argument."} +] diff --git a/docs/typ/builtins-tty.json b/docs/typ/builtins-tty.json new file mode 100644 index 00000000..6dd09882 --- /dev/null +++ b/docs/typ/builtins-tty.json @@ -0,0 +1,118 @@ +[ + {"name": "Ascii", "leader": "SPC t a", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "add the printable ASCII bitmaps to the matcher's glyph set"}, + {"name": "Attach", "leader": "SPC s a", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Attach this terminal to a detached pardes session by name."}, + {"name": "Back", "leader": "SPC j o", "also": ["C-o"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-o: one step back into the history."}, + {"name": "BootShell", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "keep, replace", "doc": "A document dropped where a lone untouched shell stands: keep the shell, or replace it."}, + {"name": "Callees", "leader": "SPC l C", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the functions the function under the cursor calls."}, + {"name": "Callers", "leader": "SPC l c", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the callers of the function under the cursor."}, + {"name": "Changelog", "leader": "SPC h c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "This build's version and what changed to reach it, printed into an output buffer the same way Config prints the live settings."}, + {"name": "ChipShadow", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a notice chip casts a cell's shadow right and down, on or off."}, + {"name": "ClipPaste", "leader": "SPC p", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Paste the system clipboard after the selection."}, + {"name": "ClipPasteBefore", "leader": "SPC P", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Paste the system clipboard before the selection."}, + {"name": "ClipReplace", "leader": "SPC R", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Replace the selection with the system clipboard."}, + {"name": "ClipYank", "leader": "SPC y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Copy the selection to the system clipboard."}, + {"name": "ClipYankMain", "leader": "SPC Y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "helix `Y`: the PRIMARY selection alone, where `SPC y` joins every cursor's."}, + {"name": "CodeAction", "leader": "SPC l a", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the language server's code actions for the cursor."}, + {"name": "Collapse", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Fold a pane to its tag, or restore its share of the column."}, + {"name": "Colors", "leader": "SPC t c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Syntax colours in text panes, on or off."}, + {"name": "Config", "leader": "SPC f c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the startup file, `init`, in a pane: its pane when it is open, else the file, else a pane of that name for Save to make it and its directory."}, + {"name": "Debug", "leader": "SPC t d", "also": ["topbar"], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A small box of frame statistics at the top right, on or off."}, + {"name": "Del", "leader": "SPC d", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane."}, + {"name": "DelAbove", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane, giving its rows to the pane above it."}, + {"name": "DelBelow", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close the pane, giving its rows to the pane below it."}, + {"name": "Delcol", "leader": "SPC c d", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Close this column and its panes, refusing once over unsaved text."}, + {"name": "Detach", "leader": "SPC s D", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Detach this pardes from its terminal, leaving the session running."}, + {"name": "Diagnostics", "leader": "SPC l d", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's diagnostics from the language server."}, + {"name": "Down", "leader": "SPC w j", "also": ["C-w j", "C-w down"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."}, + {"name": "Dump", "leader": "SPC s d", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the session's panes and layout to a dump file, for Restore."}, + {"name": "DumpConfig", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the settings in effect, each a word to click, and the startup file's path."}, + {"name": "DumpDir", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The directory Dump writes to and a relative Restore reads from; bare, the default."}, + {"name": "DumpThemes", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the bundled themes into the config directory's themes, to edit."}, + {"name": "Edit", "leader": null, "also": [], "arg": true, "scope": "both", "setting": false, "choices": null, "doc": "acme's Edit: sam's command language over the pane's body, from a tag, a pane ctl or exec."}, + {"name": "EffectCode", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Open the source of a panel transition or post shader, by name."}, + {"name": "Exec", "leader": null, "also": ["tab", "middle-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Execute its argument as a middle click on it would, a builtin or a shell command."}, + {"name": "Exit", "leader": "SPC q", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Quit the editor, refusing once while a pane holds unsaved text: an Exit with nothing edited since discards it."}, + {"name": "Filter", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Recolour a terminal's program colours to the theme, or show them as sent, flipping between them."}, + {"name": "Find", "leader": "SPC f f", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "List the files below this pane's directory whose names hold its argument, in a +Search."}, + {"name": "FocusTint", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The focused pane's and column's tags are tinted, on or off."}, + {"name": "Forward", "leader": "SPC j i", "also": ["C-i"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-i: one step forward again, up to wherever Back started."}, + {"name": "Grep", "leader": "SPC f g", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Find's sibling: Find matches file NAMES under this pane's directory, Grep matches file CONTENTS under every pane's directory at once."}, + {"name": "Help", "leader": "SPC ?", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the help: every key and every builtin."}, + {"name": "Hover", "leader": "SPC l k", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Ask the language server about the symbol under the cursor."}, + {"name": "InactiveDim", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Fade the unfocused panes' text by a percentage, 0 through 100, 0 off."}, + {"name": "Joincol", "leader": "SPC c j", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Fold the active pane's column into the one on its right, keeping its panes."}, + {"name": "JumpTrail", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a jump of the cursor leaves a short trail that fades, on or off."}, + {"name": "Jumplist", "leader": "SPC j l", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the places jumped from, each a place to go."}, + {"name": "Kill", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Kill: stop the commands pardes started -- the lines it typed into a terminal, from an exec, a middle click or a pty/run, while their shell says they run (C mark to D)."}, + {"name": "Last", "leader": "SPC j j", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Go back to the last place jumped from in another pane."}, + {"name": "Left", "leader": "SPC w h", "also": ["C-w h", "C-w left"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."}, + {"name": "LocationsConfig", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Set how location rows are drawn, or show how they are when bare."}, + {"name": "Look", "leader": null, "also": ["enter", "right-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Look at its argument: open the file or address it names, else find the word, as a right click does."}, + {"name": "LookWord", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "search, list", "doc": "A plain word looked at: search selects its next place in the pane, list lists every place in a +Search."}, + {"name": "Lspinfo", "leader": "SPC l i", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Show which language servers serve this file and their state."}, + {"name": "Lspwhy", "leader": "SPC l w", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Explain how the last language server request was answered, step by step."}, + {"name": "MessageAnimation", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A message falls into its row and dissolves out of it, on or off."}, + {"name": "MessageDissolve", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message takes to dissolve."}, + {"name": "MessageFall", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message takes to fall into its row."}, + {"name": "MessageLinger", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "How long, in milliseconds, a message stays after what dismisses it."}, + {"name": "Messages", "leader": "SPC h m", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the messages shown so far."}, + {"name": "Mini", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Open a minimap of the file in braille dots."}, + {"name": "Mode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Cycle the pane's input modes: terminals add raw tty mode to normal/insert."}, + {"name": "Motion", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "off, crisp, smooth, bouncy, playful", "doc": "How animations move: off, crisp, smooth, bouncy or playful."}, + {"name": "Mount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Mount another pardes's 9P tree under /n/, given its dial address."}, + {"name": "Msg", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show its argument on this pane's message row."}, + {"name": "New", "leader": "SPC f n", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Open an empty scratch pane, /+New, in this pane's directory."}, + {"name": "Newcol", "leader": "SPC c n", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "An empty column right of the keyboard's, its tag taking the keyboard."}, + {"name": "NextColor", "leader": "SPC t n", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Switch to the next bundled theme."}, + {"name": "Pager", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "pardes, off", "doc": "What a terminal's commands page through: pardes, a +Pager pane (pardes -), or off, the environment's own; for terminals started after it."}, + {"name": "PagerColor", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A +Pager keeps its program's colours, on or off; for the next text paged."}, + {"name": "Palette", "leader": "SPC t l", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "the C64 palette or the terminal's own 16"}, + {"name": "PanelAscii", "leader": "SPC a a", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close through a scatter of ASCII, on or off."}, + {"name": "PanelCurtain", "leader": "SPC a c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close like a curtain, on or off."}, + {"name": "PanelDissolve", "leader": "SPC a d", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes dissolve in and out as they open and close, on or off."}, + {"name": "PanelEdges", "leader": "SPC a e", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close from their edges, on or off."}, + {"name": "PanelFall", "leader": "SPC a f", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes fall into place as they open, on or off."}, + {"name": "PanelScramble", "leader": "SPC a r", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close through scrambled text, on or off."}, + {"name": "PanelSlide", "leader": "SPC a s", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes slide in and out as they open and close, on or off."}, + {"name": "PanelType", "leader": "SPC a t", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes type themselves in as they open, on or off."}, + {"name": "PanelVertical", "leader": "SPC a v", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close with a vertical wipe, on or off."}, + {"name": "PanelWave", "leader": "SPC a w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes open and close in a wave, on or off."}, + {"name": "PanelZoom", "leader": "SPC a z", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Panes zoom in and out as they open and close, on or off."}, + {"name": "PdfFit", "leader": "SPC t z", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Fit the PDF page to the pane by width or by height, flipping between them (or to the one named, `width|height`)."}, + {"name": "PdfSections", "leader": "SPC t s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the PDF's sections in a pane, each a place to go."}, + {"name": "PdfTint", "leader": "SPC t i", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Tint the PDF page to the theme, or show it as printed, stepping through them (or to the one named, `disabled|filtered|full`)."}, + {"name": "Petscii", "leader": "SPC t p", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "glyph art over the host's pixels: an image pane's picture, or the kitty graphics a terminal's program placed (yazi's previews)"}, + {"name": "Placement", "leader": "SPC c p", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "acme, pardes", "doc": "Where a new pane goes: acme, as makenewwindow does, or pardes, the older rules."}, + {"name": "Recent", "leader": "SPC f r", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the files opened lately, closed ones too, each a place to open again."}, + {"name": "Redo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Redo the last undone edit."}, + {"name": "Rename", "leader": "SPC l r", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Rename the symbol under the cursor everywhere, to its argument."}, + {"name": "Repl", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Binds this terminal as a language's REPL, so an exec on that language's files is typed into it instead of run."}, + {"name": "Restore", "leader": "SPC s r", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Replace every pane with those of a dump file, the last one Dump wrote when bare."}, + {"name": "Right", "leader": "SPC w l", "also": ["C-w l", "C-w right"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."}, + {"name": "Save", "leader": "SPC f s", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Write the pane's text to its file, or to the file its argument names."}, + {"name": "SelectRefs", "leader": "SPC l h", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select every reference to the symbol under the cursor."}, + {"name": "Shell", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The shell new terminals run; bare, $SHELL if it is executable, else /bin/sh."}, + {"name": "Subtypes", "leader": "SPC l T", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the subtypes of the type under the cursor."}, + {"name": "Supertypes", "leader": "SPC l t", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the supertypes of the type under the cursor."}, + {"name": "Symbols", "leader": "SPC l s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's symbols from the language server."}, + {"name": "SyntaxBold", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Keywords and the like are drawn bold, on or off."}, + {"name": "Tagbottom", "leader": "SPC t b", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Each pane's tag goes at its foot rather than its head, on or off."}, + {"name": "TermImages", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "real, petscii", "doc": "How a new terminal draws its program's kitty graphics: real, as pixels where it can, or petscii, as glyph art."}, + {"name": "Theme", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Switch to the named theme."}, + {"name": "ThemeFile", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Load a theme from a file."}, + {"name": "Themes", "leader": "SPC t t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the themes in a pane, each a word to click."}, + {"name": "ThumbFlash", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a terminal, a pane's scroll thumb brightens as it scrolls and fades back, on or off."}, + {"name": "Togglettymode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Switch this terminal between raw program input and normal editor mode."}, + {"name": "TreeContext", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show the declarations enclosing the top row at the pane's head, on or off."}, + {"name": "TreeContextTagStyle", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A pane's TreeContext rows draw in the tag's style, on or off."}, + {"name": "Tty", "leader": "SPC n t", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "A shell in the calling pane's directory, raw from the first frame."}, + {"name": "Tty9p", "leader": "SPC n 9", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "A Linux terminal with the current session mounted through kernel v9fs."}, + {"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."}, + {"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."}, + {"name": "Unmount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Unmount the 9P tree mounted under /n/."}, + {"name": "Up", "leader": "SPC w k", "also": ["C-w k", "C-w up"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."}, + {"name": "Verbose", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A builtin says its own name on the message row as it runs, on or off."}, + {"name": "Wrap", "leader": "SPC t w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Long lines wrap onto the next row, on or off."}, + {"name": "WsDiagnostics", "leader": "SPC l D", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the workspace's diagnostics from the language server."}, + {"name": "WsSymbols", "leader": "SPC l S", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Search the workspace's symbols for its argument."} +] diff --git a/docs/typ/builtins.typ b/docs/typ/builtins.typ new file mode 100644 index 00000000..8375d5de --- /dev/null +++ b/docs/typ/builtins.typ @@ -0,0 +1,12 @@ +// Every builtin: the words you click in a tag (Exec runs them) or type as +// commands. The entries come from docs/typ/builtins-tty.json and +// builtins-gui.json, which +// `zig build builtins-json` writes from the registry and the Help rows, +// so this chapter and Help cannot drift. +#import "style.typ": builtin-glossary, word + +These are the words you click in a tag (#word("Exec") runs them) or type +as a command, a line at a time. The everyday ones come first; the rest by +what they are for. + +#builtin-glossary() diff --git a/docs/typ/cheatsheet-a4.pdf b/docs/typ/cheatsheet-a4.pdf index b8cebf62..c9b413f5 100644 --- a/docs/typ/cheatsheet-a4.pdf +++ b/docs/typ/cheatsheet-a4.pdf @@ -2,70 +2,70 @@ %€€€€ 1 0 obj -<> +<> endobj 2 0 obj -<> +<> endobj 3 0 obj -<> +<> endobj 4 0 obj -<> +<> endobj 5 0 obj -<> +<> endobj 6 0 obj -<> +<> endobj 7 0 obj -<> +<> endobj 8 0 obj -<> +<> endobj 9 0 obj -<> +<> endobj 10 0 obj -<> +<> endobj 11 0 obj -<> +<> endobj 12 0 obj -<> +<> endobj 13 0 obj -<> +<> endobj 14 0 obj -<> +<> endobj 15 0 obj -<> +<> endobj 16 0 obj <> endobj 17 0 obj -<>/K[349 0 R]/ParentTree<>/ParentTreeNextKey 1>> +<>/K[365 0 R]/ParentTree<>/ParentTreeNextKey 1>> endobj 18 0 obj -[19 0 R 19 0 R 20 0 R 22 0 R 22 0 R 25 0 R 25 0 R 25 0 R 28 0 R 28 0 R 28 0 R 28 0 R 28 0 R 28 0 R 30 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 33 0 R 34 0 R 34 0 R 34 0 R 34 0 R 37 0 R 38 0 R 39 0 R 39 0 R 41 0 R 42 0 R 44 0 R 44 0 R 45 0 R 45 0 R 45 0 R 47 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 50 0 R 51 0 R 51 0 R 51 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 55 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 57 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 58 0 R 59 0 R 61 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 65 0 R 65 0 R 66 0 R 66 0 R 66 0 R 66 0 R 67 0 R 68 0 R 70 0 R 71 0 R 73 0 R 75 0 R 75 0 R 74 0 R 75 0 R 77 0 R 80 0 R 80 0 R 78 0 R 80 0 R 79 0 R 80 0 R 82 0 R 84 0 R 84 0 R 84 0 R 84 0 R 84 0 R 83 0 R 86 0 R 87 0 R 87 0 R 89 0 R 91 0 R 90 0 R 91 0 R 91 0 R 99 0 R 94 0 R 99 0 R 95 0 R 99 0 R 96 0 R 99 0 R 97 0 R 99 0 R 98 0 R 99 0 R 99 0 R 99 0 R 100 0 R 104 0 R 101 0 R 104 0 R 104 0 R 102 0 R 104 0 R 103 0 R 104 0 R 104 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 106 0 R 108 0 R 108 0 R 108 0 R 108 0 R 108 0 R 108 0 R 109 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 112 0 R 112 0 R 114 0 R 114 0 R 114 0 R 115 0 R 117 0 R 118 0 R 120 0 R 120 0 R 120 0 R 121 0 R 123 0 R 123 0 R 123 0 R 124 0 R 126 0 R 126 0 R 127 0 R 129 0 R 129 0 R 129 0 R 129 0 R 129 0 R 129 0 R 130 0 R 130 0 R 130 0 R 132 0 R 132 0 R 133 0 R 133 0 R 135 0 R 135 0 R 136 0 R 136 0 R 138 0 R 138 0 R 138 0 R 139 0 R 141 0 R 141 0 R 141 0 R 141 0 R 141 0 R 141 0 R 142 0 R 142 0 R 144 0 R 145 0 R 145 0 R 147 0 R 147 0 R 147 0 R 147 0 R 147 0 R 147 0 R 148 0 R 148 0 R 150 0 R 150 0 R 150 0 R 150 0 R 150 0 R 150 0 R 151 0 R 153 0 R 153 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 156 0 R 157 0 R 160 0 R 161 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 164 0 R 164 0 R 164 0 R 163 0 R 164 0 R 166 0 R 167 0 R 167 0 R 167 0 R 167 0 R 169 0 R 169 0 R 169 0 R 170 0 R 170 0 R 170 0 R 170 0 R 170 0 R 172 0 R 172 0 R 172 0 R 172 0 R 172 0 R 172 0 R 173 0 R 173 0 R 175 0 R 175 0 R 175 0 R 176 0 R 178 0 R 178 0 R 178 0 R 179 0 R 179 0 R 182 0 R 182 0 R 182 0 R 183 0 R 183 0 R 183 0 R 184 0 R 186 0 R 186 0 R 186 0 R 186 0 R 186 0 R 187 0 R 189 0 R 189 0 R 189 0 R 189 0 R 189 0 R 190 0 R 192 0 R 192 0 R 192 0 R 192 0 R 192 0 R 193 0 R 195 0 R 195 0 R 195 0 R 195 0 R 195 0 R 196 0 R 198 0 R 198 0 R 198 0 R 198 0 R 198 0 R 199 0 R 201 0 R 201 0 R 201 0 R 201 0 R 201 0 R 202 0 R 204 0 R 204 0 R 204 0 R 205 0 R 207 0 R 207 0 R 207 0 R 207 0 R 207 0 R 208 0 R 210 0 R 210 0 R 210 0 R 210 0 R 210 0 R 211 0 R 213 0 R 213 0 R 213 0 R 213 0 R 213 0 R 214 0 R 216 0 R 216 0 R 216 0 R 216 0 R 216 0 R 217 0 R 219 0 R 219 0 R 219 0 R 219 0 R 219 0 R 220 0 R 222 0 R 222 0 R 222 0 R 223 0 R 227 0 R 227 0 R 227 0 R 228 0 R 230 0 R 230 0 R 230 0 R 230 0 R 230 0 R 231 0 R 233 0 R 233 0 R 233 0 R 233 0 R 233 0 R 234 0 R 236 0 R 236 0 R 236 0 R 236 0 R 236 0 R 237 0 R 239 0 R 239 0 R 239 0 R 239 0 R 239 0 R 240 0 R 242 0 R 242 0 R 242 0 R 242 0 R 242 0 R 243 0 R 245 0 R 245 0 R 245 0 R 245 0 R 245 0 R 246 0 R 248 0 R 248 0 R 248 0 R 248 0 R 248 0 R 249 0 R 251 0 R 251 0 R 251 0 R 251 0 R 251 0 R 252 0 R 254 0 R 254 0 R 254 0 R 254 0 R 254 0 R 255 0 R 257 0 R 257 0 R 257 0 R 257 0 R 257 0 R 258 0 R 260 0 R 260 0 R 260 0 R 260 0 R 260 0 R 261 0 R 263 0 R 263 0 R 263 0 R 264 0 R 269 0 R 270 0 R 272 0 R 272 0 R 272 0 R 272 0 R 271 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 274 0 R 276 0 R 275 0 R 275 0 R 276 0 R 277 0 R 277 0 R 277 0 R 279 0 R 283 0 R 283 0 R 280 0 R 283 0 R 283 0 R 283 0 R 283 0 R 283 0 R 281 0 R 283 0 R 282 0 R 283 0 R 286 0 R 287 0 R 291 0 R 291 0 R 288 0 R 291 0 R 291 0 R 289 0 R 291 0 R 290 0 R 291 0 R 291 0 R 291 0 R 292 0 R 293 0 R 297 0 R 297 0 R 294 0 R 297 0 R 297 0 R 297 0 R 295 0 R 297 0 R 296 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 300 0 R 301 0 R 304 0 R 302 0 R 304 0 R 304 0 R 304 0 R 303 0 R 304 0 R 304 0 R 304 0 R 304 0 R 304 0 R 305 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 306 0 R 308 0 R 308 0 R 308 0 R 308 0 R 307 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 309 0 R 312 0 R 312 0 R 312 0 R 312 0 R 310 0 R 312 0 R 312 0 R 312 0 R 312 0 R 312 0 R 311 0 R 312 0 R 312 0 R 313 0 R 317 0 R 314 0 R 317 0 R 315 0 R 317 0 R 317 0 R 316 0 R 317 0 R 317 0 R 318 0 R 318 0 R 318 0 R 319 0 R 320 0 R 320 0 R 322 0 R 323 0 R 323 0 R 325 0 R 327 0 R 326 0 R 327 0 R 327 0 R 329 0 R 330 0 R 332 0 R 334 0 R 333 0 R 334 0 R 334 0 R 336 0 R 338 0 R 338 0 R 338 0 R 338 0 R 338 0 R 337 0 R 340 0 R 342 0 R 341 0 R 342 0 R 345 0 R 345 0 R 345 0 R 345 0 R 345 0 R 345 0 R 345 0 R 346 0 R 348 0 R 347 0 R 347 0 R 348 0 R 348 0 R] +[19 0 R 19 0 R 20 0 R 22 0 R 22 0 R 25 0 R 25 0 R 25 0 R 28 0 R 28 0 R 28 0 R 28 0 R 28 0 R 28 0 R 30 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 31 0 R 33 0 R 34 0 R 34 0 R 34 0 R 34 0 R 37 0 R 38 0 R 39 0 R 39 0 R 41 0 R 42 0 R 44 0 R 44 0 R 45 0 R 45 0 R 45 0 R 47 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 48 0 R 50 0 R 51 0 R 51 0 R 51 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 54 0 R 55 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 57 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 58 0 R 59 0 R 61 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 62 0 R 65 0 R 65 0 R 66 0 R 66 0 R 66 0 R 66 0 R 67 0 R 68 0 R 70 0 R 71 0 R 73 0 R 75 0 R 75 0 R 74 0 R 75 0 R 77 0 R 80 0 R 80 0 R 78 0 R 80 0 R 79 0 R 80 0 R 82 0 R 84 0 R 84 0 R 84 0 R 84 0 R 84 0 R 83 0 R 86 0 R 87 0 R 87 0 R 89 0 R 91 0 R 90 0 R 91 0 R 91 0 R 99 0 R 94 0 R 99 0 R 95 0 R 99 0 R 96 0 R 99 0 R 97 0 R 99 0 R 98 0 R 99 0 R 99 0 R 99 0 R 100 0 R 104 0 R 101 0 R 104 0 R 104 0 R 102 0 R 104 0 R 103 0 R 104 0 R 104 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 105 0 R 106 0 R 108 0 R 108 0 R 108 0 R 108 0 R 108 0 R 108 0 R 109 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 111 0 R 112 0 R 112 0 R 114 0 R 114 0 R 114 0 R 115 0 R 117 0 R 118 0 R 120 0 R 120 0 R 120 0 R 121 0 R 123 0 R 123 0 R 123 0 R 124 0 R 126 0 R 126 0 R 127 0 R 129 0 R 129 0 R 129 0 R 129 0 R 129 0 R 129 0 R 130 0 R 130 0 R 130 0 R 132 0 R 132 0 R 133 0 R 133 0 R 135 0 R 135 0 R 136 0 R 136 0 R 138 0 R 138 0 R 138 0 R 139 0 R 141 0 R 141 0 R 141 0 R 141 0 R 141 0 R 141 0 R 142 0 R 142 0 R 144 0 R 145 0 R 145 0 R 147 0 R 147 0 R 147 0 R 147 0 R 147 0 R 147 0 R 148 0 R 148 0 R 150 0 R 150 0 R 150 0 R 150 0 R 150 0 R 150 0 R 151 0 R 153 0 R 153 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 154 0 R 156 0 R 157 0 R 160 0 R 161 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 162 0 R 164 0 R 164 0 R 164 0 R 163 0 R 164 0 R 166 0 R 167 0 R 167 0 R 167 0 R 167 0 R 169 0 R 169 0 R 169 0 R 170 0 R 170 0 R 170 0 R 170 0 R 170 0 R 172 0 R 172 0 R 172 0 R 172 0 R 172 0 R 172 0 R 173 0 R 173 0 R 175 0 R 175 0 R 175 0 R 176 0 R 178 0 R 178 0 R 178 0 R 179 0 R 179 0 R 182 0 R 182 0 R 182 0 R 183 0 R 183 0 R 183 0 R 184 0 R 186 0 R 186 0 R 186 0 R 186 0 R 186 0 R 187 0 R 189 0 R 189 0 R 189 0 R 189 0 R 189 0 R 190 0 R 192 0 R 192 0 R 192 0 R 192 0 R 192 0 R 193 0 R 195 0 R 195 0 R 195 0 R 195 0 R 195 0 R 196 0 R 198 0 R 198 0 R 198 0 R 198 0 R 198 0 R 199 0 R 201 0 R 201 0 R 201 0 R 201 0 R 201 0 R 202 0 R 204 0 R 204 0 R 204 0 R 205 0 R 207 0 R 207 0 R 207 0 R 207 0 R 207 0 R 208 0 R 210 0 R 210 0 R 210 0 R 210 0 R 210 0 R 211 0 R 213 0 R 213 0 R 213 0 R 213 0 R 213 0 R 214 0 R 216 0 R 216 0 R 216 0 R 216 0 R 216 0 R 217 0 R 219 0 R 219 0 R 219 0 R 219 0 R 219 0 R 220 0 R 222 0 R 222 0 R 222 0 R 223 0 R 227 0 R 227 0 R 227 0 R 228 0 R 230 0 R 230 0 R 230 0 R 230 0 R 230 0 R 231 0 R 233 0 R 233 0 R 233 0 R 233 0 R 233 0 R 234 0 R 236 0 R 236 0 R 236 0 R 236 0 R 236 0 R 237 0 R 239 0 R 239 0 R 239 0 R 239 0 R 239 0 R 240 0 R 242 0 R 242 0 R 242 0 R 242 0 R 242 0 R 243 0 R 245 0 R 245 0 R 245 0 R 245 0 R 245 0 R 246 0 R 248 0 R 248 0 R 248 0 R 248 0 R 248 0 R 249 0 R 251 0 R 251 0 R 251 0 R 251 0 R 251 0 R 252 0 R 254 0 R 254 0 R 254 0 R 254 0 R 254 0 R 255 0 R 257 0 R 257 0 R 257 0 R 257 0 R 257 0 R 258 0 R 260 0 R 260 0 R 260 0 R 260 0 R 260 0 R 261 0 R 263 0 R 263 0 R 263 0 R 264 0 R 269 0 R 270 0 R 272 0 R 272 0 R 272 0 R 272 0 R 271 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 272 0 R 274 0 R 276 0 R 275 0 R 275 0 R 276 0 R 277 0 R 277 0 R 277 0 R 279 0 R 283 0 R 283 0 R 280 0 R 283 0 R 283 0 R 283 0 R 283 0 R 283 0 R 281 0 R 283 0 R 282 0 R 283 0 R 286 0 R 287 0 R 291 0 R 291 0 R 288 0 R 291 0 R 291 0 R 289 0 R 291 0 R 290 0 R 291 0 R 291 0 R 291 0 R 292 0 R 293 0 R 297 0 R 297 0 R 294 0 R 297 0 R 297 0 R 297 0 R 295 0 R 297 0 R 296 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 297 0 R 300 0 R 301 0 R 304 0 R 302 0 R 304 0 R 304 0 R 304 0 R 303 0 R 304 0 R 304 0 R 304 0 R 304 0 R 304 0 R 305 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 306 0 R 308 0 R 308 0 R 308 0 R 308 0 R 307 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 308 0 R 309 0 R 312 0 R 312 0 R 312 0 R 312 0 R 310 0 R 312 0 R 312 0 R 312 0 R 312 0 R 312 0 R 311 0 R 312 0 R 312 0 R 313 0 R 317 0 R 314 0 R 317 0 R 315 0 R 317 0 R 317 0 R 316 0 R 317 0 R 317 0 R 318 0 R 318 0 R 318 0 R 319 0 R 322 0 R 322 0 R 324 0 R 326 0 R 326 0 R 328 0 R 330 0 R 330 0 R 332 0 R 334 0 R 334 0 R 336 0 R 338 0 R 338 0 R 341 0 R 341 0 R 343 0 R 345 0 R 345 0 R 348 0 R 348 0 R 350 0 R 352 0 R 352 0 R 354 0 R 354 0 R 354 0 R 354 0 R 356 0 R 356 0 R 358 0 R 361 0 R 361 0 R 361 0 R 361 0 R 361 0 R 361 0 R 361 0 R 362 0 R 364 0 R 363 0 R 363 0 R 364 0 R 364 0 R] endobj 19 0 obj -<>]/K[0 1]/Pg 387 0 R>> +<>]/K[0 1]/Pg 403 0 R>> endobj 20 0 obj -<> +<> endobj 21 0 obj <><>]/K[]>> endobj 22 0 obj -<><>]/K[3 4]/Pg 387 0 R>> +<><>]/K[3 4]/Pg 403 0 R>> endobj 23 0 obj <> @@ -74,7 +74,7 @@ endobj <>]/K[]>> endobj 25 0 obj -<>]/K[5 6 7]/Pg 387 0 R>> +<>]/K[5 6 7]/Pg 403 0 R>> endobj 26 0 obj <> @@ -83,592 +83,592 @@ endobj <><>]/K[]>> endobj 28 0 obj -<><>]/K[8 9 10 11 12 13]/Pg 387 0 R>> +<><>]/K[8 9 10 11 12 13]/Pg 403 0 R>> endobj 29 0 obj <> endobj 30 0 obj -<>]/K[14]/Pg 387 0 R>> +<>]/K[14]/Pg 403 0 R>> endobj 31 0 obj -<>]/K[15 16 17 18 19 20 21 22]/Pg 387 0 R>> +<>]/K[15 16 17 18 19 20 21 22]/Pg 403 0 R>> endobj 32 0 obj <> endobj 33 0 obj -<><>]/K[23]/Pg 387 0 R>> +<><>]/K[23]/Pg 403 0 R>> endobj 34 0 obj -<><>]/K[24 25 26 27]/Pg 387 0 R>> +<><>]/K[24 25 26 27]/Pg 403 0 R>> endobj 35 0 obj <> endobj 36 0 obj -<> +<> endobj 37 0 obj -<> +<> endobj 38 0 obj -<><>]/K[29]/Pg 387 0 R>> +<><>]/K[29]/Pg 403 0 R>> endobj 39 0 obj -<><>]/K[30 31]/Pg 387 0 R>> +<><>]/K[30 31]/Pg 403 0 R>> endobj 40 0 obj <> endobj 41 0 obj -<>]/K[32]/Pg 387 0 R>> +<>]/K[32]/Pg 403 0 R>> endobj 42 0 obj -<>]/K[33]/Pg 387 0 R>> +<>]/K[33]/Pg 403 0 R>> endobj 43 0 obj <> endobj 44 0 obj -<><>]/K[34 35]/Pg 387 0 R>> +<><>]/K[34 35]/Pg 403 0 R>> endobj 45 0 obj -<><>]/K[36 37 38]/Pg 387 0 R>> +<><>]/K[36 37 38]/Pg 403 0 R>> endobj 46 0 obj <> endobj 47 0 obj -<>]/K[39]/Pg 387 0 R>> +<>]/K[39]/Pg 403 0 R>> endobj 48 0 obj -<>]/K[40 41 42 43 44 45 46]/Pg 387 0 R>> +<>]/K[40 41 42 43 44 45 46]/Pg 403 0 R>> endobj 49 0 obj <> endobj 50 0 obj -<><>]/K[47]/Pg 387 0 R>> +<><>]/K[47]/Pg 403 0 R>> endobj 51 0 obj -<><>]/K[48 49 50]/Pg 387 0 R>> +<><>]/K[48 49 50]/Pg 403 0 R>> endobj 52 0 obj <> endobj 53 0 obj -<> +<> endobj 54 0 obj -<> +<> endobj 55 0 obj -<> +<> endobj 56 0 obj -<>]/K[63 64 65 66 67 68 69 70 71 72 73 74 75]/Pg 387 0 R>> +<>]/K[63 64 65 66 67 68 69 70 71 72 73 74 75]/Pg 403 0 R>> endobj 57 0 obj -<> +<> endobj 58 0 obj -<> +<> endobj 59 0 obj -<> +<> endobj 60 0 obj <> endobj 61 0 obj -<> +<> endobj 62 0 obj -<> +<> endobj 63 0 obj <> endobj 64 0 obj -<>]/K[60 0 R 63 0 R]>> +<>]/K[60 0 R 63 0 R]>> endobj 65 0 obj -<> +<> endobj 66 0 obj -<> +<> endobj 67 0 obj -<><>]/K[101]/Pg 387 0 R>> +<><>]/K[101]/Pg 403 0 R>> endobj 68 0 obj -<><>]/K[102]/Pg 387 0 R>> +<><>]/K[102]/Pg 403 0 R>> endobj 69 0 obj <> endobj 70 0 obj -<>]/K[103]/Pg 387 0 R>> +<>]/K[103]/Pg 403 0 R>> endobj 71 0 obj -<>]/K[104]/Pg 387 0 R>> +<>]/K[104]/Pg 403 0 R>> endobj 72 0 obj <> endobj 73 0 obj -<><>]/K[105]/Pg 387 0 R>> +<><>]/K[105]/Pg 403 0 R>> endobj 74 0 obj -<> +<> endobj 75 0 obj -<><>]/K[106 107 74 0 R 109]/Pg 387 0 R>> +<><>]/K[106 107 74 0 R 109]/Pg 403 0 R>> endobj 76 0 obj <> endobj 77 0 obj -<>]/K[110]/Pg 387 0 R>> +<>]/K[110]/Pg 403 0 R>> endobj 78 0 obj -<> +<> endobj 79 0 obj -<> +<> endobj 80 0 obj -<>]/K[111 112 78 0 R 114 79 0 R 116]/Pg 387 0 R>> +<>]/K[111 112 78 0 R 114 79 0 R 116]/Pg 403 0 R>> endobj 81 0 obj <> endobj 82 0 obj -<><>]/K[117]/Pg 387 0 R>> +<><>]/K[117]/Pg 403 0 R>> endobj 83 0 obj -<> +<> endobj 84 0 obj -<><>]/K[118 119 120 121 122 83 0 R]/Pg 387 0 R>> +<><>]/K[118 119 120 121 122 83 0 R]/Pg 403 0 R>> endobj 85 0 obj <> endobj 86 0 obj -<>]/K[124]/Pg 387 0 R>> +<>]/K[124]/Pg 403 0 R>> endobj 87 0 obj -<>]/K[125 126]/Pg 387 0 R>> +<>]/K[125 126]/Pg 403 0 R>> endobj 88 0 obj <> endobj 89 0 obj -<><>]/K[127]/Pg 387 0 R>> +<><>]/K[127]/Pg 403 0 R>> endobj 90 0 obj -<> +<> endobj 91 0 obj -<><>]/K[128 90 0 R 130 131]/Pg 387 0 R>> +<><>]/K[128 90 0 R 130 131]/Pg 403 0 R>> endobj 92 0 obj <> endobj 93 0 obj -<> +<> endobj 94 0 obj -<> +<> endobj 95 0 obj -<> +<> endobj 96 0 obj -<> +<> endobj 97 0 obj -<> +<> endobj 98 0 obj -<> +<> endobj 99 0 obj -<> +<> endobj 100 0 obj -<> +<> endobj 101 0 obj -<> +<> endobj 102 0 obj -<> +<> endobj 103 0 obj -<> +<> endobj 104 0 obj -<> +<> endobj 105 0 obj -<><>]/K[155 156 157 158 159 160 161 162]/Pg 387 0 R>> +<><>]/K[155 156 157 158 159 160 161 162]/Pg 403 0 R>> endobj 106 0 obj -<><>]/K[163]/Pg 387 0 R>> +<><>]/K[163]/Pg 403 0 R>> endobj 107 0 obj <> endobj 108 0 obj -<>]/K[164 165 166 167 168 169]/Pg 387 0 R>> +<>]/K[164 165 166 167 168 169]/Pg 403 0 R>> endobj 109 0 obj -<>]/K[170]/Pg 387 0 R>> +<>]/K[170]/Pg 403 0 R>> endobj 110 0 obj <> endobj 111 0 obj -<><>]/K[171 172 173 174 175 176 177]/Pg 387 0 R>> +<><>]/K[171 172 173 174 175 176 177]/Pg 403 0 R>> endobj 112 0 obj -<><>]/K[178 179]/Pg 387 0 R>> +<><>]/K[178 179]/Pg 403 0 R>> endobj 113 0 obj <> endobj 114 0 obj -<>]/K[180 181 182]/Pg 387 0 R>> +<>]/K[180 181 182]/Pg 403 0 R>> endobj 115 0 obj -<>]/K[183]/Pg 387 0 R>> +<>]/K[183]/Pg 403 0 R>> endobj 116 0 obj <> endobj 117 0 obj -<><>]/K[184]/Pg 387 0 R>> +<><>]/K[184]/Pg 403 0 R>> endobj 118 0 obj -<><>]/K[185]/Pg 387 0 R>> +<><>]/K[185]/Pg 403 0 R>> endobj 119 0 obj <> endobj 120 0 obj -<>]/K[186 187 188]/Pg 387 0 R>> +<>]/K[186 187 188]/Pg 403 0 R>> endobj 121 0 obj -<>]/K[189]/Pg 387 0 R>> +<>]/K[189]/Pg 403 0 R>> endobj 122 0 obj <> endobj 123 0 obj -<><>]/K[190 191 192]/Pg 387 0 R>> +<><>]/K[190 191 192]/Pg 403 0 R>> endobj 124 0 obj -<><>]/K[193]/Pg 387 0 R>> +<><>]/K[193]/Pg 403 0 R>> endobj 125 0 obj <> endobj 126 0 obj -<>]/K[194 195]/Pg 387 0 R>> +<>]/K[194 195]/Pg 403 0 R>> endobj 127 0 obj -<>]/K[196]/Pg 387 0 R>> +<>]/K[196]/Pg 403 0 R>> endobj 128 0 obj <> endobj 129 0 obj -<><>]/K[197 198 199 200 201 202]/Pg 387 0 R>> +<><>]/K[197 198 199 200 201 202]/Pg 403 0 R>> endobj 130 0 obj -<><>]/K[203 204 205]/Pg 387 0 R>> +<><>]/K[203 204 205]/Pg 403 0 R>> endobj 131 0 obj <> endobj 132 0 obj -<>]/K[206 207]/Pg 387 0 R>> +<>]/K[206 207]/Pg 403 0 R>> endobj 133 0 obj -<>]/K[208 209]/Pg 387 0 R>> +<>]/K[208 209]/Pg 403 0 R>> endobj 134 0 obj <> endobj 135 0 obj -<><>]/K[210 211]/Pg 387 0 R>> +<><>]/K[210 211]/Pg 403 0 R>> endobj 136 0 obj -<><>]/K[212 213]/Pg 387 0 R>> +<><>]/K[212 213]/Pg 403 0 R>> endobj 137 0 obj <> endobj 138 0 obj -<>]/K[214 215 216]/Pg 387 0 R>> +<>]/K[214 215 216]/Pg 403 0 R>> endobj 139 0 obj -<>]/K[217]/Pg 387 0 R>> +<>]/K[217]/Pg 403 0 R>> endobj 140 0 obj <> endobj 141 0 obj -<><>]/K[218 219 220 221 222 223]/Pg 387 0 R>> +<><>]/K[218 219 220 221 222 223]/Pg 403 0 R>> endobj 142 0 obj -<><>]/K[224 225]/Pg 387 0 R>> +<><>]/K[224 225]/Pg 403 0 R>> endobj 143 0 obj <> endobj 144 0 obj -<>]/K[226]/Pg 387 0 R>> +<>]/K[226]/Pg 403 0 R>> endobj 145 0 obj -<>]/K[227 228]/Pg 387 0 R>> +<>]/K[227 228]/Pg 403 0 R>> endobj 146 0 obj <> endobj 147 0 obj -<><>]/K[229 230 231 232 233 234]/Pg 387 0 R>> +<><>]/K[229 230 231 232 233 234]/Pg 403 0 R>> endobj 148 0 obj -<><>]/K[235 236]/Pg 387 0 R>> +<><>]/K[235 236]/Pg 403 0 R>> endobj 149 0 obj <> endobj 150 0 obj -<>]/K[237 238 239 240 241 242]/Pg 387 0 R>> +<>]/K[237 238 239 240 241 242]/Pg 403 0 R>> endobj 151 0 obj -<>]/K[243]/Pg 387 0 R>> +<>]/K[243]/Pg 403 0 R>> endobj 152 0 obj <> endobj 153 0 obj -<><>]/K[244 245]/Pg 387 0 R>> +<><>]/K[244 245]/Pg 403 0 R>> endobj 154 0 obj -<><>]/K[246 247 248 249 250 251 252]/Pg 387 0 R>> +<><>]/K[246 247 248 249 250 251 252]/Pg 403 0 R>> endobj 155 0 obj <> endobj 156 0 obj -<>]/K[253]/Pg 387 0 R>> +<>]/K[253]/Pg 403 0 R>> endobj 157 0 obj -<>]/K[254]/Pg 387 0 R>> +<>]/K[254]/Pg 403 0 R>> endobj 158 0 obj <> endobj 159 0 obj -<> +<> endobj 160 0 obj -<> +<> endobj 161 0 obj -<> +<> endobj 162 0 obj -<><>]/K[257 258 259 260 261 262 263 264]/Pg 387 0 R>> +<><>]/K[257 258 259 260 261 262 263 264]/Pg 403 0 R>> endobj 163 0 obj -<> +<> endobj 164 0 obj -<><>]/K[265 266 267 163 0 R 269]/Pg 387 0 R>> +<><>]/K[265 266 267 163 0 R 269]/Pg 403 0 R>> endobj 165 0 obj <> endobj 166 0 obj -<>]/K[270]/Pg 387 0 R>> +<>]/K[270]/Pg 403 0 R>> endobj 167 0 obj -<>]/K[271 272 273 274]/Pg 387 0 R>> +<>]/K[271 272 273 274]/Pg 403 0 R>> endobj 168 0 obj <> endobj 169 0 obj -<><>]/K[275 276 277]/Pg 387 0 R>> +<><>]/K[275 276 277]/Pg 403 0 R>> endobj 170 0 obj -<><>]/K[278 279 280 281 282]/Pg 387 0 R>> +<><>]/K[278 279 280 281 282]/Pg 403 0 R>> endobj 171 0 obj <> endobj 172 0 obj -<>]/K[283 284 285 286 287 288]/Pg 387 0 R>> +<>]/K[283 284 285 286 287 288]/Pg 403 0 R>> endobj 173 0 obj -<>]/K[289 290]/Pg 387 0 R>> +<>]/K[289 290]/Pg 403 0 R>> endobj 174 0 obj <> endobj 175 0 obj -<><>]/K[291 292 293]/Pg 387 0 R>> +<><>]/K[291 292 293]/Pg 403 0 R>> endobj 176 0 obj -<><>]/K[294]/Pg 387 0 R>> +<><>]/K[294]/Pg 403 0 R>> endobj 177 0 obj <> endobj 178 0 obj -<>]/K[295 296 297]/Pg 387 0 R>> +<>]/K[295 296 297]/Pg 403 0 R>> endobj 179 0 obj -<>]/K[298 299]/Pg 387 0 R>> +<>]/K[298 299]/Pg 403 0 R>> endobj 180 0 obj <> endobj 181 0 obj -<> +<> endobj 182 0 obj -<> +<> endobj 183 0 obj -<><>]/K[303 304 305]/Pg 387 0 R>> +<><>]/K[303 304 305]/Pg 403 0 R>> endobj 184 0 obj -<><>]/K[306]/Pg 387 0 R>> +<><>]/K[306]/Pg 403 0 R>> endobj 185 0 obj <> endobj 186 0 obj -<>]/K[307 308 309 310 311]/Pg 387 0 R>> +<>]/K[307 308 309 310 311]/Pg 403 0 R>> endobj 187 0 obj -<>]/K[312]/Pg 387 0 R>> +<>]/K[312]/Pg 403 0 R>> endobj 188 0 obj <> endobj 189 0 obj -<><>]/K[313 314 315 316 317]/Pg 387 0 R>> +<><>]/K[313 314 315 316 317]/Pg 403 0 R>> endobj 190 0 obj -<><>]/K[318]/Pg 387 0 R>> +<><>]/K[318]/Pg 403 0 R>> endobj 191 0 obj <> endobj 192 0 obj -<>]/K[319 320 321 322 323]/Pg 387 0 R>> +<>]/K[319 320 321 322 323]/Pg 403 0 R>> endobj 193 0 obj -<>]/K[324]/Pg 387 0 R>> +<>]/K[324]/Pg 403 0 R>> endobj 194 0 obj <> endobj 195 0 obj -<><>]/K[325 326 327 328 329]/Pg 387 0 R>> +<><>]/K[325 326 327 328 329]/Pg 403 0 R>> endobj 196 0 obj -<><>]/K[330]/Pg 387 0 R>> +<><>]/K[330]/Pg 403 0 R>> endobj 197 0 obj <> endobj 198 0 obj -<>]/K[331 332 333 334 335]/Pg 387 0 R>> +<>]/K[331 332 333 334 335]/Pg 403 0 R>> endobj 199 0 obj -<>]/K[336]/Pg 387 0 R>> +<>]/K[336]/Pg 403 0 R>> endobj 200 0 obj <> endobj 201 0 obj -<><>]/K[337 338 339 340 341]/Pg 387 0 R>> +<><>]/K[337 338 339 340 341]/Pg 403 0 R>> endobj 202 0 obj -<><>]/K[342]/Pg 387 0 R>> +<><>]/K[342]/Pg 403 0 R>> endobj 203 0 obj <> endobj 204 0 obj -<>]/K[343 344 345]/Pg 387 0 R>> +<>]/K[343 344 345]/Pg 403 0 R>> endobj 205 0 obj -<>]/K[346]/Pg 387 0 R>> +<>]/K[346]/Pg 403 0 R>> endobj 206 0 obj <> endobj 207 0 obj -<><>]/K[347 348 349 350 351]/Pg 387 0 R>> +<><>]/K[347 348 349 350 351]/Pg 403 0 R>> endobj 208 0 obj -<><>]/K[352]/Pg 387 0 R>> +<><>]/K[352]/Pg 403 0 R>> endobj 209 0 obj <> endobj 210 0 obj -<>]/K[353 354 355 356 357]/Pg 387 0 R>> +<>]/K[353 354 355 356 357]/Pg 403 0 R>> endobj 211 0 obj -<>]/K[358]/Pg 387 0 R>> +<>]/K[358]/Pg 403 0 R>> endobj 212 0 obj <> endobj 213 0 obj -<><>]/K[359 360 361 362 363]/Pg 387 0 R>> +<><>]/K[359 360 361 362 363]/Pg 403 0 R>> endobj 214 0 obj -<><>]/K[364]/Pg 387 0 R>> +<><>]/K[364]/Pg 403 0 R>> endobj 215 0 obj <> endobj 216 0 obj -<>]/K[365 366 367 368 369]/Pg 387 0 R>> +<>]/K[365 366 367 368 369]/Pg 403 0 R>> endobj 217 0 obj -<>]/K[370]/Pg 387 0 R>> +<>]/K[370]/Pg 403 0 R>> endobj 218 0 obj <> endobj 219 0 obj -<><>]/K[371 372 373 374 375]/Pg 387 0 R>> +<><>]/K[371 372 373 374 375]/Pg 403 0 R>> endobj 220 0 obj -<><>]/K[376]/Pg 387 0 R>> +<><>]/K[376]/Pg 403 0 R>> endobj 221 0 obj <> endobj 222 0 obj -<>]/K[377 378 379]/Pg 387 0 R>> +<>]/K[377 378 379]/Pg 403 0 R>> endobj 223 0 obj -<>]/K[380]/Pg 387 0 R>> +<>]/K[380]/Pg 403 0 R>> endobj 224 0 obj <> @@ -680,118 +680,118 @@ endobj <> endobj 227 0 obj -<><>]/K[381 382 383]/Pg 387 0 R>> +<><>]/K[381 382 383]/Pg 403 0 R>> endobj 228 0 obj -<><>]/K[384]/Pg 387 0 R>> +<><>]/K[384]/Pg 403 0 R>> endobj 229 0 obj <> endobj 230 0 obj -<>]/K[385 386 387 388 389]/Pg 387 0 R>> +<>]/K[385 386 387 388 389]/Pg 403 0 R>> endobj 231 0 obj -<>]/K[390]/Pg 387 0 R>> +<>]/K[390]/Pg 403 0 R>> endobj 232 0 obj <> endobj 233 0 obj -<><>]/K[391 392 393 394 395]/Pg 387 0 R>> +<><>]/K[391 392 393 394 395]/Pg 403 0 R>> endobj 234 0 obj -<><>]/K[396]/Pg 387 0 R>> +<><>]/K[396]/Pg 403 0 R>> endobj 235 0 obj <> endobj 236 0 obj -<>]/K[397 398 399 400 401]/Pg 387 0 R>> +<>]/K[397 398 399 400 401]/Pg 403 0 R>> endobj 237 0 obj -<>]/K[402]/Pg 387 0 R>> +<>]/K[402]/Pg 403 0 R>> endobj 238 0 obj <> endobj 239 0 obj -<><>]/K[403 404 405 406 407]/Pg 387 0 R>> +<><>]/K[403 404 405 406 407]/Pg 403 0 R>> endobj 240 0 obj -<><>]/K[408]/Pg 387 0 R>> +<><>]/K[408]/Pg 403 0 R>> endobj 241 0 obj <> endobj 242 0 obj -<>]/K[409 410 411 412 413]/Pg 387 0 R>> +<>]/K[409 410 411 412 413]/Pg 403 0 R>> endobj 243 0 obj -<>]/K[414]/Pg 387 0 R>> +<>]/K[414]/Pg 403 0 R>> endobj 244 0 obj <> endobj 245 0 obj -<><>]/K[415 416 417 418 419]/Pg 387 0 R>> +<><>]/K[415 416 417 418 419]/Pg 403 0 R>> endobj 246 0 obj -<><>]/K[420]/Pg 387 0 R>> +<><>]/K[420]/Pg 403 0 R>> endobj 247 0 obj <> endobj 248 0 obj -<>]/K[421 422 423 424 425]/Pg 387 0 R>> +<>]/K[421 422 423 424 425]/Pg 403 0 R>> endobj 249 0 obj -<>]/K[426]/Pg 387 0 R>> +<>]/K[426]/Pg 403 0 R>> endobj 250 0 obj <> endobj 251 0 obj -<><>]/K[427 428 429 430 431]/Pg 387 0 R>> +<><>]/K[427 428 429 430 431]/Pg 403 0 R>> endobj 252 0 obj -<><>]/K[432]/Pg 387 0 R>> +<><>]/K[432]/Pg 403 0 R>> endobj 253 0 obj <> endobj 254 0 obj -<>]/K[433 434 435 436 437]/Pg 387 0 R>> +<>]/K[433 434 435 436 437]/Pg 403 0 R>> endobj 255 0 obj -<>]/K[438]/Pg 387 0 R>> +<>]/K[438]/Pg 403 0 R>> endobj 256 0 obj <> endobj 257 0 obj -<><>]/K[439 440 441 442 443]/Pg 387 0 R>> +<><>]/K[439 440 441 442 443]/Pg 403 0 R>> endobj 258 0 obj -<><>]/K[444]/Pg 387 0 R>> +<><>]/K[444]/Pg 403 0 R>> endobj 259 0 obj <> endobj 260 0 obj -<>]/K[445 446 447 448 449]/Pg 387 0 R>> +<>]/K[445 446 447 448 449]/Pg 403 0 R>> endobj 261 0 obj -<>]/K[450]/Pg 387 0 R>> +<>]/K[450]/Pg 403 0 R>> endobj 262 0 obj <> endobj 263 0 obj -<><>]/K[451 452 453]/Pg 387 0 R>> +<><>]/K[451 452 453]/Pg 403 0 R>> endobj 264 0 obj -<><>]/K[454]/Pg 387 0 R>> +<><>]/K[454]/Pg 403 0 R>> endobj 265 0 obj <> @@ -803,379 +803,427 @@ endobj <> endobj 268 0 obj -<> +<> endobj 269 0 obj -<> +<> endobj 270 0 obj -<> +<> endobj 271 0 obj -<> +<> endobj 272 0 obj -<> +<> endobj 273 0 obj <> endobj 274 0 obj -<> +<> endobj 275 0 obj -<> +<> endobj 276 0 obj -<> +<> endobj 277 0 obj -<> +<> endobj 278 0 obj <> endobj 279 0 obj -<> +<> endobj 280 0 obj -<> +<> endobj 281 0 obj -<> +<> endobj 282 0 obj -<> +<> endobj 283 0 obj -<> +<> endobj 284 0 obj <> endobj 285 0 obj -<>]/K[273 0 R 278 0 R 284 0 R]>> +<>]/K[273 0 R 278 0 R 284 0 R]>> endobj 286 0 obj -<> +<> endobj 287 0 obj -<> +<> endobj 288 0 obj -<> +<> endobj 289 0 obj -<> +<> endobj 290 0 obj -<> +<> endobj 291 0 obj -<> +<> endobj 292 0 obj -<> +<> endobj 293 0 obj -<> +<> endobj 294 0 obj -<> +<> endobj 295 0 obj -<> +<> endobj 296 0 obj -<> +<> endobj 297 0 obj -<> +<> endobj 298 0 obj <> endobj 299 0 obj -<>]/K[298 0 R]>> +<>]/K[298 0 R]>> endobj 300 0 obj -<> +<> endobj 301 0 obj -<> +<> endobj 302 0 obj -<> +<> endobj 303 0 obj -<> +<> endobj 304 0 obj -<> +<> endobj 305 0 obj -<> +<> endobj 306 0 obj -<> +<> endobj 307 0 obj -<> +<> endobj 308 0 obj -<> +<> endobj 309 0 obj -<> +<> endobj 310 0 obj -<> +<> endobj 311 0 obj -<> +<> endobj 312 0 obj -<> +<> endobj 313 0 obj -<> +<> endobj 314 0 obj -<> +<> endobj 315 0 obj -<> +<> endobj 316 0 obj -<> +<> endobj 317 0 obj -<> +<> endobj 318 0 obj -<>]/K[584 585 586]/Pg 387 0 R>> +<>]/K[584 585 586]/Pg 403 0 R>> endobj 319 0 obj -<><>]/K[587]/Pg 387 0 R>> +<>]/K[587]/Pg 403 0 R>> endobj 320 0 obj -<><>]/K[588 589]/Pg 387 0 R>> +<> endobj 321 0 obj -<> +<> endobj 322 0 obj -<>]/K[590]/Pg 387 0 R>> +<>]/K[588 589]/Pg 403 0 R>> endobj 323 0 obj -<>]/K[591 592]/Pg 387 0 R>> +<> endobj 324 0 obj -<> +<>]/K[590]/Pg 403 0 R>> endobj 325 0 obj -<><>]/K[593]/Pg 387 0 R>> +<> endobj 326 0 obj -<> +<>]/K[591 592]/Pg 403 0 R>> endobj 327 0 obj -<><>]/K[594 326 0 R 596 597]/Pg 387 0 R>> +<> endobj 328 0 obj -<> +<>]/K[593]/Pg 403 0 R>> endobj 329 0 obj -<>]/K[598]/Pg 387 0 R>> +<> endobj 330 0 obj -<>]/K[599]/Pg 387 0 R>> +<>]/K[594 595]/Pg 403 0 R>> endobj 331 0 obj -<> +<> endobj 332 0 obj -<><>]/K[600]/Pg 387 0 R>> +<>]/K[596]/Pg 403 0 R>> endobj 333 0 obj -<> +<> endobj 334 0 obj -<><>]/K[601 333 0 R 603 604]/Pg 387 0 R>> +<>]/K[597 598]/Pg 403 0 R>> endobj 335 0 obj -<> +<> endobj 336 0 obj -<>]/K[605]/Pg 387 0 R>> +<>]/K[599]/Pg 403 0 R>> endobj 337 0 obj -<> +<> endobj 338 0 obj -<>]/K[606 607 608 609 610 337 0 R]/Pg 387 0 R>> +<>]/K[600 601]/Pg 403 0 R>> endobj 339 0 obj -<> +<> endobj 340 0 obj -<><>]/K[612]/Pg 387 0 R>> +<> endobj 341 0 obj -<> +<>]/K[602 603]/Pg 403 0 R>> endobj 342 0 obj -<><>]/K[613 341 0 R 615]/Pg 387 0 R>> +<> endobj 343 0 obj -<> +<>]/K[604]/Pg 403 0 R>> endobj 344 0 obj -<> +<> endobj 345 0 obj -<>]/K[616 617 618 619 620 621 622]/Pg 387 0 R>> +<>]/K[605 606]/Pg 403 0 R>> endobj 346 0 obj -<> +<> endobj 347 0 obj -<> +<> endobj 348 0 obj -<> +<>]/K[607 608]/Pg 403 0 R>> endobj 349 0 obj -<> +<> endobj 350 0 obj -[/ICCBased 407 0 R] +<>]/K[609]/Pg 403 0 R>> endobj 351 0 obj -[387 0 R/XYZ 25.51181 645.8511 0] +<> endobj 352 0 obj -[387 0 R/XYZ 25.51181 804.6376 0] +<>]/K[610 611]/Pg 403 0 R>> endobj 353 0 obj -[387 0 R/XYZ 25.51181 463.1918 0] +<> endobj 354 0 obj -[387 0 R/XYZ 25.51181 276.91058 0] +<>]/K[612 613 614 615]/Pg 403 0 R>> endobj 355 0 obj -[387 0 R/XYZ 25.51181 110.019775 0] +<> endobj 356 0 obj -[387 0 R/XYZ 211.1811 571.6865 0] +<>]/K[616 617]/Pg 403 0 R>> endobj 357 0 obj -[387 0 R/XYZ 211.1811 392.59448 0] +<> endobj 358 0 obj -[387 0 R/XYZ 211.1811 240.02875 0] +<>]/K[618]/Pg 403 0 R>> endobj 359 0 obj -[387 0 R/XYZ 211.1811 133.09485 0] +<> endobj 360 0 obj -[387 0 R/XYZ 211.1811 80.625244 0] +<> endobj 361 0 obj -[387 0 R/XYZ 396.8504 804.6376 0] +<>]/K[619 620 621 622 623 624 625]/Pg 403 0 R>> endobj 362 0 obj -[387 0 R/XYZ 396.8504 756.47675 0] +<> endobj 363 0 obj -[387 0 R/XYZ 396.8504 698.34015 0] +<> endobj 364 0 obj -[387 0 R/XYZ 396.8504 659.0976 0] +<> endobj 365 0 obj -<> +<> endobj 366 0 obj -<> +[/ICCBased 423 0 R] endobj 367 0 obj -<> +[403 0 R/XYZ 25.51181 645.8511 0] endobj 368 0 obj -<>/ExtGState<>/Font<>>> +[403 0 R/XYZ 25.51181 804.6376 0] endobj 369 0 obj -<> +[403 0 R/XYZ 25.51181 463.1918 0] endobj 370 0 obj -<>/FontDescriptor 371 0 R/DW 0/W[0 0 500 1 1 581 2 2 505.99997 3 3 428 4 4 561 5 5 489 6 6 427 7 7 652 8 8 619 9 9 250 10 10 905 11 11 551 12 12 598 13 13 706 14 14 256 15 15 325 16 16 358 17 17 641 18 18 244 19 19 456 20 20 322 21 21 613 22 22 616 23 23 561 24 24 521 25 25 736 26 26 558 27 27 716 28 28 529 29 29 777 30 30 716 31 31 545 32 32 504 33 33 315 34 34 514 35 35 614 36 36 315]>> +[403 0 R/XYZ 25.51181 276.91058 0] endobj 371 0 obj -<> +[403 0 R/XYZ 25.51181 110.019775 0] endobj 372 0 obj -<> +[403 0 R/XYZ 211.1811 571.6865 0] endobj 373 0 obj -<>/FontDescriptor 374 0 R/DW 0/W[0 0 500 1 1 486 2 2 389 3 3 783 4 4 401 5 5 190 6 6 353 7 7 250 8 8 307 9 9 477 10 10 518 11 11 489 12 12 519 13 13 357 14 14 478 15 15 521 16 16 447 17 17 219 18 18 266 19 19 276 20 20 475 21 21 486 22 22 503.00003 23 23 489 24 24 472 25 25 564 26 26 444 27 27 499]>> +[403 0 R/XYZ 211.1811 392.59448 0] endobj 374 0 obj -<> +[403 0 R/XYZ 211.1811 240.02875 0] endobj 375 0 obj -<> +[403 0 R/XYZ 211.1811 133.09485 0] endobj 376 0 obj -<>/FontDescriptor 377 0 R/DW 0/W[0 0 500 1 1 390 2 2 447 3 3 264 4 4 428 5 5 316 6 6 220 7 7 250 8 8 457 9 9 542 10 10 505.99997 11 11 310 12 12 504 13 13 531 14 14 538 15 15 519 16 16 220 17 17 702 18 18 500 19 19 236 20 20 515 21 21 372 22 22 747 23 23 271 24 24 493 25 25 560 26 26 661 27 27 587 28 28 528 29 29 268 30 30 490 31 31 512 32 32 596 33 33 323 34 34 424 35 35 790 36 36 497 37 37 695 38 38 363 39 40 298 41 41 485 42 42 338 43 43 646 44 44 236 45 45 1130 46 46 685 47 47 597 48 53 465 54 54 730 55 55 839 56 56 272 57 57 297 58 58 557 59 59 503.00003 60 60 582 61 61 541]>> +[403 0 R/XYZ 211.1811 80.625244 0] endobj 377 0 obj -<> +[403 0 R/XYZ 396.8504 804.6376 0] endobj 378 0 obj -<> +[403 0 R/XYZ 396.8504 756.47675 0] endobj 379 0 obj -<>/FontDescriptor 380 0 R/DW 0/CIDToGIDMap/Identity/W[0 82 602.0508]>> +[403 0 R/XYZ 396.8504 698.34015 0] endobj 380 0 obj -<> +[403 0 R/XYZ 396.8504 659.0976 0] endobj 381 0 obj -<> +<> endobj 382 0 obj -<>/FontDescriptor 383 0 R/DW 0/W[0 0 280 1 1 652 2 2 626]>> +<> endobj 383 0 obj -<> +<> endobj 384 0 obj -<> +<>/ExtGState<>/Font<>>> endobj 385 0 obj -<>/FontDescriptor 386 0 R/DW 0/CIDToGIDMap/Identity/W[0 6 602.0508]>> +<> endobj 386 0 obj -<> +<>/FontDescriptor 387 0 R/DW 0/W[0 0 500 1 1 581 2 2 505.99997 3 3 428 4 4 561 5 5 489 6 6 427 7 7 652 8 8 619 9 9 250 10 10 905 11 11 551 12 12 598 13 13 706 14 14 256 15 15 325 16 16 358 17 17 641 18 18 244 19 19 456 20 20 322 21 21 613 22 22 616 23 23 561 24 24 521 25 25 736 26 26 558 27 27 716 28 28 529 29 29 777 30 30 716 31 31 545 32 32 504 33 33 315 34 34 514 35 35 614 36 36 315]>> endobj 387 0 obj -<> +<> endobj 388 0 obj +<> +endobj +389 0 obj +<>/FontDescriptor 390 0 R/DW 0/W[0 0 500 1 1 486 2 2 389 3 3 783 4 4 401 5 5 190 6 6 353 7 7 250 8 8 307 9 9 477 10 10 518 11 11 489 12 12 519 13 13 357 14 14 478 15 15 521 16 16 447 17 17 219 18 18 266 19 19 276 20 20 475 21 21 486 22 22 503.00003 23 23 489 24 24 472 25 25 564 26 26 444 27 27 499]>> +endobj +390 0 obj +<> +endobj +391 0 obj +<> +endobj +392 0 obj +<>/FontDescriptor 393 0 R/DW 0/W[0 0 500 1 1 390 2 2 447 3 3 264 4 4 428 5 5 316 6 6 220 7 7 250 8 8 457 9 9 542 10 10 505.99997 11 11 310 12 12 504 13 13 531 14 14 538 15 15 519 16 16 220 17 17 702 18 18 500 19 19 236 20 20 515 21 21 372 22 22 747 23 23 271 24 24 493 25 25 560 26 26 661 27 27 587 28 28 528 29 29 268 30 30 490 31 31 512 32 32 596 33 33 323 34 34 424 35 35 790 36 36 497 37 37 695 38 38 363 39 40 298 41 41 485 42 42 338 43 43 646 44 44 236 45 45 1130 46 46 685 47 47 597 48 53 465 54 54 730 55 55 839 56 56 272 57 57 297 58 58 557 59 59 503.00003 60 60 582 61 61 541 62 62 550]>> +endobj +393 0 obj +<> +endobj +394 0 obj +<> +endobj +395 0 obj +<>/FontDescriptor 396 0 R/DW 0/CIDToGIDMap/Identity/W[0 85 602.0508]>> +endobj +396 0 obj +<> +endobj +397 0 obj +<> +endobj +398 0 obj +<>/FontDescriptor 399 0 R/DW 0/W[0 0 280 1 1 652 2 2 626]>> +endobj +399 0 obj +<> +endobj +400 0 obj +<> +endobj +401 0 obj +<>/FontDescriptor 402 0 R/DW 0/CIDToGIDMap/Identity/W[0 13 602.0508]>> +endobj +402 0 obj +<> +endobj +403 0 obj +<> +endobj +404 0 obj <> stream xœûÿÿÿÿïõ endstream endobj -389 0 obj +405 0 obj <> stream xœm“M�Ú0†ïùÓC$ö@ã8�,!A ‡ýвjÏ!h$bGNràßWñkØUÕA�gì™Ç‡?Þ�Ó�2'ž&?}pg[ñ4)Û w¦Öý+³bu�vKj­©:î)?ìºîƒ0<èê:(¾çü/eË—Z%Œ5(ºÞ4A~Öý•—4Á¹žè X÷u#ñ„á/¶]mô’â ÷Z妛ë‚È× èÝšêÈ=�k­¬¯D§±nKRuÕ{rߪ)[·ùxëznúl(A–ZŸID}ð¥îz{£‰k쉟y³Šm­/4¹7û-xÚöÊc“$Ü*kåþ£Qþµl˜"/üXõ–-}ÞZöD¿_ŒºCŒ+£¸kËŠm©/¬„bM«¢(ŠõXñŸx’bÛé\ý)­K�×´"kGÒQƒÄ$h†Ø 4ÍA)2Pæhî3Ÿ‘ù Z8’¾Þ±h *@9ÎôvŽf¾ÂÞQ²Ø—;ŠÇ "Cõ~i*DºÀ ¥Ï†cŠscïè3½ãÇt‚c«Ø;f zõûà˜ù3á8Ç�ÆÞ1Á1ó§ÀÑuîãðœ�$<çè\ÂS¢ Ç5%ç¸s G¹pâ'a•ñE> stream xœ�Wy|Su¶O(ͽ@'h/)å^½·*â @@ -1197,20 +1245,20 @@ IiÍ�6}x 6�Bcó#Ünîæ ¼gôêW’WÞMÿô“©‘Ø.‘Â=Ú@<Ü<9÷ÃóI Wý8GäŒWÔ/¡’w”dd¤Yò}{H‰{oS=²íRÆñ,|D6,~…Üs cûæØÉÿPÒ„ªÈQd(6à,˲Ôzç®j)M ÿΪšzc´Î?Äôuu�œ#Ç z³ŽÑ©Ç_éJõábߦñß‘S==§ÿܾnK]kh1W»ð ÃPåë´•£x¿°°>pˆ’í¨”(‘îì—õ! Hð’à…Y@vöÒòžp4…/DëÑVR˜ª‚c00À?$l€È°÷»DÆ2NåÔÂC¶ß·}tÿè|÷÷_‘�‰f¡¥;Qä3{Ž£™ðxÿ1Oc?]±136I²colyœ‡n8&Ê“(Ljj³|ú,ðºGûÆ&SÑ s.«a„oÔ+ ;'‡ø×íoðT|sMÎÊî"g÷$fÁEØ»U7è‘ìý«Šœ¥„V9JjËiS­‘m¦þrîȱAflÈûöÄOd,T¶W|X XtƒM4¬‡¤„D:KÞ�"‘—D^4 ‘Yét{F8̇ðÿ„õ°•þb¯÷ endstream endobj -391 0 obj +407 0 obj <> stream xœûÿÿÿ ëî endstream endobj -392 0 obj +408 0 obj <> stream xœm“Mo£0†ïüŠÙƒ¥ô�Å@mEjH�8ôCMµ{&ö$‹l˘CþýÊ'©V{ôÌ÷‹ÇìÇÇ~þ"õçÅOŸ8êÉ œ×¯�IÛj1 ¨Ü¢DyõŽK0V‹Ôí¶U½Kk•8O¯1ÿ Ùà©W÷ßêitzHûêÝ—0#„™ •¨\ï.ÀÆ~¡{­–�%Œí”¬õà‡“4ö€ôÃj±GÇ^I;ÁÁ÷M²d/\¤ðCgBòþ2:ZuÔPP”œLŒH?ñÔ�Î^`{‰Gò¼[‰¶W'˜]‡ýæÜOÆœÑ > stream xœ�–{XWÞÇq *W¦YuFgl_»«}m±j×ꪈ­w¼£"¹‡@Â%—I&Éär�@HÂý&wPêªxÁ ^i ¨Ðn­Ö¾]}Ÿ½¸'Ûqö‰Öjûöíûþ3sæœyfÎù~?¿ï9LÆÄ‰ &“9}sr<7K˜œ!ÊÞÉÍJæ-Ø <”–œúÐ�úgB1ÿìP6™� ϯ¡!³¾–Ò³f ß-†f3Œ�§Îf0˜Ó§Íf0ÆÇCßt�‡Î Ü@蛌 &3˜½)"‘ÏÝ�ÈÍ& s#ù™¹Yɇ“„s^¶½¾hÁ¢w-ž³+‰;ç嬿lËâ§p„s"DÂ$~VöBcƒÉ@ä.ÿj—§äaÑ5Wƒ3˜V…È‹ý?ô°h¹}69ˆÇ“‡N2„Né˜<4ÅžÄ`2 ƬÀú^3 ÆÀr3]¸œ cÌ @@ -1230,122 +1278,148 @@ TI ^dGYa ÞöB/ƒ ƒ»±ä”f›Kœ÷;n°àcýÍ]ê®ÒÈœ¸'Û I@øe¹Õ5åÍÇ#"vÌKKÂvïO[.Y°•š‘«Wªt*Ö+'åÛÁbz¢€ž“Cën˜É¦'É뀰œk`‚iŸá`а›£# J³ò[ó?NŒÜf�é`†„7 _ÓAO{‹žòú¦š÷Á´¶3•u͘hýÁ-âvì\Ê‹T²À8Ï9“ªÌB—‰oœ¼uvô%¿qHµ›ÌÆÙ[tõÀÞ új³šÃ@Ê0ˆùþ„ÜâhøyŠD*K7CCQ=®•˜tP‹±×ØÙÞ«ï �k2Y¼�ÕH™µh’ J3ImåˆÙ`1Z±. €H_ÕŒ‚ÈOÀ”/ܸÉit#’‡éyüç¬-ÊD”c4&á”N+†´z“΂¶é }9™�P­žÂà»#¿©·ºÊn çÎä.+Ðåispš!Þ·ÍN1™ œýo.©Ï endstream endobj -394 0 obj +410 0 obj <> stream -xœûÿ þ#áö +xœûÿ þ#ãø endstream endobj -395 0 obj -<> +411 0 obj +<> stream -xœm”IoÛ0…ïúÓƒ€ä�š‹–Ä $vø�qОmqì -ˆ)AËÁÿ¾ ߨ Šâàqf8ïãˆL¼mn\»ãûSÑ;íÔ×|³|ÞvIš®Úz:²_˜»st˜S×·õÀ#-׫µoÆ$M×¾þœŸsþ—òȇÆ%„´œ†±=&iúÑŒŸ<§+,PôDkÇ~lÆ©ë$Mq?4­Ÿ“NÒôÉ»e{ æ†d&=höÖ·õ†GÚ7ÞõÒ‰v¡o¢ ¹¦EÅßú¸íbñæ4Œ|\û}KYnê$“ˆhö·fû]Ec×äx�Èkï¸oü�®Îf¿7S×}r0I*®²wñÿ,À¿l�L3¾¬ -%鯥�SDzÁì÷sëÎBÃbÝ:ºmÍýÖ8¹WJ©ÝWUU-BÇâ…”íöõŸmÓõ‚î•*í"*U‘CY¨%T%™9ê2¨"*#™%”‚ºE�†ºƒz‚z€’]¡ -¨%TµB?qö„Ø-T…úépJtÐà˰‹¾ -|ö -|å”ð(ð•R¾B2…O2…¯øŠƒ1‡s Æ\²Á˜áÜt`4a‹¨ÀX‚Qƒ±xŒÊ¨K™€§§g 2#s\A 'NÙ€3ÃtLà4ç12G80à4pgÀ™ãk0`4ÒŒ™ÄÀhÅydÔwà7`Ìp®Œ9ˆ,-œYðYÔYðYœ©•9Jø,¾ > /sÌ@dÁ—Áµ•9‚Ý‚/­_&ýÀWŠ3ùNÃÄq¦ßj®â”».cxs.·¿žúžýŸœxÕýn<_Þ®®íBUü‹�Þùý êµú ”ùoñ +xœm”IoÛ0…ïúÓƒ€ä�š‹–$ $¶ø�qОqì +ˆ)AËÁÿ¾ ߨŠâàqf8ïãˆL¼mn]ûÉ7ö§¢wÚ©¯ùfñ¼í’4]¶õt`?¾0;v§èpO]ßÖ�´X/×¾“4]ûúkr|Êù_ÊïI=h1 c{HÒô£¿øž®°@Ñ­û±�¤®“4ýÅýдþžt’¦+ïí!˜’™ô Ù[ßÖi×x×K'ú }mÈ5õ(*þÖ‡m‹7ÇaäÃÚïZ²ÈrS'™DD³wÞ7ÃØé*»&Ç;D^{Ç}ã÷tu2û-¸™ºî‹ƒIRq•½‹ÿgþe{`š ðyU(I_–>ŽË³ßÏ­; ‹uëxè¶5÷[¿çäA)¥æôPUU5ÿ‰eŸ»ú϶�ézNJ•v•‰ªÈ¡,Ô*ƒ’ÌuT•‘ÌJAÝ¢NCÝA­ ¡d—'¨jUA-ÑOœ­»…ªC?@)ƒ|vÑÂWB�Ï>B�¯¼ƒ>¾RêÀWH¦ðI¦ð—8s8×`Ì%ŒÎMF¶ˆ +Œ%5‹§¨Œ:w‘ ppp– 32Ç%”pâ” 83LÇNs:#s„Nwœ9¾F#À˜I ŒVœGF}~Æ çjÀ˜ƒÈ‚Ñ™ŸE�ŸÅ™Z™£Ô�Ïâk°à³ðb1Ç D|\[™#Ø-ø2ÐZðeÒ|¥8“ï4Lgjñ­æâŒv/¤Ü¼p5à t~ ê©ïÙ�ñŠ?ÜòÆóù%ëÚ.TÅ¿øž^Ó ^«¿PrÀ endstream endobj -396 0 obj -<> +412 0 obj +<> stream -xœ�YxSe÷o †Ï\£å^½WPÜ"¢(ˆ K¦lJ�2Jw¡{$ÝIÚÌ››ÙŒî¦´t¦3¥tƒdˆeÈRùÜx/ßßÿ“B‡ß§~ÿçÿ9ìÖ“«bw„'=979)"6!q²�Ï>,Ÿ·¥Ïܼb,ŸÙÞ=ÂètŒw^ßžó>õ }f{—[îs…µ”UÁúñ�� -(fOgÿϨ^λ+wOÀû”÷Áƒï<˜8zÂè®1š±Ž­{(ú¡_UãDãÞûDz‡§Iá›Â>ìÃG–=rQô¨È_”ÿ¨èÑ·-~ôæc¯<Öë»Ö·eüôñõøË¸ŽM|øxÞ�?‘IÎ!¿¦®=å§ëñ|ÛËÒõxžîaëFy4·WÜÕpÏýëqÌ ÌFÎ]®§Gä}‡¼Ÿ ,¿qîšxh3ì¡Ù`æÀu®M—»´bÏ .�DØWžöLøÛѤȸɰy;®·Ù�ÕZÌ:­…RTVª›ˆ?W~l“{Q…U®Ü\Ї·6îª/;”óFiV–2f3³õMŒ‹�Uš¢òý‰¹‹–ÍsE�ÝI]Œ,â›Äa$V’œg—SÉ»d{•|l‡ÒœB+•|Á“ònn�1.VÓ—p™íyôº(4,&}5¾ÝÙEI\ÒŽC8”h9‹ÙþeôWˆzq¦£—Öæû¹B©àúÎÄ“Äçï7ìsS›Ò$eø¨V‹€SrÂZN4·‹ßÌV«d”µ•ˆo/´é$ÂýXÓ ˆ¦ËT+4¤R©›•ü¦‰q»›iר§Íf�Siæ¯0ÈLqÏvvü¨Ñ­#-jC6™ Ÿ“¬ÑæèÓÍJþ!µY3 ¡¼ÛÃv±š.³=¿©­9Æl†¿-209�˜·â4<t}òɹF*Î�Ÿí$œUyµ}kÜ/>7a*šˆD'§‚ððþ’ =”eËûàŸ-ð´•u­ŸÝæ™+ÊTKs¨,žŠ¡�äè}î‚ÚØŽŽž²½-¤Ö¦4˾$>:'žˆSÖ|H�ùž-ßh¥JyF�^E¢±-Üß̓J�­Ve“2¥\•¥áKÕr�Bj° 6.@WÐxHaÁc-ì_nˆ¢’űQ»åŪD[¤LÂÅá[ü³H¹^aQ�‡í‡ºNà‡ã[‚I:(xAÞÔåå6^\v¦}�µBG—(Êl�ë!š‹J�¥u¨­23_©H“g1tKÏò`â¬Êy3¦û­ItHwU;ó,´Ek$im¶ãµ{ìÍõ�iˆ£Ð¨549MÌÁZ_L\¸~>ã@ü‰†šÜú½di!GËEÈ——¥Tä(Iq|dR,±1Ù]Ûîì8]B ¤%bÏø}‰ð»Ïßé‡À~ì¼wDX«R¡ÔZqºRÛ¢²ñ1—I«5ä±²øì…ÙZ¥>]¯ä¿¯²«VãÈŸ7C®^©ÄG ãfÜîºfLrã¦ó°£N«#×J65·—µ¥Î¬$e“èã¢qô’w©RêÄ&ï"uŒÛÝè]ÄdÖ9UfþZ“Ì»Èó¼>uWR-Y–åˆ °S›Öf-ZE ä�ŠJø¡¶Öy‘Ûrâú±*¸Ò#2­zFÁ7$æFèð\�‰1ëùØÎ²â†‚#³YW 4ó—™²KºqÏFÞ0|1÷l0è Ä^�]÷6Žá)´Z©*ÚA,Ù–LƯš‹£q¾ ->$VÕÒTêî¦ì§E)ÚœL)¹3lgzá·öxød¾»ÀIuÖî1”�YI¥T~ºA… �¦Dìy¼¤õ¬ïúÙ0"p^çYGBÔç &w”»j -¥ùdj®=ÓI•;K‹dÅâBª8>ÞJ¼9yšBo४†‹á8rr§§«ýÔÃ%ÜÀ¸Ý]tÃPŠf•Æ‹¸`£¼Á3®�Õz —Ù­°]4éâÀÄ�»w¹êÉö½¥ÁY¡——øÅ†‘á�)«ßÃa#ˆ.žFÂ¥Q›ŸŠáÙ+Îk_Q‚$oV<£%«ý°¡k‡h¹¨¥ÓœÁ¤$äF'%åO’ëx5ÆS:Ò 1¨H�Agì g"Ç>}'Ýš<ékG~¼Á`‡¦'Ñó¯Q°ôoM»Ôù²¥8ZÇ[X³ø{R�>Pƒø¹Úaýا0ZDƒ˜íý/˜­bê·Ûå%ÆÿÄlwRÍ}ÌnZ™µhEÓ:š&5j•Ò�3�ÌÁÎŒÀÞ×…½»KxÓ¥êÕC‰ty¹¸ÙEW ך1Û›È)†¤z§Ã žóV¶ì2ÖS<£Dt�v··¢ÏüeEß}‡÷'Œß5‚ñeÆ‹8øðòŒ´MMÊ+j”uÄ�ž¢–Vª³£òÃó8vãÖœNÚ²!zk0‰õ+•jmãc_—„‰êvwÔT÷ÍGœ1“ШÔSa*%)V›qXÊs­Ž|R€®Èo±ÞblÅ”'VW——WW'–ÇÄ$&Æ�xNÞè¹ÞÈjúγä;öíÉpAÁè) Eh=â Éh=ÚO¡q0ØW»¾è#ÝËN~‰£«Ð!ßßÐh+Z4m"â"â ÖAØ÷—¾§~(» V‰U qgüjuaÝñ  s÷æsÅ}ØY§g•ç1QIqq©3¥0.> -2žÂN9s¥;JWSg¬|ů<ª*ŽÂZcÓ#ñðÒØÝY$vzŠßÎØ-�øëâÎÏŸºŒŠ˜r².ä]&ŒÀ> LMÐj):CN«ˆ˜ˆü¶R³ÓQDe–W)Zˆ«çûþÙ™YSCÙ,¥ùy„Å¢É6SØYgŽ1On'°ÓSÐÑ»D{¡6¯¶Ê�Oôì¡Ó«©–dGf<>Bè«áoV«×WT7�Ø)'¬„=¢É›SÂÞÌþìã�}Õo™N -Ðg–[°îëÄ-ö‰ÃÿsèõŸyAg==.¡^†9ðâ»�èuQaU^•£æøµÿ¼F•îÉ/ì4߇ö£„N¢c££˜è¡RÄ®×iê”éáÏ¡T_Ez¶&§t*„ø¦îQ•0Þ7 £ƒéðÈ8F2häVåeï^Tèk•l‘ÇJwHc3¢øYfvB¦Ú #b2¢³Ä¥é•NwîÇ�”--Ãwÿ\þ¡A"üáówú±Þ£'::vØC>vmN“Ú®IŒ\:ÅW!W39v¾`»Ö +`º ÂîQÈå~˜“±o.haõÚýW=ãnpÑ»†|(�+¼:Ÿ¶iì9ÖlGú©ç}«C)Œ”¯a´Ò»áÒÚZºtÐ(Ò˜`Œ«G¾ð–¯Ú¤1šp£No4’W¿®©kÈuýO¢céðÐ0&iÐùêĈliRLTd|Jrzœ4EÇŸxØw#¨í—¿¢6Áy_ü€äxÚv¾^ø]?¬ïDz`¾Áz.Ö‹Þçý¿ôóÀ߮ާi-­¥Ç«´j� -×'ë²ç©u5ŽÖäéŠ -pz]g.â—ç–åUùi1*Íâ�•%ùÎÂì"IU ‰¶†1[Òw&RÑÁ9ë_ÃÿDÖ`YBqm´{(‹îJ¿�KXPˆŽÛ¸(ˆ‹äÿòã´rèQ]}ºøw#óùÝç)™�°ÉÃÆš>ó,iÕj-EoUEdo²ªZ‡¡ôTmQ �|!î³èéYùÙR�F…+rU$G5Žú¼}–žñF¥T/%°¦Ì˜„õâdz<Ï=ýí/ðê‡?ñ * ¹Fܨ2(HU¬6†@˸;¥&S%Ù ÿ¶Öz�<ŽuÃl¸ãíÙU6þßjð,Õ0q×0ÍŒÛ]û > E¦ó°ó÷ôL‹»©´–h®J\L¡y¼9*?õ �©è÷]tÅ��ÙhÌ6]Àá5^¾.Ÿv�û»ÚóZˆæ²äÅZÀ›!Wùÿ›mƒW‘Ü·]wÏv*ïZƉ×6,OYçOj4J•ÖÊoÍ©ó'VûGnÞNaÝ*•RA;ø‚5ƒÍÐ+ ²á ÏDÑûj³T¼á-´Á7=D¥Kß3ü|S»ÔŽý–ûÛÛAGÐ;vD7)û•–ôÒ ð:î›a6+ó›Å\d¡`<|R²×^qÀ4Ü%Òñ;"™„!JÀ­ ÂöxÆHXxž ¯ô‹ú`'Ïd6–Î=„f9"CÕšA -kbú˜–ÖæáŽ0ÄiHëBAžã¾Ùq²,Iîºâ—G+· Ùìf\LMkÏðÙjØl,l僊’›‘ú 3÷[TÁ µ»=Ö9eC0ì…†ø¿m�Ûrìtÿåž®Ý|om÷Æ®·/ËhyŽF¾ïí¦€æ@¾YQà�§X{/²÷‚I´ÕˆÒ!-&mú\‹!—¿£=$âP£�¬k$56…EÆðјI“ÑL´ ëíE¼s‘ 0‰ÚÕ�ŽB`1)׿(49|W(<ˆHTˆ£B4‘;ÃIƒÜ¢°Ó|óÓu˜ +pÁByc¼âÙ\/ìý ²¿ÄÚ=Ôí1¢ÜÕú’ç‰g¦.ž0ñJÀÕHêpÒéØçñ·¶nŸ9yeÛ÷É$–’e”kå*ãlc¼ckÿ¨*éÑÞf/k 56ù¿5³sF-¹²ìÙæ/ñ½>¸Y»|I)i׿1V‹ºK]%ßÏ (H<Ìrƒ� å�(Ê˯rØÔ69…b¹Ò¬¤T¹9ÛJ ¾‘·z®4±š¾fÃm¹è济kÇ(«Ja–³,ŠšL b2¼Ï\Þu²±�:Òs¨jdߌi»)‡Úf°›Uû]ò>¾iÃV7G¼± ÊoµdEðóOáhÞ¯èØéUWÐwKxâV| æ„qÿçÑ!¶=äý‰öœº¡þûü!TøÁ-fº}ó‚èòÍóº‹ø»xØä³ùÀ# ÌÅVµ¼ÙºÅÇÿ×ÿÛw¸˜igÔ&¿èù|<&o„œF8= £'\b{ºýŒÍDsÑc(-† '`-Œ¾^qè%³ªrí8ðy E¶ê�^¤\iæ'Ò tðŽÍ̶�ÊI4+ù}êJu0Ž^æíŒ\¬ô#ÐÔ7aøÂ|àÂXàäÖéÓvSvÚ®·›´{Tîô“|ÛʰÄ&mZ—çdK®DÅ—°ãð3D!ïc[s#YÆ=Ó?»ˆ²ç3F+…5):T½t;ŸÑêi;®‰DlÕÛÄ4.Ö4�6B)­VKSê­rY_msÐ;~®´c÷'D7·Éº‚º+òöJ3‡z¥n¦—q7÷Ò=Cd9s ‡LÕº<§%,?ˆVoSùï0sDŸGš´:5¹.r}ÂkAz™QnUòK:ÊÌ%D‘!1’Bý¼éq#Z±n¦‘y¿«|Äò÷ZDÁTÝQ�¥A¸ïâÜ3s®À¼«ØÑ#ž‘¸$ÕYTS\–«5k-$vJkQZsñŠÝ�§{^\–ä¿j%9w»öü³é«p]¯¾Ž„ùܺ­ŽÊÛo;ÃÔ(MYz¹–¿ --!œ@ ¹]Ç�™Lä�79ûÚö~ŽƒÏk{ß"±£ˆ½pÆJJ0UÖ'z`⧉N^îÃIX-ziã»+C³*J3È¢¬´1‘’’& ºyþqõÞ\|� - ËV¤R¥0“£nªSu5õzc+…�-<¦0r°ëÊ5~ªõDX¸ÞAE¢VNéþfc#q´7±(odaB§‡�° üs¶gÄŠ¦C;·G×¢Ï%µzÎN®B¥T©©÷f#>šñ -zŠŸa0ÇÕø -wK¨.p(¸uŒ›éhi¦ë†‚»É(Övâßçå”8lj³ŒB¯A«µ¢µ¼Þ ŸÁ¨ãßòSå žÎV˽†¹è,<øH¿O¼´íÕ¿½Æ�xîe4mzÒõlß:*¶ª>³…0z.ˆŠ -•2U_ùÂñW4ïen g$oÊN%&Ëá�+@éh§î¯.ì< ¿ØpûvzNŠÚÜñË6®žý\&eÚÉÑëòìúÁÓ鈃ÆO�‹Ø�½«XJå˳B,NIþ2î0Œ¹u|�5£e•�¢õìÇ -»Z÷ã5ŠòÄ -²,9¢ÈŸ@ÏnqG¦MRÞ`t•||ܱ›À‚1|¾š¼2n\b{þÇ[N“þ¨$‚è thXÀýêVèut^ÿãµ^Y¶acú_TÇ^¦‹in졇îAà -øwíÔÅ45uýǵh¶‹«Åž]0q€£“ a4Óä‘«ØòÛ/_dzKM/TMŒ›©©éµ‹ £òb´g†¯ú}Sþ±ûS ô˜ÖEÜ5räj�ZKh5¦\ …-CÛ=&4Io­ñÇÕf­b[|wŠr¥4a�jð°öÞŽ(/w÷SKLªZÓ>VÞì™ÄÑs!øn!Ga0ç˜ ³Ñ’k¤0?Höìæè¹Ô€÷zî D¾ÿašw Â�"¤ä!_5·Q–e´(H›\Z˜LÈÄ’Ô˜ÆÌç>CmÕÙ\uVãÞÉÀ_�N°Ú÷UvåkÍ„†?‰ [‰øö÷TçÚ?ÁÂ6z3²c³ù¿ä·�éf»èöÏ™A×MÍÇ$åXç6J„¿^Âú¡þ%š‹¹{¥ï“g¸g -ƒ–Q­]o3ñ±3ªÖŒï´¹|=ÍhHì†&-‡N$P.7zÃÿ½êfš3.vr»ÎiuT~OÁ'¹½r³TŸ¥áÏ—D¬z‡@|îöÌÂN -â¿æ]2$m5Pf¥Sg6óéÝtU=î�Ó—{§Òf±N©ä¯Óh²Þ &æ{S‹=¼zƒDØp’û±3ð=b{%ß¹ýé�H}ê©àå«í2…2G–Cbg²RÕi.¿tgˆu;�¯>‹|'„þOWºÌ¶" -kÛ•gÔ‹ñDÏ(Qi²1#ÇΠ4^*­ÊR�Ò¤8:�Xýúxñ—=§ÏQX[M¥4¡ŒTÝ»M”P“Ú üª¼£#oFÁùÍõ˜Ï~n)Ón®'Oåï¶–åÎL‰•Ûl)•DiAAië×ܰ5Éë#)ìfyÖÖú™D\¼B*¦ïX€ø&îßN’\Þ¹P]ýÖÝb̺7I -@NÞt™zÛеÕLS_×F· Ëûó÷DÙBÏ -Qv8"ÁƒQ€•‡Ý<–Û`.!Ï9ÛíDCqb‚�’X­’Ýv^o`†di]`¬‡¾ûÓžäëØÍ_<¥¢?…iÃ#NÜYÆD¯{³yвrMKû`Ì¥B~CË©ÐUŠ`;æ?wØÍ{È»T+ª.h8yüxÂ��ÿ¶‚õ)ø_¸Áu¡ +xœ�Y tSÕÖn  Ï^£å^½PœEDQ™‘QfJ�2”Î…ÎCÒ¹I›ñæfl†ÎIié˜tJ)�Á‚Š2#–A&‘çŒ;xx¿ÿJ¡-¾§¾ýkee¼ûdŸ½¿ý�ýíËò1‡Åbù½–˜›’´6,1*ü•5a)ÑÛ½¿-ôž'5£IÏS£}È‘>”Fsïy4ïɯ³�ùI?â·;œ§|||zÆ<åãÃùèS>>¿ÿ>z‚÷«ŸF?ã}¹9z¢›Åâ +–Í � [›•œ6?.>-1*"2yÜð»)“_›òÊ”ÉSÞ·.2lܰ[ãV%Æí I77%92.1i’�ÏC>,Ÿ™96ÏÜ‚R,ŸÙÞ=Æh4Œw^ßž÷>õùúÌö.·Üç*k)«’õÃC¡=TÊžÆþŸ½œw9f÷)ï[þ‚‡g?œ4rüÈ®QªÑ�®$æ‘_Õc„cÞûDzG'û’¾oùöa>¶ì±KÂÇ…ÂÂÇ…�¿ýxéã·žxõ‰^¿µ~-c§�uá¯àb$ñá“O=ùT9‡üŠº>.z\‰¿¦ÇóM/KÓãy¦‡­áQÝYqWÅ=ÿ¯'…0 L0 ™8w¹ž¡÷ò~‚t0 üƹkà¡Í°Oˆf�‘7¸4MêT‹æ4¨Õº<"N’�»0W-×fhåü÷VÅjð¦K•+ƒø¨eÜŒÛ]K×ácƒAª¿ˆÃ4vÔa¶å›É¦æöòÂîÈN¶Q±6>G/{ P� +¹Fdð.RϸÝ�ÞE F�Caä¯5H¼‹¼ÀëSv%בåéѶH;½imö¢U” PÚ)«‚ï`km‰¹-W ¾«†«=BƒÞ¬ed|]R~¤ÏW£–�í,/m(:b25Er#™!·¬÷lä ÃsÿÀ:�FGìUY5ïàè1žL­–‘Êà’Ä’m)a!TPPª¹8óákàCbÕ-Mvw7e=#LUçeå�;Ãwf$þk?€GOº‹TgÝ��h¬ÌN¶S…:Y4.@ª2‘çÉÈq±¾ígÃ|Áqƒg~¢>¹0©£ÂY[œYH¦å[³DI…Ã^")S¥ º0â­IóÐd*d/M1\ Ç‘ƒ;-Cé¯.áÆíR4S/×_Â¥ ž1 ¬Ö+ »Ân…í‰Ç&|ܽËé"Û÷Ú?:‚ÿ¼A¯,ñ� +'#‚RW¿‡ÃF^Ù?=ƒ|—Fo~: +|Ï]u\ÿ’${³â)ö½Öú±vˆ‘ +[:½ÁLJb~ÔpRRÿ$)°ŽW«?­!u*�‚TЙtæÎ&jô3÷wÒ­*ÈY‚cíÈŸ7ì°ŒD"fcáu +–þ­i—²P²Gëx kG +2ê`?×ú!¼ûf@‹p³½ÿ³ÕŒ‹q»�^büOÌv'×ÞÇ즕ًVP4­¡iR¥TÈm8)ììØû꯰ww oZŽrõP"�^.nvÒÕõ¦Ïõ&2E‰ Ùåátèľ罕-¹‚õÃdÏ!]«Þí­è³YÑwgóþ„ñ»`üz‰þ>¼=mQ’ÒÊZy=q §¤¥•êì¨úðŽÝ¼=矷lˆÙBbýr¹RC[øØWeáÂúݵ5ÄÇ}ógzìD4"-ÒPœF‰K•ÆF–òz³­� «ÒÛ¬ƒ·ÙÛ„±I5555I±±II±¤ž—6zn4²š¾õ,ù–}g\BzhZ�8hZ�6ÂÓh Ìöµ®ÏûH÷ÁòS_àètÁïWôÚŠM�€¸H€xÀ‚uþÝåï(�?Êm‚ÕG¢E@ÕAüYÿ:�Ø·þxðŹûaÓùÒ>ìœÃ³Êó„°¬´ÔîH-ŽOL�J °ÓŽüœöUÄ”é+_õ¯ˆ®Ž§°Ö ¸¤Œ (<·;›ÄÎLöß·%ãbü9 àÙ£àSŸY[AÖ‡¾Ë„ØÉ ´Dµ*‰¢3¥´‚ˆ�,l³¶*«¢ZÖB\»Ð÷ÏάªØZÊb²&“*×Haçyú©•ÀÎLFG¬Åꂺj]!ѳ‡Î¨¡ZRlY øüña¯E¼UsÌ¥­¬i ±ÓX {„“6§†¿•{òã•�}¹¶L#è¤é6¬»Í:q›}âðÆzGügBQæ9O�ÓׯÀ˜�xÀÃn@zCX\]Pm«=þí?íƒö=…Å�ÆûÐÁ~ÓÉt\L43TŠØ�zU½<#ây”æ'ËÈUåÙ§@¨_ÚEÙý}³p:„ŽˆŠgăFnEAîîÀAÅ~fqÑi\ÎŽœ¸Ìh¾X’•›˜¥ÔIˆØÌ˜l‘=£ÊáÎÿ¸‘ ¥e"øöŸË?Ô‰}¿ÿlv?V à7¡ÚM”ƒùï¸i9Êå°g ãvw<Àžïrt—p xXånÛ.[)YlÝå´f³Z’Oa¥&[v Q±«²’ÂjÊÒj¶oÞšLbr‰"߀ Àß,òLr²L0é'˜Q0’ Û<„÷W�¡#鈰x&apë� +«ÔO Ïü²Œùr aÎ7›¨€þ 1œ¡¯ŠŒ<'Š[Kª{ucï/&¦S蘘íÃÁ?«”ÆfE¾…Bý¤‰JMžc*Äù¥vj-û#C‡Ð1‰;†-:•¶ØÒ­Æ ¿wÑ»Ù;ÔtvýØœÚÅwéÆ +Pc™È³Ä¤ãßkľ_~ÿz?VK¼Z û¨Gÿ±†Ô+tydœ$d8Ò} +‹|Í@¤%ªC­„s Ò¶šXÝŠêÁZ'{„  ÕUŽ +Qu<‰9“â’’(Á +©K%òP{©üó~ˆº‚Uà )”Ë•Z3ïñ°úè6é/é6“J§©²H¬:Ï`PÚ£ÑbÎ7[lF�5—Ÿº«VÞ@ü£nÀë xíìAaéqÑ”)Z¸kw­¹†8Ò3÷EÄÝ2õåhQy¥˜Ï¡·XI�qà¬/ƒÂåûM?Äöc<;¼ŠàaÝ-’k•$v!'&–Ž$ÐÆƒÜ›®KÇÚ\’à|r£Å‘YG”;ìŽßìš´e]Z`0µ}Sxæ¦?œúŸzO}ɧ¾‹idÚˆæ2½ÔKãXÄ«Ëo ÐF/Ò×=€ôF¦±¡…nnõ¢/øUÚê9ïd]½ ¿v³aŽÇ.¼Td8§#ï_µ™ÞD‡†3¡C~XU¢˜†£6 +¿Ða{7`°�„TÞùýaÓ aL'‹61[† ÏÊJToãˆæ¡™G3ƒKkbÈM�êÏŽâ§´N-‚t¸bߟ/Cô×X¬ö†r&ÌäBêW4�³¹¦mûa¢¨Dk°PzmVæó·&ºÚ(ä ᜶Â/÷ý‚÷¤·F¸ÈöÀåº÷6o—EXläf†ÙLÝwãÄ€ÿw'ò¦¥+Þ:Û™N¦¹¹“Þ;ŒÏ¶wué†Kø%�LxäT +‰]÷"iÜ[ÃIR� iñü"fݾ̆‡(nÕ×j eé±5î“$Ú5¾8|Õxâ=nhZY/å™Â»Tb81Ù­ôf:,bóúsϘ–ƒŒ‹ –;+Ä,˜ÜÂá�ÿgŲLí„q×€rú–€/ò…éèMx¡ñä.x½o ŪæÀRøM˜ì21í†ûÎÅÓÛ蘘˜a¢r©ªÓ«ƒ¯"ÌÏ Ó¨” +>V3ç-ä²!E©{ßU;SÎÔÖVÓ»‡ƒø“$BŸ§/¯ÿè+¿|›ž6æšáט¡Þ©ÒN¦±¹Š®´ÙªËÔ…| 0?¥‘ÖŒÞúâצΠ+Cãõaµ>Þ£'&&nØC>v}N“ÒªJŠZ:ÙO&U2yV¾`»Ú +ašÂïQÈ•~˜ +“°¯¯ haåÚú/ãnpÒ»†|(�«¼2º�¶¨¬yæ\[ÆéüjBm©L_Ũu¤wÃöº:Ú>h¥OÔÇ»�¼í§4¨ô\¯Ñêõ䵯jëòÝúAÿ“é8:",œItþ€2)27'96:*!5%#>'UŇyØ·PÛÏEm‚=Ò¾„ÉñŒå‚Ë÷Û~Xß�eÃ|.„õ\¬½Ïûéç�¿]�@ÓjZM�U¨•*®MÑäÎSjTJ­?È-Ñ”áôºÞX¯È//,"ª ÓcmTºÉ&±e…EŽâÜqU$Ž1‡±[2v&Q1!yë_ÇÿDÖ`ÙBqm´{(‹îʸƒ‹YEPdžŽ;¸0˜‹¤ÿòç´rèq�+Cô;‹‘øüîó´ÄÇ·ÉÃÆšNz– ÕJ¥š¢·*"s7™•6µMg?]WRËÀc:¿Eˆûzfæ~nŽF¥ÀeùŠ"‹‡£*›«`Ÿ©g¬^ž£Í!°¦¬ØÄõ¢”z,Ë=óÍÏðÚ‡?ò‹*uùz\¯ÐÉHEœ:–@˸;s †LJ’A)þM?¬õ>{ë†Yð›·goTXø«Á³ÃÄ]Ë43nwÝ4ø€™ÆÃ.ÜÓ3-î&{Ñ\�´˜BóxÓóþÊA!S9Ðï;éÊ!!³QŸk¸ˆÃë¼BM!m#÷wµ´Íå)‹)´€7]ªø7Û¯"¹o»îžíÞõ̯oXžº.€T©ä +µ™ßšZ@¬ˆÚ¼�º +¹Œ¶ñk›¡W! +fÃçž Â÷•Æц·Ñ¿ŒP…&cÏ|ð÷KëRÚö›îooIïØ3ܤ엛2ìà1tÜ/Óh”“±ÄDÁXø¤l¯µò€a¸!J¢vD1‰C” €ñj'„ïñŒ³tð^íöÁDN�Á¨¯ ‚{Í´E…)UƒÖÄô1-­ÍÃa¨>J—Þ…‚=Çýr3ã%Ùßu&,�‘o²ÙÍ8™ÚÖžá³5L·Y_ÜʦÈt=õ#Ø8Fî7¨’#@kw{¬óƆØ) + xG'µäYéþ+=]ºù6ÞÚî�]ï\‘ÐÒ<•tß;M�ÍA|2£ ßžfí½ÄÞ áV=Ê€P´˜´hóMº|þŽfô0�PŒC1Œ²¾‘TYd& ÃG£&NB3Ð +\€Ìw‰Y0ûL`¶+!…ÂbRªÎ“©òøÎ0x‘¨GÅh$"wF�:©If¥ù0êÇ0Và‚…ÒÆlxÕ³ÙåÛ{r¿ÀÚ=Ô�QÂüÕÚ²ˆg§,?ájàµ(êpò™¸ð··nŸ1ieÛw)$–š­—ª¥ +ý,}‚mkÿ¨:ù:ÑÞf-o 56ù¿=£sz¹²ü¹æ/ð½>¸U·|‰�´ª ³IÙ¥¬–îç P4$f¹Áʆ +HVÛ,J‹”BqÜœìä4©1×L ¾–¶z®6±š¾béðÖõŽëÇ(³Bf”3,ŠžD b¼ Ï^Ùuª±�:Òs¨zdßô©»)›Ò¢³ûd]Ò>¾aÃV7C¼¹ ÚµdEÈ OãhÞ/èYØéUWÐwÛ÷Äí„ÌcþÏ£Clÿz(øì9}Âö@˜ï¿©1Ã�[…Wn]8Ð]ÂßÅÃ&#Ÿ½Ècð.¶ªå­Ö-Îxþ¿~ ¸ó3ìŒÞä3Ÿ/€'¤��×gdôøËlÏ#wž¢h.zÅ£Åðô¬…‘7*£$fE¾>¯¡ÄR3ЋTÈ�ü$:‘Ù±™Ù6P9IF9¿OY¥ ÁÑ+¼�Q‹åþšòÌ?˜\ |˜Ø:mênÊJ[µVƒz�Â�qŠoYހ؄ MíôœjÉûBéeì8ü¡Ç—÷±¥¹‘,çžíL˜UBY ½™ÂšdŠ^º�Ϩµ4‰WE!¶âb*kš…Fta”Z­¦)åVi€$�¯´Øh�?oïØý ÑÍm²„­ î +½½ÒŒ¡^©›éeÜͽtÏYÎèáSÔNÏ1 "α¡ÕÛT~Ï;ÌÑ�µFI®‹ZŸøz°V¢—šåü²ŽrcQ¢KŠ¢P?oZü­X7ÓȼßUñÀò÷ZDÁÍQ�©Áwߥ¹gç\…y×°£G<‘BQY𣤶´<_mT›Hì´Ú$7çã•»O7ö&¾´,9`ÕJrî<vý…ç2Wáš^m= ó¹õj U°ßr–©•²µR5Azzb�r»Ž3Ènqöµíý Ÿ×÷¾MbG{áô•”`ФNôÀ„OMb_8u»§`µðå�ï® Ë®´g’%ÙéE""55]|9ê üãÚ×à{kñU4"(&Ós°ò5þŠõDx„VIE¡VŽ}³¾‘8Ú„X”7²0¾ÓCˆYPñÛ3â„Ó �Û£iÑæ“j-g'W¦�+”Ô{³M=ÍÏÔãk z•»%L4ÜzÆÍt´4ÓõCÁݤ©;ñ¯�ó +‹Êl¥QB¡×¡UˆZÑZ^ïÅ“0âø7|Áiƒ§³�Õr®²!U*<9ß%]ÞvˆjHØ^ëO<ÿ +‰6�s>×·ŽŠ«veµzÏEaI±\b£êªf#Uõ^ÖrzʦÜ4b’f_úHG;uußÎÓ°ðó ×°`§ç”°Í�°lãêYÏgQ†�mI©¦€Àn<“�8hì”øÈ ¹»Js¨Bi¶MLˆD©!_ĆQ·Ï�°¦·¬²P´–ƒýp±eWë~¼VV‘TI–§D–è¹í/íȲˆ+ôβ��ÛvSXP&‚Ïö@“WfÀÍËlÏÿxËiâ•D0½� ¼_½ÃJ½�n¼Ö+Ë6l fÂþ‹êØËt1Í�Ýè¡{P‡@¸‰ÿ];u1MM]ÿq­š­¢‘gŒAàhľÅ0’iòäÀkØò;/_hx[I/TMŒ›©­íµ‹t*½üRŒgºŸò}Cá±ûS ô„ÚEÞÕs¤J•RM¨U†|…-CÛ=4Q{o­±Ç•Fµl[rw²|eNâÅàaí½QQáî§–u†|¬¢Ù3‘£åBÈÝbŽLgÌ3F½)_Oaþ�âÙÍÑr¨%íõü64ùîû©Þ�N‘œ‡ü”hÌFI¶Þ$#-ÒœâB"§Å6f•9öéêš¨ÎæêS°÷Nþjt‚Õ½¯°Ê×àXk4üùHYÊDwžº§:×þ ¶Ñ›éЛ˜Íÿ%¿íL7ÓØØE·ÿ{Îtšhj>&®Ã:·^ìûËe¬\ð/ádXÌÝk³¿Ožåž-YXNÙÔV­ÅÀÇÎ*Z3¿Uçóµ4£"±›ªô<:‰@ùܘU ò÷ª›i:Ì8 ØÉí:¯ÖP…=EŸä÷J�9Úl¾8rÕlñ¹Û³Š;)HøŠwY—¼UGå�ÑȧwÓÕ.Ü;§¯ðN¥�"�\Î_§Re¿I6 LÌ÷¦•zx.�Ø·á +¤ôcgá;ÄöJ¾ÿrûÓ;‘úÔSÉ+TZ%2yž$�ÄÎf§)U9ù|ûÎPóv ^{ùMúýž©r-%Ö¶«@¯áIžB{Š>3 Ç΢t^­È–‘9Éñt±ú�=ðÒÏ{Μ§°¶ÚªœÄrJP}ï6QbmZƒï—ýèy3 +ޝÿ¨Ç|ösíL»ÑEž.Üm.'*Yb3%²XR«{Q‘½u‹snøš”õQv«"{«kŸ ËQ Cv,@|÷o'INï\¨ÞõënÑgß›$"ošD¹mèÚ¦žqÕ·ÑmÃòþÂ=Q¶Ð³B˜A‡Šñhæa·Žå7ËÈóŽvkÑPš”h¥Äf³x7�]ÐꆡÙj'è]ÐwÚ“r»õ³Ç.üS˜6|ðÀ‰;SŸäuoOV^¡j `iŒºüAè¯h9¶JB`ÂÀvëò.× kŠN?žŒ0ä°íÅÄ­NB +”'á ÖeÏKlÏd�Ñ ÄË΢c +åc=8Œ7—hŠs‹ÆÞÅaB–œ‰)È+ø_‘7�\ endstream endobj -397 0 obj +413 0 obj <> stream -xœûÿAª -× +xœûÿþAÆ +ó endstream endobj -398 0 obj -<> +414 0 obj +<> stream -xœm•Koâ0…÷ùžE¤vÑ!±�¤E©…FbчJ5³¦ñ…‰Tœ(�ÿ~Ÿ­F³trŸŸ¯s‰¼noî]ó!7æg¢Þ¤oÆ®’›ÕÓ®�âxÝTãQüð,âÄ�­ý\µ]Sõ2¨Õf½ñõÅñÆWŸ£“³Ïÿ\äPû/‡©†Z�ýУ8~¯‡O™«+ > ö”| MÉGùR(ðåè3_Æœäà ¦à+hŸ¥"ß -|«ƒ/Gך|8A ¾´|sÐàÓ`×àË�Sƒ¯`NðiLLƒÏ¢ ¾Œ6ð°kðö¾ŒqàË0#M>ÌHƒ/ùhðeÈbÀgàiÀgàiÀg�Ó€Ïà ø -ÐÎ�žà3`7àÓTà383>ÍœàÓ¸u†|¬0ñéKŸàÓì|gfx?1# >‹´|ÿPÝòýC=K>Æq~¸g–ócÎ÷Ó’�q|ÿЋ%fd9?*ÞOYÎ��‘3²|ÿX|ç’�O£ÏŒóQÆû™‡åÄ-4­©i_öb5v�ø!,ã°§�W{¹lõ¶i§¨ð ç–I½”*�§ +xœm•Koâ0…÷ùžE¤vÑ!~%mU!µP$}¨T3k&Rq¢<üû‘}´ÍÐÉ}~÷:&ÿñº¹ºw퇿Ò? ñæ‡vêkµxÚvYž/Ûz:ø0>{ï¼;Y‡[Ñõm=øQ,ÖËuhÆ,Ïסþœœ?ùüÏåÁï›ðåkˆÅ4Œí!Ëó÷füô·âDêI¬�c3Eq™åù/ßMn…Ìòü1¸E{ˆÍ ÙŒ5Äìµoë�Å® ®g%ñëfR ×Ô#Uú®Û.oŽÃèë°k…†—›:z +!ÄìÍï›aì�â"5v)œßÁòÒ;ß7a/.NÍ~3n¦®ûô±IQ¤§>¸ô;‹ðÏÛƒ3ŸŸ’RȯGïÇÎ3Áì÷SëNB¢Åºu~è¶µï·aï³»¢(й¸[­V«y¬ø�ýÚ"ìcWÿÙöÉ]ÎÅ]Q;OJ%U]Cé¤JÚ ”†²ˆ[@•°­ *¨¨kxVP7¨  î¡ +¨x>B-`cÜ9Yï1)Ÿâî“’qEQÞ@�¯DN >SB‘Ï@�Ï€]’´’|´‘OB�¯DŸ|–9ɇ JðU´�ÏP‘o ¾ŠÕÁW¢kE>LP�¯­ŸÂøØø,r*ðUÌ >…�)ðô¢ÀgiŸ»Ÿf/ೌŸÅŽù°#>‹¹(ðYdÑàÓðÔàÓðÔàÓÈ©Á§1A ¾ +´šû£'ø4Ø5øø4f¦Á§˜| +§N“�"Ÿ:÷ >Å>Á§13Íó‰ðLÐðýCuÃ÷õ ùÇýáœî�Y¸?œOC>ÆñýC/†|Ø‘áþ¨x>Ad¸?vF>ìÈðýcõȧ¬D×6ò)[`ò6ò)+1OËýa‚–çD|šYÀ§Êt�ñ¾ŠZ¼·Ï7h=õ½cº¶ÓuïÆ&øóýßµ]ŒJŸôÇqúŠêeõ ©¯: endstream endobj -399 0 obj -<> +415 0 obj +<> stream -xœÝ¼ xTÕÝ0þ;Û½³eæÎd&“u’É0Y Ù !!˜! ,! K€°„ S -”�5ÁhÑÄ-‘RÔÔ -E‹ai@*¢"’h«Vë µE#åµ-Lßsî�„€Kûüßÿ÷|Ïó%ÌÌ™{Ïý�ß¾�€Ö�´9¯ˆ¹\/›àN›·t~ùxѧ¸^˜¿xÕ¼›[Ö¸ÈÓÉ5esg•Ê·àS€ô>п¬lî,]3¦éÓ OYùŠG¢ÅÔ¤¯€çWÌ™õ)ùb@F‚ø^>ë‘¥ì_4 ã]ˆY2«|î§ $ ã*€ã±¥ËWÈ_êöŒÏ¿±tÙÜ¥¹¯Ÿ�ŠFÈÐ gÕWzša4Ã&¼pÏo3œ‚³€ÕyÍè,Ú‚ŽÀYØ~8 ëákd ¯£lX-PBÝpja—úd-ùT’cpÎÀGPIþ†rÈ8‹.€} -Ͱåö*¤¶À)ÒU¤…” hT{Ñ‹PͨÖà*hÆã¡Þ¦çàmØ›`;ì… -x[Ål=zþ /C5tÂÓø2L…—ᜦnà`ÖÖ@ípÖà&<σj8 µ°v õÐË) pøŒµã$Ø /Ã.˜ »X;{Zðƒµ³vvö@”Ô,Ùeº òm:†Òq1\@¨‚‰dyˆ|„6P]I.C-2Â9Ö.Ù¡Vö@­4­¢3Õß*A^Ig¢&¸,ÙåÙä[¨Ân8 »TŠ^ÆãY1+¦çaì‚]ê{­ö.)ð6¹ëá ÌÑ:ŒäC-TÑÑð4ì€x¨€ -’ ¡ªØ6íš  ’Ù6R‡«4n L<váy¨jñux*ÈPȆyÅ®Àô²d�WÃrÖ`‡Wd‰Q‚ô�Q`oQéß}%1oLq'÷½ëkŒ"Ç€q‚VÅ4ߺ5®„F°)XäâÕ ^Ïg?tó³ä¾£Æ•Ä4#gáÐØÂ™C“ûŽšPr{Å·¡SÜîä¾…CÕ{bÕÌ{€y‹fˆ™S³UÙêÉݪÌÍM e¼Ž–±½@@†èc@‘$d?„tl=¦�ÚÚÖ‘J[G[GZ°Õmõº­î2 -þå$ÂÿW^'›¿ýz™”€à4-fí`„D_ˆTOq=lÖÕÓßÓ§ËÄ™&Åß‘áomM‡ÔŽŽÎåJZ°Ûá¶^§ÉÃ]ñc]ËðqÿJÖÞć5u]lÒ`� èL0Âó¾Ì)Éu*‹FFĉ12:�Á©7 ña4È:YïÔéäƒLÕÁI†#\¤“ -MJg«¿ÕêÌI‡Ô¼KΜ´QJd…}%+ºÀKŒïü>%ö l@0ÝçÒ#Iž‡È£U²$#Y– C.íg˜J'tÓÑt=öè‘G�2õˆÎਹ�7óÃí¨™W¼…Q<�Ùõ÷®fô*ÏÇ#p(_„ž´b¨ºu‘–Ð*p@$úâ „ Cµ~›rI5AèÕ°šà– †(‚#}ˆE‘6eD”ÒÙáïhµÚrrÒA¹ÔÙqI¹¢\Q:¯Ør¬9iÈávØC23úg;ÌÈV23lr -òÄJ2-ñ_<þbɉò§à7ù‡(æêûß4Ó'6oxAÁ3¦J¯¼1 畤$”ƒ‚‘ ùø'§÷<` 8uë"õÒ*ƒT_¸©:è„Õa'BjˆR£o! áÁ6HÕÎÖ ¡C—:;ÞyE¹v%ÍÛ�…;#ÄéPÑàG½#1žûùGÈ‹è};Š‹¶Oÿí‘£/Ì|zpNR€ìÈŽÜÓ÷ÕÁ¹y÷ÜgïºñÖÇ ÔgJG‘‹¤C?Iñwt¤Cꥎ´àL¡`œÅçý¥¬ýF{“àó–[éZFp‚Ç,ÕØ ÆÔbkÕÛ,C‰Íqo¨ÊÔêWÒP7–Yýââ3lV{b±U±á²šÇ¯ÙöøãÛ.sý‹Ëׯ“O?|¿ý£�Úßÿp�ÿÿŒ_@É(¹PŠÀ·€”ì`„Ó¾\�S¯c“�’ÄôN‚uNYG0sJ L�„àÄœ„�IÇ(‘ôH’†‚ÐÞŽŽŒ€öv\ºK{u_É´Gw§ÄÔÉM÷�—°N‚CY¨. ÷cýuÃð<\‰f&=Ñ鈓†²0)\Õ%�x– $i6Ë‘³u#I‘þÚ�¹‰B;ªF�Aõ¨-A YýÏ�)âçø;ü o�v£'ö _ƒÐõ´ -¬0Ö,ÉFVRonÑŸ” ’:›ÒÖÚ‘!ôª³£í-«@ÇçU@AŠ5bPŒ5 ÒP¦’fõ� Q|Öq0�SÆYmÓ‘¦êV�5Óq/ÊÌqÒõ-záÐáÃ)Ç×}¸?Y•rÏßêº@g~´rM¬HxC ŸD'Ò*P 2}‘ ìá5f{�®ÅÜ€N‘“QV›q¸“‚„‡ /�‘¡©ì%Ui­99iÞžõ4��Cýâz,­<|8¥¡ôìßþþæ¼tuÓ†�[·nܰi[×ÉP;a2�ÁÿÁÏLF×Þÿð£ö¶�?Ôüq5ÆÚAå¾Ha„%Y*�1�—uLB2¶ÒtÙ -i!«ðJ©y9-¥gÄkJìA'zçÄ¡r"Ž“È“q)^(WâGeC¨‡¥a¨HšŒæ£2I'tÍ�¬™V7²zª oOÝ®;ÅÚofÒ·o$Ñ·of‚È5�ž§3Á„¬¾B#&Ø 7‚ FeTÏ•œ²NfNÊt:; 6� 9ÁT``˜èˆ'�:“Ñ ×i‘Ü(Cê[š™uæ‰p¡’ð�(qFVt�”YÔ(QcÔSc4D£(N"i‹ÔGÂ�Ѧ8ˆC‰8Ž%J‰²G××”ƒû³)GÎÔå™ -uEúaÆ‘¦IºýdãÓ<¼€Ì£ ØBý\ãÃøQöˆî'úeÆd‹! G“hÆ¢ ц$œÄîÅ÷²<ÃÃÃB¼€•ªð²Š®¡�²ŸÖB§£éÖÌ$þ!�y�jüÅžS‡ø�/<@gúWâ‚®²åf#ž×µC“s#5HÑq¾`=Ã!Óirˆ‰‚d­7+mþ·TéjbNCö��Èá‰�˲º³ÜxÍS>¸üëßó?¡OQÝO~º«í$ù×〠üÖErŒµƒúúœ&Y‡à ­·èê ›- 6½ì2B–Mñ·uÛ¾råú;zv– ,`[ÉWþÀɲڇøz<üÂ73[uÜwßSgÉÐ&¿�þE_Í~С’ô)¾0Ý!0µvÂI ¢d´Il4Œ2Èf¥-ïR‡?O„ŒŽŒK~Õ嫉I–ÛêF™ô*÷/Aåü3ÝÜLgúSkkIrYðê� U }}¡z3‚¤k‹é¤a Fé%ã0»°Pa ©y—:;¬NÁ1«Çªäm¿@#/|h]ussúsËó<>Ô5ªì•ßtm¢3Ÿ›9ç3U6—h‰jƒ}|Á�|‹þNÇ�šlõ¦—!˜zWªå¹L*º¦á¹];ÏŠ,kDSWvOÞa“쪟Ió…÷ø™s ÚIT3Üj3r� á;zœŒ0KO–¹Ç‡ îP鉕ÈÔæfád.ñæÜܲyÆêê 6“óxÈ¿:¶M˜Œ"²¢ìÉÜøþ‡·µô¡ o ¡æ“q>»®ÿŽÂfƒ$K×#¤iÙ¤êŠó.eøµ(/аº­ž-gqâÙ³]œeí]»pé�$üzWNÀwݺHÓÙUƒ_xØKpðŽøœa‚t)-\@U¯üHÔ¡écö<À?ã§P>Šz`Ϙ‘M“N·¶ž.y¾(+1Õ¡¥"Ü$&žäãïò·ù;ü]ß èÑÉþ�Ùùý:Óñ½:cý7:#Ù»öªJƒaí‹Ô£æ<‰°Äw�A†ðS¨E†C¡r�Í]s<ª¦�È�‚P( 3$ÓÐ*9î½GéìhB×\yë¥N¿`Š�½5Ç–cµå¤ù¢Ò¢ÓbÒÜi±�Јq£¡Ñ¸'¤ÑÙÚÖnžÞ+ËËÊèJ\V¿þQ––ˆfi!Ñ…pË g~õèâ§_D‡|iíoÞºùÏoÐÆí3N<0ïhIõéAq18ó¡¥s—^8’8ºkݾÒ_ÝsôdÔÆUýû5ÇÇ�Ÿ±=�GóÔ u„/>Ì䊈×[upˆ¾ÆRc!5}Z\–S 'ï‰É4\²ÙÜ#îQ:[Ú­\ºÔª©´‹¼#GÕó^±3Ø.¢i¼æ“á^ÊïÌÊ$S7­ÛôXíæ5›š¯ümô¾ ³‡<µ¹ïÓå­_|Ѻ¸.µçœûàƒsçþô!ÿ³Ÿû##¥ôÝs@·zÆ4”‹d¤C¹“¦>¡ék*ÝÃÚA†HŸYÒÜ\â‚\¦îW(FgG†fß«;•.çÉgykoºÑÎ’4"W� 3îÒ³:i:6K ê™fN—2zlÍ´jvÜcÞq§š-ýÙÖÇӟè…çÐsBÑ„šáU7÷<7«T¸&@°€êØ/!Ò}¡f¦³�C`E'u‡ :£S�›Ù®´åµúóZ3´øÑ™×Ú!Ô+ ©^êŽ8bÅóÐ>cFå¹ÏÎ5ñv”Ä~ÉOÖv5þdöö}gñÌZt¯ÈçèxÖ:°B‚Ï!Õë7C½E‹^&¦tÙ¥¤ÙºÓ‘À’iÞ˜þV%Îí±«–�ˆ¬èe¸õæ™[0³MBCù1ÞÄÏﻉF Q7o®d©üI¾–ÿŒ?%Ê}å´‚VA,üÊj³è© Q’ì0ÕÄ�–ˆ“aŠ V‹nŒTlc)Ž ^èQ:G0MuÀ:ñ�’Ã~ëÄ€)þ</›šeä]êÌœ°æäˆlÃ7<�¦±4)MNÓ¥éÓ iÆü�|g~h~X~x~D~d~T¾k-YKײµÒZy­n­~­a­±6¤ÖYZV^QYUëò éHµ°0ÔËyÜyðÞØ#7U<—5lÜÀçrFå<û¬{Nþè¹äʈÂóüÓ®•xÝWË«þÚµ¯»ºT|Ò™3óò‡ ^´ßºH%ZñPéó™°ÙèŒvéôX68]Ñ®‚(W¨Á芦¨F'¨½Úq"´ÆJk¼-Ö†„(ƒ1:B†±’¹H–ì±… š^f×]Ò*üš¨mNÕݨy¤ù+«3GVß§Ä¢žJR”Z»tÛ8³ú¥â”Õ¯fFy{lã„ÕUÓ^¹e[Ç{-œl⣯é -wÿüÃ7§î£9/§¤Ü7aÔH�9|×ê}G=ž–¬¬9SÖ¦csôö5Ïìw÷øíxÕo÷ó…3™t‡$T;ÍÒI–AϤ ‹ñN 1J¹’a*îðÄJQ(`±Yn��??g ZÇ×4 þ%ÉÞpßü9µþTr¾¶¸Y´úë¢7 ÖŽjŒ5éI�E_ãh°´Dì ›mx¨I’Â{U½ct_W=ïðX3IÝf-÷ßÜu±ïÎyoþýòÙÒ†”æfœHüñ#ãKøþþ%?=yÂ6ÑöBPÆ'Ñut&Ø ÑWä4‰tÛˆõ&Q¹Z�6°)N‹âꙃ,N³9¨@ ³¾F>e5Ÿ ¶*– ƒ ²Mg+2‹@£VµŠê…rrl?Ø—²×ÊÛ6QF„Såaë¬:[˜),(Îg`-²Ù¦¦Ãt$ÉX6£$”%B�¨X3ÉÔ”ásbS¶N{²ü¾iÃùØSh4~ -•Uçßæï˜ÑJ‹ýO’ÅšO›w«€f³v ê3bµÍØE¨ÚK¥³5M$ÖdU‹ÿÊqÖþ¯r@è2þ+JÊ!؃QˆéB*i(ÓêA—ý~”ÎÏõä%#ÙUˆ‡ÿå¤Ú�×0 ot´«@µäxÉþlh½½ÏÒzo�µ!Á¥O\DŽ9Ý.çĦ%(~¬ï0-…é®^†£}ˆöüR@2&2F‚_w™ímNq©HØSaO�ÓϨÝWþÔÂ÷Nðoý Ú-»¬¡©ò‰ÅïCAŸNja{Þ˜·á¡9ežÐô÷~ßþ—ääІn©ZúpLXjKãÿJh9� Ìõ%'e;fâƒ` $ä� -0�“Lb#F‹ PV:;ÔÂìRÆ÷êȔ؃ñXTafA˜Žè(eØ‹ñt4=XˆyJ�£B4ì8_ö�éŸH^¸ÙJà!ºŠn#ÄûìðŒ5²gdbÂá"uáɤ´åiuB`ˆXª%[ñ1ô>ä9>£ÛùÐ&1hBÇÁ$ºŠµƒ 6øúê0Á²¨JFzŒQ�AÏ:/™^'(4HM5H�¤­@§'£§UkN­’¾£æìÃt½…§.T‡Iœ.Qßå�þºz³E¶È =$½‚Áïu ‘A SÚü­"eò‹˜ŠÜ¡8ÜèzîêU^"Ùkÿå¯Uuüz o`9=5 Û,C½^ç‘\<Ȩ´ ÕUK°NÑtöº­,Ë«¶ï�åòѸ7QÿM´rtóHµ“'à> @=ì*DÂ}¾Dˆô2‰…†…g„W’X�b}6¨Þ^G¡ƒbÀÈàrÆ*¤O”âoõwœ8¡Å]±`ç[Ýz¤šûÊ™1%Ö+JÀþ�}/Òª-Q¥»$›ªÄ/ú+�¢Ð¬ÒaÛ×>ðÆÒù¯Ïú§”hojj:�Rî}´~ìêÇ -†¼•žqù3O¬ü¹è1Må_ÜÍKr½Â/a�„©NiÓ¦/­î,‘zÌK®^•ìß~R+QÁK¬öÛ+Õ|'’|¡¨^�zýf›bÐa -,#h€\úL»V%iꣲY…™×-¨ IÈêAµ_Ôüb×6>½|a~ëæo²Ô®sOnذ}ßÅ�þü_]ÏiñçŸDÉA`…¾(ÈP£C‡ˆÒjÞINêNÙŒ:¬Ç*™Á&¬#£µ5Ð’V j-1ÕPì’æŠ­™.á§Ðµ—~Í¿˜:µ¹ÙNþZ{³æÔ…]«¥__Öä»ýÖE:ˆµC$úœbŠôõ¡ -Ú첸¬éØij·P-Ø´ì5�¼:U�%„'¾ -‘ ?–‚¶Ÿ5YbVMšüˆÛbz3gXAÓÂMC -sñ ò´ßT>=l`^ÞÀ°i‹ÉuÙ__͘›;ðÞÓjE‰µC0DÂBß½N&ÉK(a^JI�DÁA¨£^o¯Úl¤Ì¢—ˆ�X!ÒL aÔšn7¸LiQZy.0µŠ<Ϫu˜:Ú:l9â÷¶CëNo\Èì!)HÈ˪ŠNê%þ¶xÉø³:8¦jΫgQãu$=Óõx¬þqüª½b/C«ž™Þµ…µòÞ“Gñ”®+?Û¸n `->Ñxuÿ'„÷À t�ÄP6�§Vªв:°ü~ÏÏó5l‚Ú[i²*›A¾X*G…×ËÖjå1{}�¨U‚ä&q�Ó… ± D»„ѵv(WT¥ÐÂ’Â[m9Z#L v¸#Ø£;‡;»Z“&÷ý;RøÅoVž.žvdÖ³¿?úì};†‰.ÆŠ…_ù¢ƒ_�‰y;#ýÀžÆƒ^/µÞÍ®j=~dð…“_ëmõ.S}h�«¡�Ã!¹!"ÖârG÷»m¼ZmWÒ|ï§B*JÅ©$•¦²T)UNÕ¥êS ©Æ|ÈGù8ŸäÓ|–/åËùº|}¾!ß8Æ¢±x¬a¬ñAx=ˆ4È””Ô=¨ ÿ >ÓÑt¤æÂZ’([E:Ø{c]ÓÀ¸±9FmØV]½í±êêÇþqíÚ?þÑÙ‰¯d�—= x4ÞÅßågø›ü]”†ú£l”ÖÈáëøÏø#h3ú)Zƒ6«63OÔI¬0A�/‘ $¨ˆQ®gˆlÖ#“\:*YL}ÌŠß/tO5‰KbÔmÝ‘N�Ü$S85èâOy"úÀýÅ믟éÚÄ¢ü_’·ý™{ù.Tz\èg ê «ˆ " ÎgCFj3m ³A£1Ìñ‘ŠÚdló絉uDi�Ä.Yl¼ð½ú!N‘7ÓU£jÇN}(Ä8f~æØmEÅ?Ÿ�U:ÒäX1}Øbzq`v¦�ºC濘×?$š²†þ*ÝÁ–ƒúÁR_zBRŸp'1›ôýÈ~§~¿Éßg’Óµ?=)+>HJ0�”d‡ð “Ý�dJNÉR>îð·*<¯UQw?D°RZÛÄ¥ÖöÖ+Ê•qMû—æ -”�Ákík’�s¯~Åí¦‹Ú£·´vVÿlçíÞ–ÍAÍk-Z·nÑ¢µ5�{×�æÂ…gÆmìsà‰ëüÏh$²õ_œ“–_•Ëwòéè”wþv¯Û¹sÝÏvîä¯Èúõ±c_”¿«…¯ã‡ù+üQ»cSX(zÕ �è~ý/¢·wë"ÍfW!†û!¸Þa¨Öï ª—¢«cöEÖ{ê¤Çó‰!Á@ìa®8ÅEb£íúèDÅßÚêïhÓ‚™" -›€ÿ¸’“ö=9ª_îÚD·}ÿòÚü÷çÏ{mö¾ƒŸÞ±£z×§´”­úCчˆm!Ññ¯?õΗq}Îdõ«Ûö³†}�–/¯JH8óÑï«Äõ´зY D@4Œô¥E:åa ¹úš`‹Ñ튊Œu†Û¬ŠÅd2èÅîF.Ùc”¶ÀŽB[^ž?O¼·ftdd¤!’œI2nõå öO°;Ë­¾�‡dâÊ®-h\ÐÉÿ6ñÿ´¬qÁõ»Ë8G‰ùu”Z†t×&^g-|ÚÍgíàølôKñj@Å;Ðî®×ùAÀÐ @v\ U¾±Ó!3“ä #cæ +ˆ -g˜JaˆVª-ÛLõÁuÑÝRLXˆž!�ÑAúÄ Š!Ñ‘³µ ×Ù£‡jBuåºØî}Ûš“Ó�°R-­R?¦Ä"OV¿þùèδJ¸$ 2£(DD^ðBË ‰SïM]_^|pöŒãeGþº¾ ŒRD0Kˆ1�]N ‘Ó”6g^‡3ßסø/]I‡Ô×2ZUµ{íº¶!i 4%�U¥&ÞjF{ˆ­…::­jó!;+ÓéB¢soU2~yÉO–~RVYÞVŠæ�™]zvÎo^8^ŠÆî™xÿ3ãÞùãåcx(/&+J§Ï?�~A—ΘTzóJf)‰/ß[€Ñ›Ñ‡ê~qÔüå—ÌþÛ¤TÊï‹>¹cÇ;z5.£íü3ü5JU÷Å�äW°G"E�$êÕ·Ôü2 e:ˆ']÷ŸÞ1¥žãëÐ-¦� ÏÑ-¬$õE°Y&ˆÉJÛ[Âò:ßÊÈISÏ6x~½q�?Á~½ÁÚ». j^‰“Åú{aYE= A¸ÏĈ^�z˜€, L‡€â@Yz„ö¢vž„’ùêá3ÆóÇ‘ ‰CbÀÀ @°§Ááà‚{ &ùR]ÙQ ±‘–¢ÿ¹%öçÙÛ~žò„e;ùyhdDR´+J28Œ`0y ýŒÑ†$S®Ò*:¥Ê®yKU=¯\¿ÂlUeÅÞÕm¡ùÈî>ŠGNïßÆÍ ŠÇ,Z<ºxÁ¦æ�¾å))G6m>ÄGx¨-Ñï\0vÌâÅcÆ,ÚÔ¼ÉW™œœ~dã¦f”_¼pј1‹ŽÝt8-%uEþ†#¯ ð™hÏÌ¿Ž]°h̘E ‹7NKN®¼ñp³ês4yÒx` ¯/X·GR…ú‚�PˆBr”dPÚüm~U¶�í+U¼Dämªˆƒüþ€”Éëü¼�ó*©{,^_°A=±Cë%†²‰K†l½IiëÞbåQ ÉØ;Cñ×QŽÿÊ᯳ö¦›kššè:Í?zè j¼7ÀÓ¾ÁàE jz/£²—QÉËÕ{‰Aç%ä5x1b("×£d³žéu²¤úK=K5•�µJ?ï’¿£;4‚´½FjGH&jGȨ…Z 1%&ª—%ÝF´‹ÍdDÜjÃÆM<¸¬5ñß]CgÎ/麶ø<ótQòâ�$´�W z*o]¤ÓºóH_°¾ÞBêu–†PÈ0õ—2lY¡=Õ‡vV¤;‡Ḛ̂÷“-›v4lÚÔ°cÓ…oºº®ãïú_FE(œÎ_áÍüs†Šø£|-ú)ÚŒ6¡µ\œJDØÆ£p‹l¯ ø=еF’âKÝ Â-/HQß‚N°0¬¹u‘Sñí}±ÁÔ‡üF ª6=¦ÔÇJõ‘u± Þ`‰ èX½ËíUü—:Ôã2�íVÑi'‡ºÞa!j`µYÕ}ެ~¶Ì›ÈbãðÄuÛ·¯Û¸yÓgù��9q:µiÉ¿úç'ˆ~ÍÿÌ¿,z×Ù»÷Èï~ûâ�®-G¼ñÈ�ÂJ!Cç#=ßÊ+ø&¾<º÷íÕþÈg¾¡LbzƒžôÄ`4`„�FƒäÛö^mÛÞ«mÛ{{mÛ¿üCÛöþÞ¶×¶ëem÷~JìÁP½P›b[=Ú 2í$ƒHò¦â©Ìè4Æá{ˆ—ÞÃtIz¯1Δ…sIÍeu¹ú~Æþ¦‰0MÅ%d2�Ä��Çë&ëKŒÓMóue¦UäaºJÿ°Ñ3zöá‰Ø‡?]Ûtá…ÚÓŸ?ûæqÖ~s(‰õL[n$‘•~qt O£éJµç›é‹ìéù¶X"N…�ŒR;¾ÃÁf»÷öÎlïó½Ýºs“ÊêA£7mذeˆ ›pxrÃÜ3—ÿþfiCÊáÃ8I´}Û?ú°kë„)(YQÊ�<¡ö_×ÕØÒÄ¿&•’ ‚ Úg‘vÁNs� Ä&A¨Aœ ÈÐŽ|¨!F»Íé‰*“M*7¬_¿¡±þÉ'ë%Û%>ðó¿òÜϯ SùµvBÓø×$¾®,àÊȨƒPj3š•6¿ºAÔºBl;–=ýmYý0š¦Âlܰ~½dëàyŸ~Æó:þŽ^»x ½Ö½—|Fõsõ>·Î«�¹òJL;\/ÎV¡ÛËʉî†Ûª#š¥TèÈh™…0§.ŽÅéúãaø~3C[(lÖÅM¶Ž�Õ¦}^G†ê@Å/YóâùY{W;N/Àâœ9>§ž-Ô �$›¤�"D j‡DÛÛQ5ÒJ—pëü˜¾hÔ}Ÿw+ÕYwr8öGó•Ø;døÿÕf…�]ܳo[]·E‰ B³=—´ør7DñÌX³Ô9²…V}7ÿø?á±~˜*-ÓÒ¸(ââ¼N�€Bu�±P ÕuÆÂ0˜“a0ŒWïÁˆ�q0ÆÂ$(‚¡PCU¹ Vïˆû±ª5N†"âX¸_…¥ÁƒUØS F…-2ÕbõÛ((‚bª>[%ê…0A…:Æ«°ÇÀ8 EêšZŽY C`4ÜCÕñp5ÕÖ+†±ê§˜?FÅEÃt"Œíµê�X Èz0…0†ÀˆÀÝÁPE*<�¿X˜:.îÁsXÓÁ*�dsÜ£Õoâêý0ÆÁX˜ òS@À¶X¥aŒÐR¨b IBÃhŒ…q0E�1FÀD ±ÒÄÀLñ}¢J��ÌuÕQêU ³±)‹ñm(¢kjxþOêYy‚Jÿh­òVÐ;A]¡Ø¸Ýº3\… ðÖ¸q¿JŸÀ¯H¥PÀ÷?G÷ÌßK*B¦ƒU¹ ÌÅó‚Á‘ ßKI7´;¥ó}Úѽ‚€%ä&85Z�=ÆA! Q!iW4},Rià­SÓ{M'´¹NB>Ūdïƒû34xwS¡YˆÀÿ6šÞ‡ôâÙmé ˆçn|„6 -û.W„ý LÄ,¡â[7„Ž )i˜kö¢­Ñ-ÇûúÙmyÅwñ·ÛŽºçý'¾CƒÕ½ö�ü|Ò0Ô� åäÒ"r‘“ÿ:J>ûKûìùKù´Ž|ÂÉŸ9ùø#û˜“�äÃ:ò§?:ØŸ8ùã6#û£ƒ|°š¼ŸKÚ·Y{.iãäÂ{v�“÷ ä<'ïrrn«•�‹$ï„�·9y«Žœ­ö²³œ¼ÉÉ™Õä N^çä5NNïb­œœâä$'¯rrb›‘�°“ã&Òò‡£¬…“?›Îþp”üa-=vÔËŽM'Ç|ô¨—áäpi®Ì^áäPí`vèùýŽ ö2'/•’ƒ¥äwfrÀFösò"÷u‘ßrò'¿±‘&NžÎÌžÏ Ï™É³û¬ìÙ²ÏJ~½7™ýz5Ù›L~ÅÉNžá¤qwk,%»©°Ýaä— -ù…�ìâdçŽ ¶““A¤áéÖÀÉÓ)¤¾v0«¯#uOeuœ<õätöÔQòÔZúäã^öätò¤�nçäçœ<ñ¸—=q”<î%µÕ^V;˜<¶Íȳ“mFRSíe5¥¤z«•U{ÉV+ÙÂÉfN6q²qƒ•mädƒ•ü/NÖsò3kûÙ²Ž“µ��5?]ÍÖpòÓÕdµ‹ü„“*3y”“•œ<ÌIå -«´�Êf¾é -Yq‚.·‘å>ºŒ“‡8YÊIÅ’ ¬¢Ž,)O`K&�ò²˜“Ed!' 2HÙ 2ÿ(™ÇÉ\NJ9™3ÛÅæp26ÛEfq2““9™1ÕÈf˜ÉôR2í òÀT#{ÀN¦ÉNJìd2'“8¹?"ŒÝŸA&r2�“ñœÜ·šŒãd¬�s2%³1œŒ>JF%�‘E¡ld6)bcE¡dDa(ÁÉð!66¼” + eÃŽ’ÂP2tˆ� Í&C -¬lˆ� iÆ>Ÿž ¶°+)hÆàÓÓÁ>3l!ƒ›Ñ ŸžúòMÌg&¾f´Ö§§ù&=Ë7‘üfäó•Ò{9„’Ù $�“� $—“kË)%ÒÃÙ€Q$›“þÉvÖŸ“¬Q¤_Z8ë7Šd¦…³LN2¬,ƒ“ôd;K'iá$5ÙÎRCIŠ>„¥%É}ƒY²�$7c±l_ÅÊú“¾Ý:št�—%qr�>„Ýã%‰8—%r’ÀI<'qâ )`ÞBÒÇB<œÄZ,,–wL2s¯&1É$zqY ˜‹“(N"#ÂX$' °ˆ0ÎI'¡œ8C -˜s q$³�â°+Ì‘Lì - …Û‰ÍZÀlœXQ2³ÅbaŠ•(ï,f³XˆEã�9ÈÀÌ&bÖxdÒ³  jF¾—©IOLB·²©‘ƒ>„8ч�BdN$”Ì$N˜�œËÈ ‚Q2ù�ÂP2… fTºaJúçþo#ð?ü‰‚ÿ ž@’ò +xœÝ¼ xTÕÝ0þ;Û½³eæÎd&“u’É0 1d'„@0C �°„€€,‚@@¤��5ÁhÑÄ-‘RÔ” +E‹ai@*¢R$Q«Öå­h¤¼6 …Éá{ν“piŸÿûÿžïy¾„™9sﹿóÛ·s 0 �:sÙҘ˵² ŽàÔÙ‹æ”=€ç€Û`ßœ+f×,øóóäi€¤«¥³¦—È·à€´MЧ´tÖt]#¦i' GiÙÒ‡½k\âþ%xaAùÌéÆOÁ�þ¤ø^6ýáEÌOã2@ÌÂée³>éI‚2J�-*_²t¡{Ì=CÛàò¢Å³õ{í„ Pø)€�pV}5 ' f@#lÄ«wý6Â)8 X�׈΢Í蜅½à‡³°¾EòÊ‚uÐÅÔ g¡vªOV“¿C9à |äï(›�³è¸Ñ'Лo¯Bš`3œ"M°’4‘b�Ê`zVB#*‡Õx%4â1P oÑóðl„�° ö@9¼¥b¶=ƒ— Úái|&ÁKpNS7p0kk V¸«q€gC%œ†jØÛÑ:h…%�8|ÆZq"ì�—`'Ì€�¬•=-øÁZY+» +{ Jj”ì²]Pù¶Ci¸. ¬„qd2yˆ|ˆÖS]N.C52 æÁ9Ö*Ù¡Zö@µ4­ ÓÔß•‚>¼œNC pY²Ë3È÷°»á4ìT)x �aE¬ˆž‡Ù°vªïÕÚ»¤À[䬃'0GCiÉ…jXIGÀÓ°â¡ÊI&̃rXɶj¿Ð �Ķ’¼RãÊÀ`'ž�*¡_‡· œ †,˜ Qì +¬G/Ivy,a­vxY–%A¯åö–ðÝWóúDwR¯»¾Æ(rÌ} hELã­[£‹i›x€E ^Ýêõ|öS7?Kê5|tqL#ræ€ÍŸ68©×ð±Å°W|<ÑíNê•?X½'V=À¼˜·pÚ�˜™¥1[”-ž~[”Yý’C)¯¡¥l�!úPd Ù![‡)¤4·´¥�ÒÒÖÒ–lu[½n«»”‚ ‰ðÎkdó÷ß.–œ E¬Œ�à ‘j)®…MºZúGbú4™¸ äøÛÒýÍÍi�ÒÖÖÞ¦\I v;ÜÖÀë4YÖ1?Ö±÷/g­ ¼ ¡ãbƒ{]O§�ž÷ eNI–¨“PY|0Š0"NŒ‘Ñ  N½‰£AÖÉz§N'çdЍN2áB�”oRÚ›ýÍVgv¤ä\Jwf§[,+ìYÑ^b|ç÷‰±e‚)>—Iòl4W^†VÈ’ŒdY28 ýhoÃ$:Þ ›‚¦è±G�zJЊaå­‹´˜®DB¾/B2Tê·J!‡�T„^ « +n +ª‹"8RчHPiS†F)ímþ¶f«-;; ”Kím—”+Ê¥ýŠ-Ûš�Šn‡=$#½O–ÃŒ<1`U #Ý&'#O¬$ÓbÿÅã/Ÿ(›{ê~“€b®¾û]#}bÓú} +ž:Izùõ¾Ù/'&¢lŒLÈÇ?>½ûù;Á©[©—®„0Hñ…›*ƒN(Pv"¤Š(Uú&Rl3�T®´7§ ºÔÞ¦ðö+ʵ+©ÞN,Üé!N‡ŠF?êöë1ÜÏ?D^DïÛ^T¸mÊŽÝ7íé�Ù‰‰¨/²#;ê{O¯Wöûô/ç>ë¯Ð�÷¨°>¡>“P:Š\$ zKŠ¿­- R.µ¥g{ï,>ï/a­7ZŸ7ߺH‡Ò•`'x|ÁR• ªLM¶ºP½Í2˜Ø÷†ªL  ~%ub™Ù;.>ÝfU°'[.­züñª­�?¾õòw׿º|ý:ùäƒw[?ü°õÝvòwøñÏø”„¢‘ % |ÛèAÉF8íë§sêuLb²S’˜ÞI°Î)ëfN‰a‚©“œ§c˜�“°Ã é%’IÒ`ÚÛÖ–ÐÞ¶Kwi¯î™véîÄØƒ:¡)¾1ÖéBp( ÕeâÞ¬�®ÏÆx3é‰NFœ4”…Iár¨®'‰g=åþ¤?ÍbÙr–n)”'Jåùd.�+Í•W�‡Ù +i…9¦gX…Ž{�lõ´5¡‹Ÿò!ˆÆgln’ìþ•è<ŸÔQ€óÖò\@0ûÖE:š]…(Èñ¹ÃÂ!„„×F†Ô’ M•Z} ©sE„¹LÐ'8]Êt)þ6³¿Y“€PŸ–+VU¡¨@BB�¬žL7}ßÙeüoF>5ußèû<}úø«ƒf%üm_9|$ªEåh!ªËìsnd!?Çßægxk´=±Wø4€®£+Á +£|Á’l$`%µæ&ýIÙ I ³)-ÍméB¯ÚÛZÞ´ +t|^¤Xc ÅXS!e(©VøÐ Åg £Ñhe´Õ6iªnõX3÷¢Œô']×ÿ‘Â}‡N>¾nð²>dEò=ï¿Ùq�NûpùêØš?hâãé8ºˆ„ _${x•Ù^¥k2סSäd”Õf⤠ááÒÓ5•½¤*­5;;ÕÛµž¦³q¨w\—Å¡å‡'וœýû—oÌ®CW7®ß°eˆõ·vœ‘ Õc'ðWùWüüÌtíÝ>lmùèÍWÐÖ +z(óEÊ#,ÉRžŒ ¼¤c’±•¦ÉVH5¶Y…WJÉiKÏh)=#^c:‘ÐË8'•pœÜWž€Kð<¹?"B¥8”  BišƒJ%�Ð57²fXÝÈê©D€¾?u ¸îk½™Aߺ‘Hߺ™"×zžN²úò�˜`ƒÞ@6 ”Q=cTrÊ:™9)Óédì$Ø&äSž�a¢#œ4êLFƒ^§Er£ )ojfÖž#Â…J¢ÄYÑ^LPfQ£D•QO�Ñ�¢p8‰¤a,Ra7F›â %à8– %È]/S6îò¥l9C—cÊ×ê ŒÃLãuÅú Ɖ¦Ùx.™Mç²yúYÆeøö°îúÅÆ$‹! G“hÆ¢ цDœÈîÅ÷²ÃPÃDÃ<<—•VâÕd]Ma¿0¬6„NAS¬HüC#ò:Uÿëݧñ^DÉ#’Øn�ÍJKÎ¥6Žmé—üªËW“L·Õ�2è=Tæ_ˆÊøg(º±‘Nó§TW“<<è²àÕ)AWB0ôò…êÍ’ª¬M¦“„%¤—Œva¡Â@Sr.µ·Y�‚cV�U3ÈÛ~�Fž÷ÐÚÊÆÆ´ç–üþy|¨c>TûØË¿ïØH§=7mægªl.ÐbÕ{ø‚ùý£Ž!5Ùê-L/]00å®TËs™”wLƳ:vœYÖÐ†Ž¬®¼Ã&ÙU?“ê ïò3uæ&´ƒ¨fˆÕf äé¶u9a–žLs—'A�¡Ò+‘I��ÂÉ\þê�YÛ¹eÓúõ••ë×o"çñ µm;õGdEY¸ñÝ>jiýðAßf:TÍ'ã|v]-þ#…MI&.–¦G.HÕ²IÕç\J÷kQ^ au[=›Ïℳg;Þ;ËZ;vâ’‰øµŽì€ïºu‘¦±«ɾð°áàñ'<8ÝiRj¸€þª^ù™¨CÓFî~€ÆO¡\õÀî‘ÃÆŸnn>]ü|afBªA‹D¸IH87ÀÇÿÂßâoó¿ø@—ÎHöè̎י¶Õë¿ÑÉÞ±GU ëo]¤5çI€…¾{ 2„ǘB-2 +•«lîʘãQU=D„Bi˜Ù ™ÇPÉqï=J{[³ºæÊ›/µûS„ì­Ù¶l«-;Õ•�“êN�­‡zT�ë õÆÝ!õÎúÐú°úpó”nY^fV@Wâ2{÷é�2µD4S ‰.„›<óÛG<ý:|¸ÿ‹k~ÿæÍ~‡6l›zâ�ÙG‹+Oˆ‹Á-šµè‘„k÷–<øÊî£'£6¬èÓ»1>~̘ôm�<𥶭C}ña&WD¼žØ*ƒCôU®�* ©êÑ䲜êyòžø0�LC$›Í=ô¥½9 ÝÊ¥KÍ‘J«È;²U=ï;ƒí"šÆk>iî¦üÎÌ 2iãÚ��UoZ½±ñÊßGì;£~ÐS›z=]ÖüÕWÍ jRqö¹÷Þ;wî¯ð¿ù¹?2âPr¯Ýt«¦NFý�Œt¨ßøIOhúš@w³V�!Òg–´·qA?¦îW(F{[ºfß«;….áIgy"km¸ÑÊ5"W� SïÒ³::i:6 K ê™fN—ÒzlͰjvÜeÞq§ç/ztËáÃiÏ?´ï9ôœP4¡fxÅÍÝÏM/® ¬ :ö†4_¨™é,äXÑIÝ!ƒÎ¨Ç$Åf¶+-9Íþœæt-~´ç4· õJEª—º#ŽXñl´›O�Zqî³s ¼%²ßð“Õõ¿˜±mïY<­Ý+òy:†µ‚¬ÐÓç�jõ› Ö"�E/“tSšìRRm�éH`ɶToL«çöXƒUËN@VôÜzãÌ-˜V‚Æ£Áüoàç÷ÞDCÑð›7—³þ$_ÃåO‰rA-§+!~답YôT†¨Iv˜ªbHSÄÉ0E«E7R*²Ž´E†Ž Ï÷(íÃ˜Æ ?`÷@ña¿u¢ïDŽŠ—MÍ2r.µçNX³³E¶á’JSYª”*§êRõ©†TcnH®3747,7<7"727*×µ†¬¡kØi�¼F·F¿Æ°ÆXRí¬­«¯Ž¨Ž¬ŽªvyФZXêæ<îŽëž™;b¹24ÿ<ÿ¤c9^ûÍ’•Ÿw¬Æk¯.ŸtÚ´œÜÁ‹Ö[©DWBe5Ÿ ¶*– ƒ ²Mg+4ç‹@£VµŠê…²³m?Ù—²×ÊÛ¾6QF„Se™‚uV�-Ìg޳ôµZ mƒ S` +’d,›Q"Ê!HT¬dRò�™±É[&?Yvßä!|Ô)4 9…J+ŽóïûmŸÚL‹üO’šO›}+�f±V ê3bµÍØE¨ÚK¥½9U$ÖdE“ÿÊqÖú¯2@è2þ¥åìÆ( +Ät!•T”aõ Ë~?Jãçºò’aì*ÄÃÿò PíÇë +�7:Ú•§Zr¼h6´ÖŠ^„gi­·ÆZ×Ó¥O\D¶9Í.gǦöTü"Xßa @=ì*DÂ}¾ˆô2‰…†…g„W’Xžb}6¨Ö^C¡ƒbÀÈàrÆ*¤G”âoö·�8¡Å]±`û›�z¤šûÆ™>1Ö+JÀ>�u/Òª-Q¥»$›ªÀ/ø+Ž¢ÐÌ’‚mkx}ќצˆŒKú¶644œFÉ÷>R;jÕcyƒÞLK¿üçi'–üBô˜&ño îä%9„^f‚—0@ÂT§´h S�—Vw¦H½æÅW¯Jöï?®–¨à%Vûíj¾ ‰¾PT«@­~“M1è0–Ô× +.}†]«’4õQYЬ�ÂÌëTÐDdõ ê¯ª~½s+�^º�0¿uó«7XJǹ'ׯ߶÷â‡û¯Žç´øs„�'Šd‡ °B__d¨Ò¡CDi6ï 'u§lFÖc •Ì`Ö‘ÞÜhI«µ‡˜j(vIsÅÖ ‡óSèÚ‹¿ã_MšÔØh'ŸW߬:uaç*éw—5ùn»u‘`­ >§…Ø€"}mh�‚6¹,.kvAªÚ-T 6-{ $¯NÕc ቯBdÂ�%£mgM–˜ã'<춘ÞÈ.Èk˜7·aP~?<€<í7•M 럓Ó?lòrÝ_úù+¹ýûõëïi�Õ¢¿ÄZ!"až¯¯^'ƒä%”0/¥$O¢à ÔQ«·×m2Rf ÑKÄ@¬i&†°tjM³\¦Ô(­<˜ZEžgÕ:Lm-m¶lñ{Û¡u¦7.ä ö�d$äeUE'u‰_´pÌÙ¿¹ræ+gQýu$=Óñ—¿=ñXíãø{ù^^ŠV<3¥c3kýø�'�â‰Wݰv3`->Ñxuÿ'„wÃ>º[b(Š +›ÎQ«U EYX~?�ççy¶¶Aõ­‹4I•Í_,•£Âkek¥ò˜½6HÔ*Aurƒ‹¸ÀéB†XP¢]ÂèšÛ”+ªRhaIáͶl­€¦;Ül„Ñ�Ãí͉z}‰~ñ»å§‹&™þ쟎>{ßöÑÅxB±ð+_µñ«11o¥§Ø]Ðë¢Ö»#ØU­Ç� ¾pò;½­Öeª ­qÕõp¸"$7DÄZ\îèb· %€—@«åJªïÝHA)8…¤Ð–"¥È)º}Š!Ř ¹(ç’\šËr¥\9W—«Ï5äGÁ(4 +�2Œ2>¢ñƒ†�»`Ú…w‘]tÛ%í’wévéwv÷Ã~´ï'ûé~¶_Ú/ï×í×ï7ì7‡ãè8>NŽÓãì¸t\>®;®?n8n,ø)dK‘éƒìAéAùA݃z±ðOê1MAj.¬%ÉÁ�²U¤ƒÝ76ÐÅ‘}úŽ•Ýwøú­••[«¬|ì×®ýãííøJÖèÑY}‹Fà�ü/ü ƒÿ¥¢>( ¥Öó‡ùZþ(mB¿D«‘صÇbßœ–³VÀy¾hD‚€� < F¹–!²I�Lpé¨d1õ0+~¿Ð=Õ$.‰Q§9tF:=r“ á8Ô ‹?á è=÷W¯½v¦c#‹òMÞògìá;QÉq¡ŸÅ¨�® &ˆ€8Ÿ ©Ì´>ÌõÆH0ÇG*j“±ÅŸÓ"Ö¥»d±ñÂKtëK„8EÞLW ¯5é¡ãÈ9£¶ýjlfÉ0“c锂ÍÄôBÿ¬ u‡öÏ}!§OH43d üº�-#ô†E¾´ž‰=Â�ÄlÒGô&û�úý&k|�ý‰N×þ´ÄÌø ©§ ¤D;„%›ìîDSRr¦òQ›¿Yá9ÍŠºû!‚•ÒÜ".5·6_Q®d‹kÚ¿T_P  ^c_ã�„œ»õ+n7]Ô…¸¥µ³úd9o÷¶lj^3þÚµó篩zÜ»nÌ3.<3zC�O\çCÃ�­Ï‚ìÔÜ•ýø>=ŒrÎßÀîµ;v¬}tÇþeyîào�û¶`@îÎ&¾–æ/óGìŽ�a¡èT…6 ·ùõOEoïÖEšÅ®BOâK€àZ‡¡R¿7¨VŠ®ŒÙYë©‘êÏ'„±‡¹â‰�¶ë£s³¿­E fŠ(lþãJvê�ä¨Z|¹;hݶ�üëksÞ�3ûÕ{|zûöÊ�Ol˜ØTºâÏ… ¶™DÇ¿öÔÛ_Çõ8“Ù»fë£u{)[²²gÏ#11þi¥8à ž–úk‚ˆ†a¾ÔH§\E Œ!—C_l1Zƒ¢]Q‘á¡Î�`›U±˜ƒL½Ø½ÃÂ%{ŒÒØQhÉÉñçˆ÷æô¶ôôTD2‚3H†Ã­¾<Áâ vgºÕò� ¼¯ôÚÜú¹íüïãnðOJëç^Ÿ»«”s”0Ž_G)¥HwmÜuÖħ£]|úv~°ŽÏ@¿¯:T´íêx� íTaWÁ±°Ò—'v:df’¼aáa„b̼ááayQá S)ÌÑJ¥e«©6¸&zƒ[Š Ñ3á1z HŸbA1$Ú#r¶á:»ôPM¨®\Û½oY³³;Vª¥UêÇÄXäÉìÝ'Ý™V —dAf…ˆÈ ö5 7éÞ”ueEgL=^zäoƒ¦çÇ�>{=±}Ææ1û§M\˜?øXvßÏŒX7y|Þ¸)ü[šø:I²ƒA�%¾l]Ï '„R¯=Eq#oe�Ç¢{V»ì•Á�¡j³Û¥P©‡®£ÌzƘ È.§…È©J‹3§Í™îÏiSü—®¤AÊ«éͪڽz]Û�´šȪRo5#‡=D�ÖB�Vµù�•™át!Ñ9Ž·ª +¿´ð‹>.­(k)A³ÏÌ(9;óõ7./A£v�»ÿ™Ño¿ùÌ‹ÈÒ’)sΣ_ÓESÇ—Ü<�’XrÂK÷æaôFô¡š_5ý5s…ÿ!1…òû¢Onßþ¶^�Ëhÿ ‹RÔ}q#ù-ì–EQ ‰zõM5¿LEâ F×ý§·ÏD)çøZ´Z‹éCÉst3k B}Bl’ b²Òò¦°¼ö7Ó³SÕ³ „_A¯äOð_D¯³ÖŽ ¨’Wà$±þØJVPHî31â‡}2CËÈ"±PÁ´ (”©Ghjå‰(‰_ >u Ÿz™�8$ Üô{Œ.¸²a¼/Å•Õ36ÒAô¿²Äþ*k[Ï_%?aÙF~‘튒 #L^Coc´!ÑÔOi�Rå +×¼¥ªžW®_á�¶ª²bïê¶¿Ð|dg Å#§÷§oãÆ¹E#ç/Q4wcãß’ääô#7âC=Ô–àwÎ5rÁ‚‘#çolÜè«HJJ;²ac#Ê-š7äÈóFm<œšœ²4wý‘—Qø4´{Úç£æÎ9rþ¼¢�‡S“’*n8ܨúMž4èÁë Öí–T¡î3 +QHŽ’ J‹¿Å¯Ê6°}¥Š—ˆ¼Mq�ß�2y�Ÿr>@%u�Åë 6¨'vh­ÄPqÉ�¥7)-�[,¢< +4™[bgÈþÊöŸBÙü5ÖÚpsuC]«ùG/ݧÆ{<í^¢¦÷2*{•¼ŒQ½—t^b@^1€!†< r-:@6é™^'Kª¿Ô³ƒQùH«ôs.ùÛ:“�@#Hû×m¤v„d¢v„ `�j¨J�Sb¢zYÒm@›±ØLFÄ­6lÜăK[Qÿã5tæüÂŽk Î3O%/ÜHDëùJAOÅ­‹trgé Ö×ZH­£ÆR +é¦>Rº-3´«úÐΊtæPé¶ànc²yãöº�ë¶o¼ð]GÇõïüßá˨…ó/øË¼‘�ÂP!„¯A¿D›ÐF´†¯öˆm< +7IQ@Àö2‚?Q Xk$)þ7ÕÝ Ü´OŠút‚ý€aõ­‹´@Å·ô÷ÅKPò{%¨Òô˜R+ÕFÖÄÖyƒ%‚¢cõ.S\X´Wñ_jS�˶[E§UœêTx‡=„¨�ÕfU÷92{Û2bl"_ˆ�ÃãÖnÛ¶væ�Ÿå>6òÄ锆…ïóÏ�ý–ÿ�]ø$®9²gÏ‘?þá…›�xã‘…•ÌG†öÿFz¾…—ó�|I4tîÛ«ý‘Ï|ƒ™Äô=5è‰ÁhÀ�É+¶í½Ú¶½WÛ¶÷vÛ¶é§¶íý?½m¯m×ËÚîýÄØƒ¡z¡6SŶz´AdÚ‰‘ä÷5L“˜ÑiŒÃ÷/½‡õÔ%ê½Æ8S&îG2i?Ö_×OßÛØÇ4Æ¡I¸˜L ãÙÒòÝ}±qŠiŽ®Ô´‚,£+ôËŒž)еOÄ>üéê† ûªOrüìÇYëÍÁ$Öÿmº‘H–ûÅ ÐÍ| �¦ËÕžo†/²«çÛd©‹8v2Jíø›íÞÛ;³ÝÏtwkèÎM*«�ظ~ýæÍë×oÄáIu³Î\þò�’ºäÇq¢hû¶~øAÇ–±Q²¢ÔoÂØê]WcKÿ–TH6‚hŸEÚ ;ÌA2›¡q& ];ò¡† ;ì6§'N¨L©X¿nÝúúÚ'Ÿ¬•l—xÿ/>çý¾¸‚N}ú jn„&óoI|'\YÀ•‘Q¡Ôf4+-~uƒ¨3t…Øv,{úØ2{c4Y…Y¿~Ý:ÉÖÆs>ùŒç´}‰^½x ½Ú¹—|Fõsµ>·Î«�¹òJL;\/ÎV¡ÛËʉΆÛª#š¥TèÈ™…0§.ŽÅéúà|?ž +Ö—àGØ +ÝJ½De–ŤxÖKJ”ãtýH!" ‘ X±T,OÐÍ'��‡eç]§¨6ŸÅË¿é8ŠÇ·ó°íb»?ÝñÿVܶ§C„JÐ'¤ ¯ÖCP�)}eµŽQÛonT‚õßáu{C1šFW�Ý�ßDë%\:†´_mÛiç;¾½˜ºo~"^ش牂³"g¤3@žH"ÎÏèœXœM;'É!¦#@Q!Hù±oØ$}ƒ®&†Ú�í«œsô!}uùd˜n)ÖÍ"ótä�aJ°Û!0ÏDî‹$©c^ç?Š×u3C›)lÒÅM¶¶�Ô¦}N[ºê@Å/YýÂùXkG+N/Àâœ9>§ž-Ô �$¥ "D j‡DÛÛQ5ÒJjkö7+¯jÉ ÈçÕ„0Г{õÒõ+ï¾-Š5ÇÿÑ-”n;R¢9!Š€”!2|§'^¸\éçäí#¯²Z'hýÉ,ìAõñqí6¼¡µhì‘yïó/¶T¦§¾ö‡�ë +ú¯ÊŸ¾¨_ŸÉ¼¾ãžÉ½"< +©ì8ŸVSS Ç?óÏâÏË +£ 77U2tË�šB�/Ç{Ùí¹ÂßN®}-ÔiqiöxjãkÏ™–=hɹÑZºpádâ÷�Ÿ7·t Ö¤Ge´›š|A.ãQ">ßÜrËΚ´hÝíÑóP +§a¬„Sðl†6˜�æA“8)(N‘A„SpVÂf¨„S°VB +œ‚u°Ê NÁ+P +³Ñe¨„(†ñè\‡§Ñ$8 G`T£ËP ëa6C„ú—íЄ¶ÁP´Ühœ/T`ˆf3j@“a3pΠ1˜âÐ[m8бÅ ‚8o š�~‰Žà¾x ~‡D’yT¡94‡.¦{éÇLbEìv‚}/-”Þ‘Úå^òl¹^§Û©{_£¯ÑпjlØb8d 1ö5–�?6…𯙶APlÐ"soóbóAKŽe§å†²P¹b5Y“­c¬ïÚÀÖËö¤­ÅÖ\üŽ=Ò>Ô¾Ôþ‘ý[‡ÝQìXèxÜqÈñ†ã}Ç—!¦�!ÃB„tÇÇc$Â|�ƒuBBl²ªþ…Í €¨(ÿÄßšhc1ÐcÐÁÇ�1év�v3…/c "�Æ:ˆEá�±ú¡œÀ8(8- ŒÍPjß ƒ Á +X sa”ÂRˆ�ž0 Ò!R!b`¬€ȃ¹°–ÀRX ³`:”A/ˆ�BX3!b` ,€cº`-Q¿Í‚%0 Ã2˜%�  ³`L‡ñP10Ja:,„9ê̘®Â��¹°b`TÀ Xsa&Ä@ ”CLWïÝ g¬ +E@ å°Ê!Ê¡æÃxuý%0W½.(K† ȺãùΧ;Ÿ½ölõªFÑÒõ‚Â¥°úAŠèYæ/ƒ +H†%P°fÂ,õÙÅ*uɰfÁR(è­“ÚN®ÿ�Ëâžà ˜5fÁ(‡å� òüÿN +™~te�sÓ!木5HúüŠÕÿohbÌ¿¡yn€‹BæâŠ�±àÙb˜1P³ÿ-.‚²Ñ*¼2ÚmÔ`—ª÷f蚣®"¸,ðpf«wgu­¦IXÓ&q)”«.TŸ_Ðsm…r˜K¯9Zf8Ý s©ŠÅ�:>fªóÊ`Qz'1[Ã]Ó¤YªÕhÛMKbUɉgKÔOA{9Ì„¹0=@Ÿ¦ƒ3¡ÊT(×¥]ü™ saA@�{váx{aïÿ¥°< çbÅÛ<WÁb(‡¨Pñ¼�M‰J��Ø\˜*>·ùðÓ+è‚3aT¨P4ž,Wu Tµù¥ÎyßIQ'üÛ¾¤ Û +•‡½ºIGŒ_nËú¶ý.�RõÊ�ÑÑ«‹ÎÕïĨ�5{Ð`Ï põNéÿ<Õ�œÓ°ÕôL£ðN­»MÑr•eÿÑ +�Ö0[õ™ j:¢Aš"()W±Y¢rbÌ‚™* ûs‚*aÛš¤„Ÿ¿S×4nhž|úÏÈS@Öü…�}™úyÛü'²X ++T|g«^@ÀN¾ƒS?÷¬àÉŠ.üÅê‚ç–;=šÀ]èéâ®+¦‚§�T +yv×ºÎø%VÑøU Ôo·)Ï +ÎÎ h¡FïX RS¸¶¸›Ôi˜,éZãnþ,ù·4u÷q%wh˜ ôÇ1øyLî\ïn¾üŽª+ J~Ú«kR￲;àv^YÒ¥™�vsw™ðwãÛ+-W©*QŸ�ý‘¸ÛE÷ÝOˆù�Q7¶›¶i¶3â®8#ø¢Å¦N\…6,è&‰ePs„c³àa•ÏšöN‡E°(Å„õ‹hÓùDwùk8ÿ¼Å9Š{âsIG±ÎÏé‹FÝ�ùpq·B�u'‡c6_‰½C†ÿ_mVøØ]1û¶ÕuZ”È 4ÛqI‹/wCÏÌ„ù0]�# kqQhÕó�ÿë§©Ò2-�‹".ÎîâÔPÈW×E0N]gÀ8˜aŒz¯ÆB Œ†10 +ÆC! †|¬Êe zGÜ�U­qªGÁý*, ƨž1*l‘©©ß†C!Á`õÙ|(V×ȇ±*ÔQ0F…=FÃ(T×ÔrÌ"#à~¬Ž‡¨Ù¨¶^ŒR?Åü‘*.¦ã`T·UïÄJ@Û…ÙHȇ10†î„<(Tá üÅú긨 Ï‚¦U Èæ ¸F¨ßÄÕûa Œ†Q0Vå§€<8€m‘JCŒ Ð’¯b IBÃhŒ‚Ñ0Q�1†Â8 ±Ò¸ÀLñ}œJ��ÌHuÕáêU ³Q)‹ñm(¢kjxþ�ïZy¬Jÿ¡òVÐ;V]!ÂÈ.¸�º3D… ðÖ¸q¿JŸÀ¯P¥PÀ÷?GtÍÓM*B¦U¹ ÌÅó‚Á‘±?JI'´;¥ócÚѹ‚€%ä&85B�=FC> R!iW4},Tià­SÓ{M'´¹NB>Eªdïƒû34xwS¡YˆÀÿ6šÞuãÙmé ˆçN|„6 -û!W„ý LÄ,¡â['„Ž )i˜kö¢­Ñ)ÇûúÙiyEwñ·ÓŽ:çý'¾CƒÕ¹ö�ü|Ò0ÔH€!�q0Ã0È‚b˜ñ0ZÍòa2ØÀ +}`"˜!î;8À0úB&DA(ƒ¦ƒB@‚X�Áá8èÀ½ ¤Ãƒ ý`ÁÉ @ L�<ÑOÿ§ +¢àDƒ^7¶ µojjjªnlAZj`�š.p¯AŽƒONa#‘j€ ¬Qÿ/«ï6°AVu¬¨ïØ™ÕqÐÁ¯‡°�^«€ x� #¤Až^�¥3$«cI�ÃÔ1U¯õ +V¯ ßDN8'«ˆŸ“›œÜH'ÿ:J¾_E¾»^žãä»ôúµ‰ìz¹¾†^k�c×&’k>ÚGþùm +ûç òm +ùoN®rò�trÅN¾©!m_amœ´5Þ:ï»E¿B¾º\¾ª!—KÈ—œüý‹öwN¾ˆ Ÿsri>¹ÈÉ%Ÿ}Æ>»A> #ŸÔ��9ù'}è`qò¡ƒ|PCþú¾ƒý•“÷·ÙûòÞ*òn?ÒºÕÈZû‘N.¼c`8yÇ@ÎsòNÎm±²s‘äíò'oÖ�³•^v–“789³Š¼ÎÉkœ¼ÊÉéíA¬™“SœœääNNl5²vrÜDšþ|”5qòçcSØŸ�’?¯¡ÇŽzÙ±)ä˜�õ’#œ®!�ÕÙËœªÈÝ ÚÄ^âäÅr°„üÑLØÈ~N^à¾òNöqò{iàäùçÌìùtòœ™<»×ÊžíIöZÉïö$±ß­"{’Èo9ÙÍÉ3œÔï +cõ%d×o¶+ŒüF!¿6��œìØÄvp²=ˆÔ=�Ìê8y:™ÔVdµ5¤æ©£¬†“§žœÂž:JžZCŸ|ÜËžœBžôÑmœüŠ“'÷²'Ž’Ç½¤ºÒ˪’ǶÙcv²ÕHª*½¬ª„Tn±²J/Ùb%›9ÙÄÉFN6¬·² œ¬·’ÿÅÉ:Nµæ±GÇ’µœ¬y˜¬þå*¶š“_®"«\䜬4“G8YÎÉ2N*–šX……T4"ð}@—šÈÒt‰�,ñÑÅœ<ÄÉ"NÊŽeå5daYO¶p,)ëIp2?�Ìãdn:)½Aæ%³9™ÅI '3g¸ØLNf€Âf¸ÈtN¦qò 'S'ÙT3™RB&¿N˜ddØÉ$#™ÈI±�Làd<'÷G„±ûÓÉ8NÆr2†“ûV‘ÑœŒ²“"NF¢$6’“GÉðždXa(–E +ÙXa(šʆr2d�� )!ù¡¬à(É%ƒÙØà,2(ÏÊÙÈ FìóéiÞ@ ˳’¼F >=è3³�2°�ðé©/×Ä|fâkDk|zškÒ³\ÉmD>_ ½—“(‰ ¸Ar8éß“ôã$ۚDzKHß´pÖw8Éâ¤O’�õá$s8é�Îz'©á,ƒ“tkKç$-ÉÎÒÂIj8II²³”P’¬aÉGIR¯`–d'I�X,ÛK±²^Á¤—@·†&Þãe‰œÜ£a÷xIîÇ8éÉI<'qâ ÉcÞ|ÒÃB<œÄZ,,–wLs¯"1I$z8qY󘋓(N"#ÂX$' °ˆ0ÎI'¡œ8Cò˜³€„8’XHqØæH"v…ƒÂ‚íÄfÍc6N¬(‰Yóˆb±0ÅJ�w³‰Y,Ä¢ñÎd`f1k¼ 2éY��5"ßKÔ¤'&¡[YÔȉA œèCˆN!2'Jb'ÌNîÇÈ ‚QÃý…¡$ +A�¨dýV”øÿÎüßFàøÿ[µ× endstream endobj -400 0 obj +416 0 obj <> stream xœ{áá endstream endobj -401 0 obj +417 0 obj <> stream xœmQËjÃ0¼ë+¶ArHý¥%CãÄàC4¡=;ÒÚÄ’�äƒÿ¾H¶“Rz�ÄìÎîÌ®èÓé¼xçꊋås hUg.ò}¥ ¥[ź¥; räSÖ®@Å,:ÈËm)…#”–’Ý:Žç?Ê!¯yg�j ¥án¸‚Ù€à JŽÒ ×C<'”~¢±BÉ$„Ò�ä¹j½9K¢Q¢“QìŒj!¹•àêuI’Ì�(ܬ­t(>÷Öa[ÊZÁr`ñN�L€èa�éaŒÍ�c=dކ£²�ÙdöWòÜi}CoâEÉÃùáU‹�ߣã”��d°ÈG«+†¦’ ’uÇqë¢(ŠÌ+þɧCÕµfß• ì$ƒušì^³€R�^6o¡vdù.~YwÛ¬3¥ » @@ -1353,7 +1427,7 @@ x 'üÖôñ‹yÍ* endstream endobj -402 0 obj +418 0 obj <> stream xœ%�OhAÅgM²‰é4Å�¡ù3H=$i‚ˆJ/5$Rh#بH’ši²wewÒèEò�è2»Ý$Ĉ –^zÝ‹"ÞjO9z(=õ(EØ• VÖ\Þ÷¾Ç{—œNÀ0Œ?�뙵µ"©Äïàr­Zí4gΛa @@ -1363,131 +1437,146 @@ x ¥Š -X²™Ìûm$Nõ›õÃ÷Ùâtó“ÎX?ÐtGàšylÆ‚tØ´w,ÿ—”áÚ6Bòëö I›´Ý‘›ÛV(e¹,ÿFûU·C[žÆ°5Š¡É˜�º{ìh8Å̱rÿw »Á,Ûhµ±ÉØJ˜c÷¨5lD³ìÑ×Ãïû?÷¯Þ> +419 0 obj +<> stream -xœûÿÿ +xœûÿüü endstream endobj -404 0 obj -<> +420 0 obj +<> stream -xœmRËnÂ0¼ç+¶Kp qå€P¤)Ôžƒ½PKĶlçÀßW¶¨ª’hvgwfì�—ýqòÎÕ'ù+…ZÕ†“rÓè„�µb]‹Òm9ò¡k �b”õº–Â%„Ô’Ý:Žç?Ê -¯B> ^ÊÎ:Õ&„œ„»áF±ÁÔ¥îtœò‰Æ -%�%„|H^ªÖ›³IÚk@º7ŠÑÁEHnz%8{Ý$›Ìõ(¼YÛè0|¼[‡m-/ -òÈâ�î™é¯Â:s‡Q06Ž—ØÙŽFÈ+Œ³¿šÇNëz“@C%ßÔ‡ß6-BÚ~Tû”�=K§»Æ~AúµQ|Y´ÈG«†¦‘WL–”RZÀ²ªªªðŠúó8u¾°ïÆvVÀ’ÒYY4 h^E”G´ŠhÐ[Ñ[D4¢yÜ’Í~»W÷‡üˆË:cPºpÆ!›"$>.K+í§Ânyøa<ÚU?øè×× +xœm’Moã †ïþ³¤ô�5Ž›v7Š"5N,ùÐ5ÕîÙ�I)ø�¿‚ÁiµÚƒ±ž™—™wöíí0’æˆóú;‡wôftçÍso ÆvFŒêð‚(QNY¿ëŒð év�V¡`¬Óâ2Jœ4ÿ“lñ¬ô§ ö€fôÁ c*\p3 +@ò�DT¸¿+û…Î+£WPŒíµlÌÍù¢Ì= |sF0ÀIiér'8ƾEµ©DÈ”V1ô6m>\}À¡Ó'5©äh³ |dzòÁ]a–ŒÝ�Äe^�D§ôf“Ù/ÉÃhí£Ià)ŠZ¦‡é„2|‹æ)¡ú }\-æåïg#'¨È¢0½íº^Ÿ±XsÎùÖmÛ¶›ØñŸ|UÓ¶ãIüé]’WXs~ßl-=´D5Ñ–è>Ѳ&Zq¢ª’s�‰¹Ê�D�Yù“jVDOD{¢-Ñ’¨ITgg;¢}+û�Æ{¼�¨�CÒ5¦ã‹g¥4ÞÞƒ56îJ_zHÓ›ŒôÚþÞë3 endstream endobj -405 0 obj -<> +421 0 obj +<> stream -xœÍX{p\Õyÿ�ýîY½¥}Y/Ûò®¤µŒ­—W~ »+$ÙÉ’¬‡m%†XÒ®´²µÚE+ÙŽc»@xch§ -¥„‡Š q2FI ˜ñP 3¥©›Rð”¤Ä…<:£xL†4Œ*®:眻ÉÂ0M;éjì½÷žs~ßïû}ßùÎw @ŽƒPÙ{hÄùBÃ÷×x`w÷…ûƒwl¨>˜¼¾Û?8Þ×µ9í5À4�/àïö%ëøÀÜ -`S àïNy‘ý0ß 8K2±ó÷XC½Ý&̯ˆû`÷XXãô`þGΡî ÿ…IßÌ3À²×¡È6³`Å€Êð°?Ü´ëÉ*`ÅÏíVÅŠØ9v/Âdü]aÍØ‡#ô+b%¬ˆå±"–Œ}Z:+ÂEì3fíÃa-�^aE¬ -÷£‡AgEr´'Ф¥£Z:]FîÁ3t‘î’#WM§LM§`bÀ$L¸ çð2ÎàQ¼‚)|ÌܘÄëÌÍÖã VÁŠp&VÁ.±TV�ºˆ6¼ˆI<ƒ¿c`Ï03"ø%¼ŽËxWø%þ(&ù%~‰_ÅL°ÒÌ©®llß›ÄßL²$¿ÙUhwY™+…¹X’Õu޹Ù~Ö«ïe¯ê¯è}ú{fÇÜOØQýöOo6¥ï×;†óh»ùU” ìÝ–½Ì”ã(AIf–Åjãv Ämw”@K-8±2ä -ç§žH e„ÍCùÃkJì[RÖg笲d¯¤Â5–¹7fæf>´Úª«««•PBªÿ¼b5HZ2ß´æT_]…¬œmÜP\åÉα–³"©ç*VÀ–94WáêkSê–0ýý'˜öAÿ?ù¿úÆþƒÃíw{á¬þ;ý·¡÷‡~6km2�ê<ÿÄ�]Q®ÿ¼vûîÖm»ÖWÞü¯gþýý�ØúŽ¶Þ®ZÿJãI@;Â/!v”zsXØ‚pŠÏ–l²¤‚»2VY‘•²Âa™›ñÌÍX•‹ŒcVE¥Èírj‚_‘ÕÅÞdtô}?û ¶‘eéé?ÒßÕ~¦ßÚ3>ÞóÉOÿûŸ~*·1ãóhÕü*òPîÍÏ;�Pv˜2N¤‡,á”!η»Ò±Ê¼"_žIÔ­Ò�ÉŠœ"±\Q‘L˶*ϦÍZõöÇ:õÑ_cÛXyçãuM§š&OŸžl:Õ´®¸˜=ÄÆØ8{¨¸XŸÞ^£Ï:§Ï×lW\ÓíÓG™3é«Y7ý«’e¡yûµuG¿ç‚sïòw“;À �uIA}% ½5Ô?áïJ¤ÄÓÞB¢ŸÃ LâQ…؆¯áeVÉÙäŠ$S:ÖÁ3L°À+,Ð󬢚¦á˜–à`\38qÁ¸6!ÿf\Öâ—Æµ–pÍ‘Ë,Ƶ«Ùã:…¬Ù¸NÃ6®3ì«ÙYã:Ç?£!„1Ža  ŒÀ‰5èÅ pƒJT¢ -Nô`NÜŒŒ ‚ Ã�nQ -'0„^”É bN´Å°"òÎ�üÆ!øáC9RQ? »1 -'z@7†Ð/g:Ñ-ñ�Àœc=Äzá„!Ñ-Çã´K�°! !„› |Ÿ;Ï›¹[2�`@Ž ÊQ…Í ¢ë£«Ë>ÃNŸW*ŒŠ UFÆT >cþ!Œ¢„0ŠaôÂ/×KEÊ1?F°=-ªP4R×FFŒ ÕŬø1ˆã§ÿõES—´¬4ì†sçk3-eÀŸ°þÇÈ^ççø<`¨(b.žˆ ͆qN„Ð÷¹\„g­/(ÑâÙ¨°rÌoøÕ/­•?�Ó'Gý1k*Â*›ÄøˆÌx±F¬¯,„Ѓ#Ââ_¿áK¯¡tsD²X˜ãÝè•ó‚èQ1[qW™ä—ûGepaB–Êȉµ>ù-|¡è6üS9Ø‹Q%Šà:Ó§4òxMŒcÜ‚Øû‚ÿy.,Æ5OÂF>ŒJžq6>é�ˆØz0*ùÄuøl ]èЋAŒJ¥Éa™¹çG eD¼zÅ�gx$ÆvTjXšq-t‰Ç:¾#È'KùQó³BÖ§DVûAaª.Œþõ½Ž*§Øª×§Äç[�aÂÓ¥\ŸÉB{‹uYŠ£RqHZž|vUWQÿ ~Á¸Ñ'‘XfF÷ÍâSÄoÔ;Á8né°ôÊ'×.q.Æü^¼BÌ�žº… Ù¦öNÓ¢sFè¢Î¦(W‘ ƒ ‘8„–PÌ�1©³ÊÞn„6N1±ûÅi]‘Åùú;FÄQŒ‰ïˆÁQع^¾(ï–ªábtTÎZ¨páuû•Â1üŸîÙˆÑÿª3;¾ë¢;Jtjï‰sI�/‹Åš^D·œ#�Õ¹¨úóÅýÇÿEÅúl¯T§¥Tçb_L©[P/í´ ÒN ¶£{Pƒ69Ö€v8ÑŠ6´`7P‡zÔɸÔÈ1^(wã4HÄtJ,…ц‰Ý§Ä�j³¼kDšQ'×Öc¯´Q�v‰Ú‚6‰½­hBƒ´©zÌfÔ¢ �¨“×;d7ªì5£E~‹ù;%Å´- V²Èí1f;Q�6Ôâc´7£Aâ þÂþvyÝã¹Ý`Z#5ȳ�h’wâi'ÚЊ´K=r�Á¶Yú°m†/õ’�Š„bT‹´¢KÎØ�[Ð!YKÆLqß!ý‘Ù)­6ʧŠY‹eqGï¦â!ôß³Ü.ýoB“ÔVøÛ.-Ô£;c¸ÑÜÙ!o¥F§ôOðk� - 1&Tz6Åf¶%DEÄ´FÆM0ë…'B‘ö%=‰¢-ŒÎRÙµ °DÜ„RMrv;ZQ�Z‰¤ž¨|l�¾ÖÚ*L•÷*'Ô\ÅIħYFv:� -o±j‡þq/TjŒÿk4‹G_ -ÎQ>"›E–]«ŠØ‚‰˜%²@ÜEU9&¢¤˜«ý¢lDãØiägtç5/Ò7º�¢ó¾HíPXQÛ #(ô:)†ª’4!\U»ê1&ë^Ø8×"ל܉Ýc¼+Mì?Kjmb' ªð97¸h^ü©ªÏêÌŠ¿ó$öpK�\Ñ·äÒEÝo´ûPµ[½%v¿>Ù§«^0ëJÔùŠu&¢ûWCô­E¼ Šóeáû^DÚUž)[×b©þRÌSÖ"K¨y½jñ¢à"4È‡åµø-Iu ÝrŽ˜+žß¹è­XùðÅcõåóôO#ò½è€TXô“åîpìý,®‰P@ýº\õxö ´-×ô¡BƒþæâýNõ¢¯6Sÿ€ß×*¤Þ1€ -ÉQ¬C¹ìÂèXÔQŠßØågþëø²ñkóÂO€ -´¡›P…ÕÓ¦ãÞ‘ :�?O/Ÿ§—féG³ôâwðÏÓwÐ ú› ú�‡¾ï£© zþœ�?�ÎÙé{vú®Ng¿“ÁÏÎÒw2è¹gäÏéôܫڳgºø³ҳǵ3§Wó3]tÆ«�^MÏèôך\FO?µƒ?­ÓÓÓóoyçµ§ž¬áOí 'kè‰o{øéÛz\§¿š¥Çfé/uzÔFßrÓD.ý¹N¦Ó#:=¬Ó)¿…Ÿ:J�tð‡²éäƒ~ÒAZè›}ü›z �î¿ï<¿_§ûî½�ßwžî;®Ýû 7¿÷6º×«}ÃM÷Ü�ÅïÉ£»³è® úS�Nø-ü„‡Ž³óã>:f§¯OÐQ}­�Žôð#ºÓoáwzh<—Æú -ø˜�ëtH§‘H�dÐðå|X§;Ê)ÜWÀÃG)”KCÁó|H§ààm¿…÷�ßB>�zuêÑ©û(í×évíûŠƒïÓé+ú²‡ºÊl¼+›öfÓØø�v{¨S§Žö4Þa¡ö4jÛ•ÍÛ&hW«…ïʦV µèÔ¼ÓÇ›'h§�štjÔéÖ;¿u‚ìtË,혥íG©¾ÎÎë�R��js©&“þÄCÛ¬´õ¦L¾U§›¾”Æoʤ/¥Ñ–ê¾e‚ªoLãÕ9T}\»1�nôj›7åòÍ›iS™�oÊ¥�rùÆFÚPåàr©ÊAžõ¹Üã£õe6¾>—*+r½Ù¼²Ž*r©¼ÌÆË ¨¬ÔÊËlT6mòzS´ÒuY¼ÔJ¥Ó&xS´uk3ùº,Z7Í^õ¦hkÍ©|m&­�fǽ{´iM•4Òêâ\¾º˜ÜŹÜÝHŰñâ\*rPá -/ô�˹�»¶‘6îÜ@«–;øª|*Xîà:­\áà+=´ÂAËóí|¹ƒ–‹½‘¢åçYy¾�ò§¼ä,žg¥<Ái�–ë œFʆ�gOвÍäØLvVÀí³dó�ÕâáÖY²ÀÆ-ÊÊÜ˳ŽR&lVÂγ8V‰6z�x#x +?b`O1Â*øy¼Š‹x Wøyþ8Føy~ž¿�]L0ß4f²Çäá + b›™ øü§â£­ô5v^6u(O(¯ªÛå{/€+ÊVe¯ò.ªÛÙI¼c²c÷ã ¡¨6¼AËÕ:|ˆ7!^  à$Uð#ú›¹Y,Þâç••Ø+Xò÷q”ª±€ gcFLI¬$æ^~o" Ø�ß~?ÆÄUR +�–QÅ]ëõnlqþx‹«¨pÎW§%Æ9ІÑÄ!çØÔTC‹šÅ·Œòy£äŽUÝy?nðbQẆçè+5ÕjÍöê¢ÂuM-£Š[|«ÞârÖTË1at”»G¹»vû¨³=à|ÈòPÞŠ‡,þE€‚€6¬øS Ä Ó› ¾ ÓË,–·)*JΜ_ +˹ñsã¥)V—Õí²º*&Ô5ù®6“ôáúL‹ÀpPïåçÁ‘îM óAIV³0Ïd™_Š’Ëã¥eV—Õe½È({øù?—h“ÂvÛÔ%5¨îE<Ò�çM1RH>œÚ—nvØŠÉ‘°(Ý29>)8\¾:n¹RÊrM©vG™gYEy³ Ì«y¹P]ƒƒ];¯=Ê2~…eh¿»ò{íwtäO?ýñ§�°d¶R{Uû@û@{•­Ã)@=e²#^¯+ÖËM<ÆÄݱ\!zýq¦X®’É̦bT$G<Ö´Ê¥(¹eürZe麦–þZŒ%öµ-¹).+s™™‹ÅX]§˜›mgíZ {E{I{çýÒdŸ<Ëöiw]»UIØ®5 ¦.©›ùûX€�w•#UI³/À‚¤d‹ÕÆS€îû¨qÙæ]¡Ì¸æ`bÈÔ›Ù·pAŠùóÂ|GZŽÅ1ŸrZ&ÏŒOŽ_¶Ú*+++u¡„TÿuÅj�´$½fM«4>¶ä²bVQž_æq¤Y‹YžÔ3‡e³T»êÊ-X`Ífºº ˜öÎ1¦^êü7ÿÝg¶ïìkzàÞçOjÔþ|'°ûBwÏ`C�rtÓéc?}¯¤Xû�Õk67¬Ú¸´ôÖ?ñ›w*ÊÙÒæÆö-«ýóEŒGu/?�X¤ Ð›ÆB„Ì>[¬b‰w%æX‘lžg·LŽ{&Ç­º%WEÆ1«N%Ïírª‚_žÕÅ^zl`à1m;û{VÁ’µ´Ÿöjo«´ÛÛ††Ú>üÕŸþô«kr3<>uI­äï#ÅÞÌŒ:B”x !h ™{©/3Å•€Ó¼Lax|¦n¥î$–ç‰åŠˆ¤¤ÚmežeËÕÊ5OlÒ~®ý�­bÅ›¾V]w´näé§GêŽÖ-ÉÏg�°A6ÄÉÏׯÖTiS×&µ©ª5:—]S·ªÛùy^³ŸÊ �j9wæÜ™¥°\}½TÔmºÿÂä• üüG=º k›Õ=ê^X0•Þd&q;e’ì�ØÃI}ì1zt¾ÕïISáPJç 7<úN¹,÷ŠÕViµU–ºÅ¶K]ÅÊ<6«EÉË-`åzÔË<ËØ‹Ú¯X~ñ°ÿ•s¿ø×;�²¶î»ïîí½ûîîcׯLq϶¶i¯kïi—µŸmcŒŒ��ŒŒ� Ü5uImV÷"nô–˜MÈÈIKJ0Å£3ÍÔiÍ 8š×™wØÚ—v0yóÒˆÒÍŽøârØX&Ç_t­i2Ø‚¯`l¹"¼½EåÙ¥9¥Îr×€Ò—Úç8„CìPÜ�ÔŽã8ÎŽ›�Ç�°ŸH=žzÜq<íxºc[´2¬dn««"‰ååT”/s•‰Ê5ÅT¬beN‡òÒS÷ݹ¾?ËÓ.Tœðýóy�Åý´Ó×õ£�­?1ë%©¹£îÎç¾nßuíÀ¾Û~ò½3§—®­­X1±°à×"ŽßÔu/RPêÍ0KJ3¬‡�cŠË…“F.‹Jqù긵R¼+K™ÕeÕ¥�FÄ¡–hjê7|^»Àòr†w<9¢üâÚ"åä=]�|ñÚ½êög·u¼¥ë½uê’ºOÝ ;²PçÍKHM´©G­ Qâ#éóaê›—ê@Bq’#ËaZ4OÔ«É3Fb�[~{Eè+…�?›p6ñlÒÙÔ³Y|[4×E)MuÉÝ¿œdaˆQë;ÎíÖ~§ý‚eÿé#–rÍÌžøªÿÌΕpÈ?¿|ñbVIJ˜�­ÒÞÖ®îyྟc]ý{öîC zÔ!õq˜�ãµpUaàdŠa +RU{Œ�GTªs¯§U–š•TVÁÔ¡Éw)ëÏï¨.:¦]ÒÞýˆ=9ÎŽë{g–‰“®²“’ªB`Ý2ÅJ©`¬EuýùÊ¢cÚöq­õ#–%qå®±�¿™¿ôîä[þˆœXyØ¿õÃ%W#Ÿ“=“oó·c›Á êöÓ£ÍÔ7'{´ùÛiæ‹©o"Ñ�ÂŒàqìÂ0î·±-h‘sr± +_À‹¬”u³ï²×•LeXù9-¦ê7¸%) X?LP`�W0 çX>8DÇ�‡@`ªÀË€qÍàÄËÆµ‚XüÚ¸&,Æo�kuÆ5G:³×&°…Æu,rY½q�,d\'¦°“ÆuöŸa5‚a}èB'è‡ ÑŽEpƒR”¢ N´aNÜŠ.ô#Œ~ôÁ�Vô NÔ¢í(†UèF7œhŒb…å7?Âð£»á‡ňC5üØ�VlÆœhG­èE§œéD«Äw¢ ½p"„´¡]h‡>уV96§I¢„õ¢AÜŠ ºáûÄyÎèÌÍ’i]rDhPŒ2,Ÿ…YY]ô1v:丮B¿¡˜P¥!¬@ Jà3æïÆŠFèC;ürmŸT¤½ð£kf EŠDêúȈ1¡º˜Õ?ºÄ,’qúßQ_Ä1u [áœÅùúL‹CÑ_ðÖÿÙëüŸ» EÌÅc¡Yv‰ :>‘‹ð¬AâõH´élÔ±rÌoøÕ)­•?�Ó!GýQkz„õlãý2ãű>dd¼n!ˆ6ô�†/í†ÒÌ~ÉbvŽ·¢]ÎëAÈ@� ˆÙ:w=“ürÿèœ;#KreäÄZŸü¾ÑŽ.´þé9ØŽôHÁµ?ªOºÐmäñÂ(Çi bï þýØcä¹°8­‰¸B‚ða@òœf㓈ˆu¡ ’Ï´oA  ÚÑ�‰¢k²Gæ@@îù~CïÙEð§3<e; 5,œq-t™Žõôþ # ïÜÈ�¨Ÿ%²î8%²¾tì.CÕÙÑ¿¹×åt¶zžéÎκi�öH=z>•…Ènè�5³×ðPÏMdŠð$(Ù„¥;àG»ÄÓçÌÌãn£JF"$<tEãÆ +¹;›�U­hCPV†é̬EÓ +\_ ÄÉ!pE–…gÍ�ì•Ð kÀÌuÂ+±·õH‰:?;×t5ôJÞz“x +d½^ˆØ÷ÈÏéúñibÑ�!É·CV�]Míб"¶gGPè)tÒꕤþSá굫ƒ²î…Œs-|ÝÉ=³{œîJgöŸ…3jíÌN@¯ÂkåÜž9ó¦ïêõY?³¦Ÿyföp7:¹"OÉ…sºßH÷¡×nýÙhf÷ë“}ºÞ †£]‰~~£�‰èþõŽ!òÔ"žÅù2ûy/,íêžé¶®ÇÒûK1O·¾�š7;¡æ>! +.B#�¼G^‹ß’ôŽ¡UÎsÅý{æ<ë>|úD|ù$ýÅݰ›ÖD( ÿºÕ3'êÓÙ'ÐV\ׇ + :g0Ïwz�!ú +a3î/ø}­Dê½](‘ÅÚAË.<„’9¥ø _¾¦¾ˆ;�_|g¿’” õX†2À†&Tc#nC\À˜²ßÛÿ²F§OÓ‹§éôý zá{kù §é{kéyýÓ0}×CßñÑè0=w*…?·“N¥Ð·Sè[�üf"?9AßL¤gŸy˜?«Ñ³¯¨ÏœØÂŸy˜žÙ¯žxº€ŸØB'¼êÓô”Fÿè¡‘TúÆñµü}clêMï”züÉ*~|-=YEǾîáÇvÒ×=ô5�þa‚ž˜ ¯jô¸�¾â¦átú[�þF£Ç4zT££~ ?º�9bç�8èÈÃ~ÄN[èËÙüËz(�:ÍktèÁmüÐi:´_}ðKnþà6zЫ~ÉMHæ3è�dº˜îÓè€ßÂxhÿ½)|¿�îM¡/Ó>}¡‰övdó½ºÇoá÷xh(�;²ù �öh´[£þp"'Rß®bÞ§Ñ®b +udóÐ> +¦SoÏiÞ«QO÷6Þsšzö«Ý]nÞ½�º½êÎ�´£ËÍwœ¦.ï”›Ù<à£ÎŽlÞ飿…wd“ßB>�Ú5jÓ¨um×è.mý¼�oÕèóvºÓC[Šl|‹ƒZtlü�6{h“FÍMñ¼ÙBMñÔ¸ÑÁ‡icƒ…otPƒ…6hT¿ÞÇë‡i½�ê4Z§Ñíµ)üöaªM¡Û&hí­ÙG5Õ)¼fU§ÐêtªJ¢Ïyh••VÞ’ÄWjtËgãù-IôÙxZQ™ÆW SågâyeUîW?OŸñªË—¥óåËiY‘�/K§Šòt^±ŽÊËì¼<�ÊìäYšÎ=>ZZdãKÓ©´$Ýëà¥ÕT’NÅE6^œME…V^d£¢1Åë5«…K’y¡• +ÇxÍê’ÅI|I2-c¯xÍêbS_œD‹ÇØ~ïê¢u´0™¬£‚üt^�Oîütî^Gù°ñütʳSî<;Ïõ�ËYÎ]«È w–SN–�çdRv–�gk4ž�Ï÷Ð<;ee¦ð,;e‰½aV33¬<3…2uN±É<ÃJ‚Ójº�ÒÖ‘6î¦Ôåd_N),›§L�ÍCV‹‡['È·x(9©…'ï£$ØxR %Æ&óÄlJˆOæ ÙŸLq°ñؘ›L±º‡1¦8“@1ÂC³jâfnŠ#Óó>¯r3ñ1o†ª)‰œ²II$gÙ±1æ;x„-ùýÂ_Ñöüÿùœx endstream endobj -406 0 obj -<> +422 0 obj +<> stream -xœí}[³ä6’Þ»~E�43Ò«³‘@â¶ïM»¶w=³öZóæñèc[¶£u¼îmdžÿ½#yD±H¢ªZA=¨ ž*V2H$òòåÛ¿úøé¾ÿÓ»O—¿þýw_üŸ ^ÄE\Þð?Žœóîòî§·ïÄåÝ¿ðÁ{‰Ú8×ý•ºüË»×îk?]´× ­6qù0 “>Ä�ýðÅÿøâýÿøÅßþþ»·#¿ýíÛ?ü¿þ§·¿ûÓÿûßÿ÷ÓŸÿù_ÿMB”Ô ^z�(ÍD›‰h Y&R ï„òú"€Ða�îˆÔD 5z}Ae5SßòVw4¦—üÁ˜ØïÿùO¯¿ýíÛß÷wso÷§×¿ù§×— -±ÂƒV6!–*+5S(­#…Ä75y�Þ0­_üõ.âò‡�oß‹ êËÞÇ¢—?üôß¾ù£â�Bàð¯þU/nü ÿêá_óòßÿð÷_üí -/‚•h´õÅ7‘ª›þ"@1ÿO ÕÿGé›àÅßô"ã[¼Hú&“á_ÛýûCò„OÅÏŒ}íG¨ -OxßýÿcÄÀ—76gæð8�ñB¤ˆj$DŽ/h£ Ï•ÃkË�09^úûr¼O/#‰ÒTpäRÿà�)—‡ŸIÆ”¨^Ή*ò:°®FWÆŽðK‘0¥5eöÇu†ûÃX‰ä™ã'¢�scün~?ÏT)ÿ§ù=òNA*‘¯áìíÔð‹J¥+úV=j=�É´óÄš”USt%»kéz´<*å;e?�ÁÒ¨;ùjƒž·�>9£O³ºd�,@Q§éùR8©´ôoF`ì°uWv¤«¿XÐèrF�2€Î:Të4sb»&¯ê¿t•êH—¥:k\)ãìÒ;ç€u`MÿR?ŠË�ÿróL�Ì~ïˇp��9Õ̓ñzÇŽoIj{4™„`9ÓOŒh´ƒTc-'¥>–TeÀX”¡áúv25)%Q x$Þ£T@$üˆÔýÒ_¢õÀ0Ñ{ÀX¢÷ i0©Xk‡YTl LJÛ騋HCpÂ\~âÇ€N[eã«áïâòî¢À ìˆï¯öSb¸ºÑI ØÞïoºSæ�ÌFÐ0�ýÝtÔ{ 0¨¥%Œ®âÏõ×ïb>\„@goÝ3º�'÷úÏ¿ëÔ @™�úGÞÎG…€R¹NÜ"ý@ðOû�œK¹*Á{cåx£gëÄ¢~<¾äu¦��MG1®3j”Û8Ù-Á @Ù½l`|/µ]³S‚ÒÊÐN®ZЖ²‘«eñ[jtöÂ& -_¨‹§»?X9\¿¾Ô�º¨œCé†;ý„GõÃþ+ïnÁHÜð@>w;wA © ;!ëñ úëw�P±¡f}÷�þ†×½äð ~8RÖ�¶.é�„ê„eÀk2kÝVúÏZ!¬�:¹ì?À -p¸àõ`Œ÷Ò³~T@¾wŸä¥@Ý”&.Q§9µ—ÞEÏ PÎô_é/ßŃñÃû["zŒž¿az+Bè^i0Z­f™gÜÀ3åœAãTr9|¢gšê®:�BV9ÅH�ÊÄ_oð×Þ #>€0ú‘åu÷õéA -¬£á'úëwÃ3úчø'ú["z�~âHæ}÷ý’nøþ»à?]þõB—ßýôyp(Èôéñ}á ¦æö•šLW�"òM -@öó‘â�F’ڹ‰™'J^˜-¾(YpÕ|RÉù-¸Ž†sÜË6ê¼7^—Oû™¯bü¥Ñõ¨Ÿ;ÿe¦Åè™Ç!õ—¥çÏô7(;©„]ö(RM~F‚¤fÒÓ© m$5¹Ž§RO.˜„…ÛÛÁ4Ð ±Î48-׊åz'OÓuíü$�éÊ< ×'5\µ×{N»u�é¥赓û´Z—Yw­±ÑºÖ;Y?‚Ɇ˜‹DpZYÁ„|ˆF¢ìÖŸˆ !=§�À1m«é¬ÞâU å¶0ï¢)if[ Ò¿@ð¡ÆäJã[šÑ`|Ÿ[�©ùþ¼˜¼áÈ!ã'~ÊMó’9?„;?fáZU|î,�¾,![›î¤ÀjëU3å,ËYY>Ùà‚@U9>"å)sŽ<�ÍyçÙ`çÙàFá–!nÁûŒФa;Ä0B|£OöÿAq�­”Ÿ‡šuëJi°„þ<Ö|Ç⼎$Éâ<Ø\³ÎI€ ŒwØÓ#¿™{çéfß醼¶^?î€ã*E ÉØvç›<°Âzö•óM�Þ#mçì¸ð~Ñcþé¶ãИc‚�\Œ”¼ÆG¥ÄûžõåÄÎñ‹¶ä¾_:@M'µ78†`BÞmE^(jó_viムÄŽ�SFèðo–‹ä¶î¬4ʯ¿ÚVºášÎT!6$9¦?Rs“Tà ÞbЫ"O¬ÉKªÕE6›éÅÓxž„|=(¦ÿ(�”Ù:|•Ÿ¿ð­,D9¦<Ԥɬ3¬Ü[аè$¯-cÔyBÞfd£!PJÜÊÈ'8!o¥üÈyw�—2Öp^;„Æ‚'É‹¶µ¹d}§…~¯+¬ájæ�� ¬â�°iòÖ`9*{=Ì’ÐNËn`ãyBS»0æHÏžƒ��5Öë -ë�g‹ÄŠV¾€pöŽ076™î–&If¾g•H¼B§é¾ž‘Þš›yÀk§'�ÐÙÚ: à§2€­©Ç%`´ÃÓü½Î1§ÝÀ1¥Ù±}æ¾íåÝiÿ.Ú¿…<-l’`sãe1»j“Ùâ�D‡tÚ-;íÞWÇõo´[ïrÜJùiq­]Y§Éõì&—— p\§ÉµŽc™Q“ët9neÞis-Ú\óÌkoÁPÏÅûØ\Y:ÅÖ(¯pཤ/¤S�K Ây¢5�W`ëÃk$pžD„J€Ó¨ågf}#I0Nw.ÏGÏ9OõA"Nã]f†l2‰Åð¹V,àûé„YOž¤3¾ZxX{5Yó�[ÒÉfþýk¹-ãk¼Ø´ª? ÃØJ° ËmÒ×ãRUâ–mmC›Ì�,ehL¾«E8d  5ÅW"몔xyƒœ<,„£ˆç kyiU÷”KI[¡HW0Ä“«Ÿ9¿ˆÞu"l˜½!�³"¢jÊ ðµÙœZÎüì§×—å?fyŽII\nžD ý”üe " %ߊ�C¿Jy<ÝåðËå¼Ö«Ó¯"1S“˜fÀelx¾ väW›x¹�0:S=ãúÜËE7dGe ‹Ë¼®*r*2ÙM¯È¬V2iØBÄÖ[Ù@økyêU7WÀT ‹ªð6tî'Õ-SŸbôªeØët¿þTúZØk)ɱ‹P¬xñøÃ�YÉɪqÇß�œ€ò¬Wÿî÷Tú„¼ ÖHËÛ.n«T xGì¹ù®QAïæ¯ö@ª ->Y'Ç‘(%X/úãw¸ÞA¦& h�|:Fj ΘîDµ[ÖØ•¨:3“Ž£cÉÜ/ð%:úDë~©7dét�œÌ·žèõ6ªÏðÛreù�ò?£X+ç'ÿ‚ML�3†õœ•弌8cX7”F3Ë”H¼…gk3÷Î(ÖRK΃JƒT] -h“©Ø«=@â³°*uPêNQ¿~ùÃÿºùä¤kÑ|^FÕFªO£*gd×$‚§þiShSEÓ󴩞ܦR¼ñhú=î4ªÖ( Úâ 42›êÌÅÞȻӢZDÏ/@”øà]+˜T‡æ¤0öz[„kåäp”È¥Ÿ“5¶•ìÓ›qÒƒW’ÓqNsì8s,žŸ§=öäö˜s\ª?,�Ó[Ç1‡4pìtqļÓ[´ÇæI™^�¦Ž‹­Í±Ã Æ÷á[” Dšò¬æÙ6¢O㬀¼Iú§q¶nv - äVvŸÆÙC�(A¸Ó8»%„Æ=ä]¼5žÆÙVæ�ÆÙ¢q&+áGA º*žgŒ?~FÕ6¢O‹j9úx›ð¨°‘ðÓ\·ªNKðs -›ž¦à­¡¿Ó<Šw§!¸hªZÔT0Ô?4©£›uÈêÓ– -ójÅ©8mŸ÷N{Ö}¶æ6¢O[sÙ{w›ôO›måìä—²»{˜Ÿ6Û¼w¼´á“þi³­õ@1ÏdÙ:�¶­Ì;­¶E«�–ÝwÚ Ðò9«>'‹jѧEµè; ªN°Ó úœœ`§Eu³'gnP�µÛXwšS‹æÔÿ‹48�hÔ3ÚSäÀ�ÔŸ—‡jѧ=5sÏJ�š4ª[¥ÿðpèVÊOSpåº:MÁg7µ­hP‚§%¸Še¨Ì¨5NßÚ1Ì;�ÁEcÐT"¢%c°A鈓k'äà F1CÍ OͪÔ¶õÆp¬P)t#eí+Í>@tM`´fý™¸©>mÜ9#;eu³øOKqíôKÜiO“wšS ’àNsê3Ê�;í©[ó¸Nsê Ö�ÖTlM­�!G® HÖ<®91ÍA~ ‚dòÊFßûTÓϱúu™ä†ýÊ[¼NMyCCëñÆkþɼÈ6{rÌc$ˆŽnôì=: ¼�êÓ~ž'$X%nÿi@¯�ž§ýä4j�‚N ú&–”ƒÖHMè3¼•y§½ä’$YÌâP$鎦ÞnÌãëcª¡Æhm@�oôžyvb’³š£Ë¼«zžò˜@Æ|½Í$„ìO -ȈT¶w>Í+ÂQx ž¾¹DŽ<ý�p¶Ÿn¯•É3¯¶BéÁ9![Ož€%THýaÿ2ŠþNM>T�É€Z,7`DÔ>]ßìL» Ú:¥ª�çœmy7qò<謜ŸÊ�52YVç9çI/H�2*’Õy̹–<@ -Äêé}žr*¼;O9‹§[I¼P”Ì&à³ä]œ¶ÉA9 ·™&�/<ßJùiT­[X§Qõ¥_œVÕ­9§QuëN›jѦªVàŒªEç©�Ü_+ -F÷Ù”X�zÎdRr¾Ï+ „6þô>펲K †-%ýùÙxÛi?­¼•«ë4óžÝÌC©Á“Táiæ­b™­ÅÀ²ÔÎ;s¶2ï´ô-½yÙ*nVÓqñùÜg¨Œ”òÖmõ´®æœt IûW[I?m«•kë´­žÞ¶R4Žkà´­V±Ì¢‘§í@Þ�¦Õ’i¥çÅAHL)g]6w¢¥Ž±÷/o xï½ñ:.¬Éò«òç•BR�y+’«œ<µ¢^âËëúëe‰r£ oªKˆÒ¯'Éfe/âøä¬Ÿß0þ!C˜”ÅLÐ+žÉ¯" -?æ™~/ fš/é#ûtÙËõ?-+"åôL�ÍD:y`cî‡ëø×ðPº�í‹ ÑJÆ•-¼Æ-G–nÏvKG&tË©Ek°Bz6ЂaËç3(ÛHõyÔ*ÄNcÙÝ*þó¸²vzJp„igØó¼òTçmAûÏ-— œÇ•+s€Þ CŠ÷´Ó¼‘wçieñ´2¯Ø1¼ì˜ØÚ6ÜSä‚u„÷äç¥>^‚$RöI Go¸ÎœíÚÓÛåì,Âî€pZ`‡Y`Ñì< °g7À¼cçþ°Nl ÇUzv‚x:Å¢¬åðÁs+Ås\¦!Ú¶Š¥âVPÒ€22­h9P±Lêbv¸•Éý¨iØkºxÆ3ã0k¾™ÒZ¾œ.»ü•SY]…F]A9!t™ ­ÕÎøBß–Þö—y§ãtA†ñüxÔU…•ã´B Î2˜kFß5ò2dG—ñuï¥q6™Š¦ -ÐXÛ -Žk(Ëñ€)¾·¥á†ÇUò¢��À»`èE ií ÇÑm}ñlùdÃô•¹×ÎiSrÿ[€wÚ8[¤³ES¼»ècbaá䈿9ï„7ë•7†ŽÃÉbmSoŠ.§Þ�[¢·  y1Š8Ø A¨Šð|e Hvþ™V¹—¯ ¡×Ó½ÐÍ=StÓ(�’ÂðRàµvöq+ÝÍO-Æ‚ëÈ+ -áAKÝÍ�®Kªw¾Ýd™¢i±BOÈš[ýNƒ1‡�Å¢’~‘²7ËdÍMFç�,Õ|ie…aIZAP^ᤚE¾•`D5B%fE}jö”=†9óøuÂZ6¤Sœu¦Ô“ZÒ#(% =®K®ÓËÖ@™}ÇéHMÊ0·*²+tˆÕ`É#ê2½ítÅzÔ!ç=¢z -qÏ�?íA2}Ô\ÞoSÕ¼çV õœêëžVÞÁ éžcuÏí0§@õä5–öQq)èSì ˆ¥\eª�–O*p¼èè{¼ÄýÜ–BaAõô5ù¢‹µ"oY,Ó²†[Ÿ7“÷ tÀäÙ‘ºœÏ²0©TµuK¯s¯j†�%0ZhÛèœص¤—78Úc©W=>ðÆ'Ù€ -»tZJÞtn¡Y ÎvÇ�Ò‹ÁSÒd™{¥ÖxËk¾‰eË)!÷y·¥1àQè§Í�”†æ6H�\k‡DIi48¯Rïîj…ÉyÿÞË¡œ&Œ<Ÿ–�ö�Ó`Ia ` šé»Hí8›<åÛ úR_H·b‡ § pª,§‚ ìÀKÛ•®•(>*õ4Ç9øá ?©ˆ,Ç,üîWÞ¯‘"I‚uF7Êï;eÖ®UðǪÓY…I9Y|Á·Ú^áEN2_—á�µ¾ÛP PZq3'Ÿ¡ÍVÒÏjß•k‹ H™©ª³Ü÷©Ê}Q8 Ý/NÚxß< ~xæAh9ðLK££ˆôYñ»™{gÉïRɯ/$�"ÿdÇÆ¶a9�â¾Qè4¯AÇÎV-@zÛǰÄË�ÿr[ÆÑ¨}Øc º£[¸ºôŠG´¬â;í£ÁJ4žÏ™Ò„¿„oM÷XM# ‚=Nš%8Ýu€¨kûðXßÐD¿n½»tDzàÇ -¿nŠé‘"úÍx‰%s¢Ð3Rò׸|÷œ¸Áµ‰åt¼åã Š‚‡SóBäSw³éâw[<œÓùKiÖï½ÒúQÄ“ví©�xËݲÿ0 µF]Þ¤Ûs´·œ`{ä€l …š’sçI«”´‡œ‘mºTjP]ã¬öœÛ– #•+¸Ĺjv­š‚?Vi@aœ}ô²)dh‘`LoéŸaÙj1:'§—í—f¬NÇ$î`¨ýšù™÷l©yœf0q^á�…^I=·s,77í­agAY×QidåÌøÃµ|ôä)im^ø¼Î—W |º†8d}…ŸÖ -'š!ÙÔË*6ºHGÓ qõo\÷NTlKãÀyÓ0¦/7){)ù˜Ãæ)óM2/œ'$�ìyÚVè¿ÚfK0ÂzsJ|£Ä ç4E „õºµÄÿÝòæîTe3âB'jXüy{0…áO7ú¥ÂÎ%\þ µ‘ ¸y ½âoÞ? çrõ³à\Z7,-ªl ÚƒqÛk⮬¬?¯¬,][Y‚SWz¿l“¥Uj@’ÅÏCÅxZ,Ö[Ý΂’fõ©Ý<åÜí[(Ú‚„z.”Š©-4�Ú¸âÔNKóú6¡Ûš©ÙZê‚vZ›§Ô·IÝÕÌͶRÿEeS¬ù>º>Ö]kç&›bO‘ƒ‘ê�ö爑!¯«9ÖëB¬%Ù¹ŒÎ%²~‰øšß…¤aÀ©FŠñuçfx -}£Ð«Ž—ÆRÿvç^x -}£Ð«¾—ÆB»¼úšó…�Û­ß§óÀ<®!W´pzÑ~aŸ+A>åPŒ³ú«úÎ9oÆrVxÀoܹ­r6’é[Ûžk통VsÆ( BcÈÿÞhÆ)ômB×µ]µ­Ô¡¢_ME¿* $¶Ÿ�®è×�³Øòû•Ê-ƒ1|¿W� PóÏ}ÃŒ¶5ÆúbWoÚk®2±W��Bß$tWScÍ¥nwN©o“º¯�ÚJý/6‰œ$(Éï§È7‰\Š‚ë‡XÆfl-ò¿Ü–])A(:%¾Yâ¿�V@O[kv±- Ý0¾“ç~¾Yè¿�áj'ek©ÿÕâ±DŠšÛg'UW1|o€pÐ9›Ž JXn¦ ÛÏ^Ô ¼�¶¯ZEèÉ‘å -ÛÿÅÆ5á^WCFI E¸;ÕP„ÇN5áw[Îá¹?E ¶ãl³)òH0kP’5%II-`ÜpwB�Üž£ñÄÎpã3o`†_Îm¹Ž#¿ó,.p`Á©ÆoXµ´T`¤ÇV ^]CÎ}‡ñSêÛ¤^Í[i,ö_VvïZ9 *ð®]ÖB$J;¸ÒRã‡-‰zéwÐF¹±Å¼ÚTaêbÚĪÎRÔRE�Å> ½Éf‚ÅSÔRfçNÀµÞý§NX¯°’²a¼ò=\ÿœÞ¹œBß&ôZÊFc©ÿÙò>€rY?1U®a›ÍÛUwÖÏ*ú®„TKN‰™¥—QäûšÞÇÊéØ8˽cGGæÉùž–5˜ß·Gà†÷9U *¡’d`¬e¼W�T—ûv�SäE^K1h-ó®§ú®àÜ)ö�b7•à\{±ã2ƪD[Ù¨¬+[!žÏ·?Ì�‡‹G®µ[–£‚Å\•s=±ÞÇÆ‰À�;¤Õ`Œo—‘õsà‘è*û¤q€Ú5LÆKÏK)a¾‚ZSöô)E´ª9ß6fÿ̪sÉìY2+˜U]3RV «¿fÔ2bÕcÙF•mÚ8î¼�Ͷi}mŸ}G­Ü­«¼­é¡=ø‹kgpY©]7šQ!„2­!ŠÊ°“áW¬Ñ4 uÆgnU”•¨œÑ„ô¢•[î¯+˽f•kÊ¡n†®ŒäJ¼$ƒûaÁ^?¸ƒû|ÃdÎ'fû¨%&rjÚ¢3„ —Ü®5ù58 -\øûA˜- ZL(lÃì–Ÿµµå+JD!¸–� ->¨T¢v@‰({ˆ±¥°v@iÍ·�HÓå\3{ÖŒ’µÊC�ª�P¾h¨rBi̶O²j¶¶’ 5n§ë6HŒít<)ØfÅŠ2Ý gcþ‘OyånfúÔlU)ñ3Rr66òÂ~ýòe -eWù˜xhC¶NÝÌ‹¢ŒyCËî�8Ø~ßì´^$‚ä‹VŠX:0Æêô°ô`­0L†ãýð•p‹•pÄ:8Ü ú2<1(Óðƒ-p¥6Рê:n´KÉcÓJE“ícm‰” €E.¥·�VþuEý•ª¯,§¬lÈÍ}¦ oÞ¢>ЦD¥ò+ Ê[¤g\AT0·�ÒÜèá+ˆ -ö œeMû”A.¤”ÕRy�¥lçŠI bÇã~0FÒ¨f}w ñG‹4hp àNT/î/$Zq$�AËm@;Í¢¹ø‘O\¤  ßšî±r™F±v™îNê%Nh±¬X´—`¼0wsœgÓ,¼»u™0Îw2å¥�‚Êê°4¤´Ä[åEt‹ÁõSRsÆnð¦}¸(ðFf# ܶôÃp7õßG‚±ü¤%Œ®âÏõ×ïb>\„@gòºgtOîõŸ×ø=™8id6êy{ÿHVŒJà­ŒìµÌð6¬aÀ H³¾Q`� rÂi«ì0ߤp+¡áê~”Vÿ4He”y:$xo¬oôbn?ž^êÚt›Ž&b>\ñ8ãÆÑ8Q$lÅS¦Ÿo[¸:.,í  {¹jA[ÊF¬–aÄo©‘c€Ž/Ô…«kº?X9\¿¾Ô�ºµ£8ßÚ wú�ê‡ýWÞÝ&‚‘¸á�lY;wA¶x;!ëñ úëw�P}¸h°¾ûNÃp¯æéAýp¤¬m_¼’Ï<ð*.LeMä»ÝØñl®Ô°zìxN°V+¤N.ût‡…þ‚'JÏçDñç»q÷I^ ÔÍÉaæuK^{É�ÆÃ3”3ýWúËwñàCüðþ–ˆ#†çošß|Wd;–Q2¿ë,àŒx¦œ3hœJ.‡OôLSÝU§TÈ*§˜ R™ø+ã þÚ»a$Áwš±)P^w_Ÿ¤À:~¢¿~7<£}ˆ¢¿%¢‰á'ŽdÞwß/)‡ï¿ûþÓå_/tù}àÐOŸ‡‚L?¬‘úßÍ0,"§xdd¢¶vØþÃA´ä}ZYÛ5rÆž½•‘§­²rzž¶ÊóÛ*¨X?Kà´UV±Œ€ˆëàf¦JýhvZ*K¬; •eCefTè­ïlCeÌrÙ¤CiÚ±ËÔ˜3ÃÿÆP‰VËQ4íu_6Ñ °\É2Ô•‚&ËÛhSOÄ$Ê<•ÞJ -åKyÆ[òÜ<:=Úë: ¼š7¸C�ñ@l“EL5‚]ù�Šë4d·.„a}‰·°ôML9ÄôÁ#œ¥(f˜V1ÜHÏÓÎÒãðÚÆ™Mñ´¬y•âxú‡h„ éÚiááêö­kÒk]kÓ”>ÍsZY�ÉÅI¥¹ÃÍD c{}Õ_Ù‘®þbQ%¢}]ôÈ2=<«ÍˆžŽɺä°Þ�&/Лtžˆ‹¯ÆM_dhŸ §jºqM˜d.Á›ÎjÜwÎÒà°3ézû£ˆw–µÅ*Ðè-±Jþ�¤¢I¸Þ2YR‰#™!ýúPR9ŽºSF¸ÜC(Z0V«„zÞïÇàæ4Ø@¬#°‚“¿˜Þs݆é3üÂà(ùJ˜eJ�ÿDç~ù—é×–k¾™©m¥þf[[ $•w§È·Š¼à28�¶ù2ߨܭTÜñü”ùF™œnÖ€V¶½Ð?VìŒRñ¬gÊ�ÖÞ¶ªž]òû}ªÀ®¿¦éŽåÎ�«’;sOØØV÷å�ï½7^á‚3'c ¯bSã²ô �ÛÞ?ù -—°áˆsBI©åp -i’`=û}ô8;¶·7ÐÉЗ#j̶Uf èš §˜KÁ_V¥·�.ºÞª¤wÓËG#%ý¢µï+ª¡�é- HÔèšññ�xcM kWSú³®ï±•9ëØø'é—d±¶ÒÙ!ª}s˜µ-�’Ö¼n‹]7[¡“¬¬qV 8çt#³àëš&Í6í´Zc,… â­kÍ\æ ?áN¸ûkö«*¼#Žó£µíúÓ¥ …ó™VhÕ5Ã4[<Ìl**a´¥Ý·¿Ý³÷O²®q›jÜv\˜8øìïξÞmØäv8s<Â�éÍÆ&ÛIðÚ(ì·9"F¸.ûŠ(ü%|kºÇÛÜ4Š·¹énØ“¦Ç†kúÝ–Ûœ^ÞæÈ ÒœiÔfŸUø¸ÞDºw¨ S/%¼èî@yîÉ™Pþ‡º-Xß$�:ÇusÆÞj@¸šò°ä6#ûY¾ÆY£A¢íC”M°+Tm7/äÿd6ÃW ž€�Kó‚!—"ðZ·ÿVXáª5®jŽÝn¾fà¬ÁÊ ‚©EËΆY'†×U†Ú´NÝ7ãçÔfÏ‚«�7ˆ ÇÝÛ9ËÊ"€8ËÇ,²Y…t°Ér´–Ù/ ênp‰¹Ú ƒglP3—XÞ—ð‡eÿYÆ—� «Hi°‚|·HÏœ‡µÖš«dÒ’t€^Ù'ÊypTÉyˆé}ˆ‰æt%ç¡7ƹ/»à\AÛV�©$<ã²ȸÇ/!W�Œk¾„²7)eUÃ[:ÐdZººé(‘;ÎFë-·Ž±tÈÉZDfVeýÔ´&ââ«f4z�V·ó�qÆÒ»šx§Ñ�\\9¦„6Q™ -¼�ûŒa©¹¿' ¾ÿ2�á…{^%`xán †7Daú‚§$#qIß�‰åæ“)eU22/L³†'ó6‚SÈ8;d'Nò¯ -– ©sÒ—ó£v~ì‹¡9wªá@êû•œªæfUSóJ Á=±Ý¨SS5™�Q5¶¦jš118›*”UÝÍAŠVšfôhà%ÏÍÆJÌë4ÞZÓ{µ‰W3n•GðŠaÛv�Oýˆ‘µ»—v,ÜRN‚öýÏT/©œ˜ظ`R ±\0©¬ç Ù&“Åô�O r¡Û JË*·ÍÃuªŒfÀ!_Ë0/ 3›¬&Ï@}f“Ó^ómÿ™&6 ÷†Ä¦adAzá´ï󚆛¡Ô$ýôP?~lúÑp«ßYÃcâ�u¸)¦'ò¿·8� -6¼E[KÓèÅÁ†ƒt×5ÇbÝlJjÉ3n�/­¦S>‹…¥0í! �‚qgååÃÂHªêQ•sw*KÃöÁÀ‡mUŽ$Á"yÝûù¦Ñ�uŽ#±ä@ 5¸,Ÿ�XéÁ¹ÞEôô´"iNù ˆ•^�PF¹Ï‚XËm”SŸ±šseÿë‰‰Õ -œ7Â¥ºíDl7hAë1šë>´¢¸îCê1zë.´¤¶îCë1Zë>´£´ZÒ~Æ€ð‹Úøô&ÏûãläÓ³ŸžM|z¶èÓ³sŸž�ûôt{Ÿž•Ü¥=?K6M4R~dfr§D¼à¬O;—^Lå#:�*QÊX Á¥×އ}P³BVÁªõ¨ãµ2Ö´sG…|ÎRƒËåjÚ²krøísü+mÏNÊfJB™ØDSz-»†.üeÊÌ÷ºÔŒ0Jr3Âݰ¢§Ç†õ>ýnK%QuQäÁ�FØcµ„«i‰˜ÌǨ _Sí¸òc—IÞ‹r®Ï9,A�h°Jºç6c�ŒºÖ‚•ÏcZ9),ãxHoX•Xx`3§$¥ÿW£ƒn§F'F%à wjô kf/}/íÃ:V;ˆÊÇh¥ªÙ׌‡kÔ¹©ªóGóÍVµyc¾eÉ6·+sr€B¥Éÿëã ¡?+«¿M™»ª2ŸsðÐÆ|YˆåýN=®ƒÿ5�§¿U�ûŠW4¸ªÇ¥¨éñˆÊ‡è#‰5=ÞŒ‡+ô¸”5=þp¾©š¿3ßn×ãÊ�ËÔä�mrI55^`à¡j|NË»ÇvÖr¯aÎ$©÷rŸ -ýF….+9–JJ�V<ƒF75�“ùÕdk*½×ètWÓé�眯)õöœ;µºäd´”À;ku%jZ½ÄÁ#Õzšú:$AíUè´x*ôM -]Uês¸+šÐÎ?\Ÿ+YÓç•QJJÕÔy3®ÐæŠjÚüá|Ó5eÞ˜oŸöjrdnêÏ£8uT(at«*75U^àß�šümš¢2SGì˜Hh¯µŽjœ£§n¿U·×⢢kˆðø°¨ª†E#*££ªQÑf<\¡Û©}4ߨmÍ·¬ŽìvíŽ2SžwVîT�ˆx¬÷%ÔZdúÜf {b§~�lÃî˜?ëì8ª„I¥'0Êllj;LÃS-Nš�ùUU ”6äâ¸ÔÔN]%$ˆLÜ9àG5C´ÈÁC••J�Ï�ûT’ô¼2 ëÖ6'UlNé¸ù�ÆÇk¤šÍSù…T³9Ûñð:܇Ò5›óá|Ó5›³9ßÔN=ÎzÇ)£©È ]Ö#E^àà±z<8 øß_ìTãNñiñˆÊÇh£ªYÙŒ‡k´x-ÿîñ|«åß5æÛw;U¸S`¤Æm™Ô†{[pI[wP £[Ux-ù®Ä¾–*¼ãéA>®MÔ¨vÎûy«óJž4ì¼�Û‘ÏÓ祶½“>�É|ˆb*u˜�z;.@íÂjyxOÀ·Z"^s¾å­ySÒ¨¦Í�¥µh‡£¾­gâtëRä.;5«Ñ ãßœšuƒf-µ šU[°Õã ”K-4'Í“ù QˇkÈÅBç”®Z2ܰ­– w_¶Ýn*s!yi=,®Ô¬q2•Kü;ÔVÎÚ놦K{s&Cø3n›B/µÅ -�h'Äãz©Åä¤Ðc2¢™J]'…ÞŽ‹×z©ßá¤Ð϶ZB\k¶e�Îo×èÜAËã¶’VŒ' nÕçÕ0d‰}ÇŽz|¨\Q:Âqü˜åM¥ëÉ€kW›ø³Nž(5[ š^yPÆÙÇ™—º,Nš>&ó1*««lÇÅŽ®_,ÓUjö7©*åÁJ”í:Ûæé°Yÿ½Ðï�æUÊnS Þ�QÖ}à®�ØÏÜ5û€»Z?pבØÏÜ5û9€»b?pWEœã/­þ À]#ZŸÜ5¢õÙÁ]#RŸÜu¢õùÁ]#ZŸÜ5¢õéÁ]•“±u‚»n=�ZBwÙÌÊ2kŸݵÐlY¡%ÝTúPt×Bs_®âVÖø–<[+.Ó5wµ)R£–oïºò–Á¹¦ 5$vËQlÒ'¬ë.õ kêáip] Í�#ýðptÒB/àHA´G'UÒæ¾-ÅíIÐ30nîÚRŠý®^©û3nµ5騰®1z+"°Ã ª-¬ë”�Úã©Ä3?�ÍN=‚½îÑó…Á±ž´×B‹àXÍ?µ´Ð"8Öò­Ñ^+J¾Ð"8Rò�f›®êø§{�Tü°×CB®…f¶±‚¿/ÔkèàÐgŸÏªØÇtÊ=í$'�ÃîÒù¶¦óŸ¶Ðs8Òù�F8-4ô�t~s„Óe�O…¾³“Î0Û¨ÐÍ4Òù�Ùö~§Æ8,,:¬F*¿-,ìßÄ�òÁ§óºS�Ÿx°;ô8úsEzüYa©Ð¡+Rä�†5¥B‹®H“7‡5Íà’RÒLE•?žq¶¦Ë›3n·¿ö ºREê¼5ì¬[Cæ¾ ÷½*þDˆÝ£â}MÅ? D,z„EþÁP§Th)øÖ±5ý^è¼5é÷‡³MÕÔ{c¶½îÕí{bpÎP¡?U¤ÚÛâÃ~›d½ÛrT6÷ÃïD��þ‰»C߇EúþI`c©ÐD,Ò÷†?¥B±Hß7‡�].y§Bs®Iß?œmÕ�kk¶mCbŒ4þÔØƒœ3…VV‘Êo�;1æP;µysŒØŸµ:/ô›ÔùÓ€ÄR¡™Ø¤ÏK…nb“Bo[Óè…>]A£?ãjÖæŒû´S£ïÀÖU�”gâY!„Ñ­½am�­›uy˜ªVÓHêø©}zþÞݧçkÕgAÞ¥B±HÍ?A– -íÅ"-ßA¶¢ä m»&%ÿh¶zHE:¾9`±Ý§äwïä…/4¸Š´|[àÝ¿L•zHžÉœ6rg’ä È»G»zŒEÚýIy©Ðo,ÒîF–¥B¿±H»·Fä­j÷J�õñl«ÅXÛ³�vj÷=˜¼Gi÷ZŒµ=&oîuo¥àOŒÞ]¾f}�^*´‹Tü£Áf©Ðw,Òñ�›¥BG¯IÉ?žqµPk{Æí­vbåC¨Ü¡×©Ðç*Ró%¶Á^ϲà�Éw?q‚wi÷B“±H»? P0:yEÚýш·Th.i÷ƈ·W´{%®úŒ«VÛ3Né�Ú}Zð!¹4…ÎW‘noŒüõ‚~lÎ9OŠcËZ› ÿœÁM¨Ð�,ÒøÏ‚$L…–_‘Æ4$.QE¿1$îßîÔZ{qJ)ôÈŠôVsLÜ€¨"3üÛ­¸·8àÞ*B:»)¹­�Jù¡YÞ8BK_‡« À{˜Wº9�š§ ²L–¢nÕð¥pRié)¢Pƒ±¬q> Wv$¬¿Xv?º›9¶¿PRØ$•¿#‡mzrXH“èM*kqñ59Û£2\ûazM N',™!ò¤±d™}š’Ê/•¼Æ¿³ðM!²Í0eœ©L5ÁVœ§ÔAwƒö£¬¢‘]rî6zÐŒ”(Qƒ1b€n²K;0ƈÞ~âj9+ Ó¡Äx:”�·º3Ù8HŽdãÍiŸ8mÏã¶Ü� àÏR€ïXZ’ø‘›óT™>œÑ?•Ê\RzË­H:Jém·Kÿº²K—:‘c•lÉÎŽ®Ë2]¥Žbš·8Öƒ»éºB6ª©€ö¬c°±  º¿~]‘}©ñ˜•¼1Xsw (é5”¯°·Ð… ÞöZs7l\„@gŸîºgtOîõŸ×¨#@�42õ�ÜàL‘ -К[9üÓðn#çR®JðÞX9ÞèÙ:±¨�/y�éãcÓÑḊëŒå6ŽFvK0(ø@3¾—ÚU˜žW$ìcªm)Iv0†¿¤Fg/Ðñ…ºhpºûƒ•Ãõ»áKý¨›€Ê9ŽÂ÷wú�ê‡ýWÞÝ&�‘¸á�¬œ» §Øv2æ ò@ _¿ „òˆ}rÖwßéopÝKê‡#eýhû -ànà -0ÞÇ`®¼œ}·™8ž Õ69;zv¬ -©“ËþìÞ.x=þ oÙ·Dñç»q÷I^ -ÔMÉaâ]//Ù#žA œé¿Ò_¾‹â‡÷·Dô1<Ëô–’ëÚ{–qÁÍJ¥ÁƃqË”s�SÉåð‰žgª»êT -Yåÿ¾©Lü•ñíÝ0bg3¿?R ¼î¾>=H�u4üDýnxF?úÿDKDÃOÉ»ï¾_âÝ÷ßýÿéò¯ºü>pè§ÏƒCA¦ÖHý‹ï‹æIÁ9# XÇl,˜' ίï“sXŠh?w„t׿I"Æ9Lƒ*6¨M ‡ÖÏ÷Ù¹øcñ¨˜$§ÀAù€™½XÅ–µòíïþôúã7ÿôúR ÏÖ:%áÜYçü»!FQ;³YµüJÓŽn5(©z,»ï4;ã�ô×Ì¥ž«Êq_�eŠ�~*œÖjgÓB»®0i¼oE8Ú5WÀ¤½ÂßÇ`}M›º|ñÑÃ+äþ·ºÉÝ<6SÒ‰©œÝ�­z¬8©ÇDñnôÛºŽ_m\wýo…¼ ° ¥q ˆÎ‹¿!íF‚•öfNж�.¨ã„"iº²^vj±ºN[e‡ñqç�ë‚Ab¼º#égÁÚµÅÇ-Ñ÷–?3 ž2“@ žã"Èug*Áužá]P0F€pq„¥Î´3› Æ¾3Ÿ`1Ÿ Ô.UPÊßÝÄ«e„ÜÓYbü•ô€³Dàèùá7kVpÁùd hïåLûδ­¼K=Q-�”ÂÞY€Q=L�^»|Rr–ñ…E+rX9g$eÆé Q{±‚{JYÀov­lªR-WèÛɧ8ë„£fïˆúÅ"QºÐ²“Kø´v†š3ëï*t•‚Z\à•k==‡‰é¦£íWõÀP8 gEÎR¿¸oæp)"�2 àÈð”Ðå÷7‚=í&s-Þbñ–·¿,ÇÎÃ;Ϊãw¶ó¨}tòü¤K,u©3H-ë/Ë3EËSüh=÷94­`¸J¹1åèMã -6vhêBÿÎàÐ4-ÛvMšv¿€Ö¸.‡þCõ³UG¦.ô “…ÍH{ûœy%Új+‰¢ íKCbI‘{ +õB3Y‰gëBKÓ)½¤Dò}‚•ºÐ(4d—ì%k…?=ðÎæy}5^úJrI+^Tè(�ä9¯ÌS¬£B{MidG`ë…” ‡°Eì…n›ÒXÁT

‘ñ¨ˆËw¬×;0º.µ $Ëv�/«ú⢧„ÀQ­auYI¶ƒÄX+wÏæ$cîu�·u.lèERÞ�ôÉ}­�H…ž$,›ÐÅ:ͬháCºdê>ϰ«Ïf¸µ‰IÑ[ˆ¢ \Éræ(Õ½/üïÂÿ -Ÿ\lHÃÿþ}’FšîÕL÷BãQâµk´”»yTWßß®!oný’µ ‰\{ &Ò�˜¶Ò˜››º+“§ýö˜˜èÍÖ²Fuî�6|©™¦w ;òŒê€õsu L韄$ÃszS~�;M Ý6Iqçãï&캂½}}Zpi0Rùvœ¬j»•ë‰ÈsJ¨~†õTèÂIA -¥eóµ½Q[ú#Çq¸ˆÄSwu)IzîN¼¿ŒâÁ7�ÌAD>mñÓ¤Œš›PšKZÚ2Ÿ¬×ˆÓ•�GH4)’ûQÄmôçU›aœFlÒœ²mQò‰|¾µæéðÿ§ó ÑœÀÖœBÑ連,XÃ)Ä ¢äËG˜àÉ;¥­$áé.-5A ¦–$Ð>õ±®«ìèøjS}—ó9}W3¶ -¯Ð"�³ÉBP ý˾ž(\ï58{ÐÝØó@:Œ’bØbVI{gÀQ ‰t¡Á(ÛˆF‘P •�èG¤ ýEI'}K†d¤ -eãÕ 2l\?œo³Ôh ß™[­ù&¨BÙÜ$‹ ·Ÿ°u= Ö²ëBI²ˆs™÷óïÊ�”vÖWyW�k;Røæ-^Ã/ò¦ÄŠÈ`¡…¥ÖH¶‚Zïs¥š†+‚µÃ ¼¥f’;ðW¦î°ý“ÁQ]Ë}ß\z&»s «Ðä“È2ÖŒ)ʪI+Ô ™p… Ä=d”²ªÙ4[ái+ôÕ$K`�²r7]kÒ -3ïwž W›*èB»G-½ÙùÖËø˜\-Ó±}ÇBÓ|¨$îÔÚ�^ÃèÆ…VèJ©…2ÊÞa¡Q0ÖÉþuÄa¬ÐÖ²Û¤¼k®óWY¥¶‘aS”fOx«M4”‹Ì<†R¿¼A�gt,9¢ô’ºx{ÒÚ)œkbˆö»gØ@òþäµ[Û]ÖMmžm4À83'°u4 Ðü2DŒe�šÄVÝ€“¹ž˜OSÔN™[Îʾ;ýƒ‚…Æœ!(`Œ2Â?ð88ªâŠ:)t𜂥Wh,^JÆ_WeýÕ¹†�õÞš}³ë gC¡“'Yî4Êþ«'˜^µiUð©z J†5j4­Vx -m6É[ w]­Š Ý&5›Ò»ÖktßrÒhÀ ¿SWs“Ž‘î¸GEݺš - ˆÈ <Ýa5ábé]Ñ©ðqu†z¡¥6´ÒÜy¥Ý¼ƒsý(¥"î=)|eלb -½ƒ—¾VuF¡i&‘-¹n±øfwÒÀ…vYDÆ¢Tû [¡‚#cá?厼CKÑUV’oÇÏÿvËÉЖ"¬œócX—Hlr4|»h›Åb;mò ØL{ÖãÙ}­O{…6[Ói�K–�O¥ßö´÷iû9E=~ŸÎ L´©çdV@3ºÃú…óæ§àâ›Â׿¬­¢J⥑ŒBÚªNáßE\\h¦|I¹3*·.ÊísÇxUŸ\³Ztèin7+®*jÌÏ¿Œ´JÈ�Æ�Rô;þßwݧk/Sp�:ÂòY¯©XCð»vv�‰øýËÞ{oü혡ð§Â,-ÆO‰ã¥*lW™ö�™,š ¿möôÁÈ®®îݾl Y/Ýþ·;Düã�p*N¦A†�–õàLœÊ©ÒHÏo‰†.xd¿švé[§N¡Ö4u„!}»¨k;VÈ—7'Ã+­Ïm©p9ÿFª€ß¯TÃ+À,u¡¹y q¼—ËëÖgp,$eUA­ -]¾4Êy‡I’æd]UÁ+Ä]¨T©½¼Z^!Ú{°žmut0ÉüÌ=©¯Ÿ�Ý\"nP 4yb8ÛΜw|t鬿ž^4ÐÖzK=ª||£ƒqçiN¢îþ]²¡K­Ä¼Hs4Í®U…‹’ú.K&Y,ž-SJÊð¯(£¨Œ³<ýwœêY˜6÷Däéüïoß³»íﯦÐaظGH­Ï¨.u›äÂ>A�ä2×wiÏ×´õètÚŸK³^ÃSrïÍÍ+Å2¬Ø°R8„áȇþ ñ�VŠ©HÄxÐdÚ®”×Ùú˜xÜßüý0ÁF +ïÂ×Ýÿ‡­g�èA§ðt“Àó¾?ùö9ó À îlÇ©þ"Nõ_ë"á”�Êõ3a¡d3¡s’Œ×[Ü$#©J�ÔÆ¤ -Íÿý!ñ¹Iåªm¹ºèpR=W‹ŒÞõip;±œz¬Ø�pÀlåø7ܹ|/âèDäþyz"÷ÏÐöD07çD^Ÿ•éÖU®äì—¹¶ ½N┲ó’k{G£@Э¥œ7ªÿ”ôBù�¥AþÚ‚!k[aqn¨÷à£T87ä�«Ž[×JÍÇgÉò)|C-婯ð” XÓ.Û0äŒÇ\|-[?Mo¢)•×*t�f9C—™¼?ï‘Ó<�_ÏNà© ]ðcSíͰ"0eÀKÎ]j{œÎ'ÞËqC‘Ô:xÚµ¹’€­~MÐrpMo6<ûÎøè€S)nããt=ÜHøÙópݪ L¦gÎŽ‡OÕñ�áå”`hkMÞ`”ht6<\d™Ö³Ö 0&©³8ûnæÞÙîp©Ý¡.´éÖŠ«}î`ÌŠ ©IYԷÉ5ç¤áÔÍœÓJ2‹œi.õùBZ¨k -­Ÿµ–`.�|ŸRrSèò¬5�ÓìãÜMØU;`*™úªÆ�›×–"ÐŒæû ¥å+"”–KoåƒWÖ¹fšÇþ³X¯Y“QëŽÂœú2"àˆÙUYL¥nêAè‡àÛˆ¢4áëþ’›§9�§GMóRƒõÀ\ÁÀAbÏIhí<Ÿ¥ñÇ“©ûß?†9V˜[³ æ\¹¯6mÖÄÜfóþ¿:ó_¥²v¬n¥æñ£PøѤ€À -å§×©QX&P޽–s�ž¨�ø¢ñùÙ®ö–Ÿ5we3Üâb÷kÞ–dX Ž­ì…:CŽÉ�âk"(¥ÞèžἺ‹äÃÛöEÖcüU¨ÁþûiwÚÜq¾ÆS™ý¶¯aowvi§yÛ�îeþK�îB€5xAÂí'ü,BShLÎ{¼'ƒe -›@ÎϬ.jiñ„Õ8áóÇoùÿÙ„kõ +xœí}[×ä6rØ»~E¯fw¥o­© +…›³Y_d'±³ë\¤½Œ ¢©þàˆ¥þÁS,?;‚,S p9ªˆë€º\:Â/E[ SXSd\a¸?¬•Hžù1~ò°µslŒßÍïçï™îGŠÿ‰¾G܉°‘Jäg8{;5ü¢R鉾•�ZO`²í<1'eÖ]awm#^/-‚—JùŽÙO+)ÁÒÈ;ùjŸ·>œÁ§™]2O ¨ãô|)*�žbaÆ’¨»²#\ýÅGÇ4Ê€tÖIu±N3&¶sò*ÿKO©ŽxYʳƓ2R—ÞIÖ�5ýKý(.?þËÍ”€Œ~ïËûp-HÆTGãõ‰o Aj{4˜$Á8r¦'ŒhµTc-‡¨�U0Vbh¸¾L-�”B‰l¼$ÞK?°€°:hó#P÷ïþ¬RÀï$°ïAd0±XkATXl Ñv<ö"Ð$8a.?ñcÀ §­²ñÕðwqy{Q`$vÀ÷WNö$1\Ý è$P¬ï÷‹×ÝŠ!ó³•iÎþnºê¿=®©Ñ’Œ®âÏõ×ocÞ_$!�U,&ºgtOîõŸÛ/¨@ÌVý#oÇ£’ Q¹ŽܲûàŸ†w1—bÁ{cq¼Ñ£uBQ¿_ò:ÒÇǦ« ˜÷×5îÛ¸Ñ�`¤�ؽl@|¿k»¨Aieh'V-hKÙ +Áj +~K-�½°ŠÂê¢Áéî‡ë·Ã—úUG�Ê9‰n¸Óÿ@xT¿ì¿òö¶-�Èv·s „šd·Éz|ƒþúm”W¬¨Yß}§¿aÀu/9<¨_Ž�õ«­G=�PÝfðšÌZ7‡‹ÿ³V+P'—ý˜|Œñ=óGDñç»u÷I> +Ô‘ä@¸DçÔ½‹žA œé¿Ò_¾�ïã‡÷·Dô1<y+Bèži0Z­F™gÜ€3圑ƩärøD�4Õ]u<…¬rŠ@@e⯌7øko‡ Œ€~¥@yÝ}}z�ëhø‰þúíðŒ~õ>þ‰þ–ˆ$†Ÿ8yß~·Ä¾ûöøO—½ÐåC?} +{ú~Í®ñ]ÁSsýJMª«-Eä› ÙÏGŠ% ’ڹ)3O^˜-¾(,8„j>©Ä~ ®£ÁŽ{yÍJ�÷Æë²µŸù*Æ_]Oºñ¹ó_fˆ¥ýC"ó8¤þ²ÔþL󇲓JØe�"ÕöÏ 5Û=�ºÐ¤�v ×áõä‚IP¸Íت�ö HˆuªÁ©¹V4×›0yª®ké“Ó“y*®Oª¸j®÷0œzë:ÕK;Ðk‰ûÔZ—Qw*­±ÒºÖ;i?‚Ɇ˜ JpZYÁ€¼�Vœ”Ø�?-6¸0+@šî?fý‰^÷¿CèAòÍ>Œž,ÂÇ—b0z�c¸.V+è¬ÞƒV ^â¶8ô¢®kf[ èŒ_øPmw¥u€fÔhßå*njŸ„?/DNo°‰0~â§Üv(ÙC<öcOVÅçÎ"ýË;dk¤N +¬¶^5Û¢e9*˦—\ØPU ‡P~Šœ#­ 9ä4^v/· rˆ �„N(BÃB`²„L¿ž ”ƒ/[!?­®uçJi°$ýiw}vqâI’rZ^×Ì HÆö lÆÞi~í3¿H‚×Öëg·À +prnYsóËUÌ/E ÉØvÖWMY¡ÛûŠõU€÷HÍ>3fÞ->Ýf¬�©¥‘‘´øb éClÈ%Á‹Ìä(çÅŽ_´¥èÇ’y7Ù‘¯åÁ +iË•ý’¢FõØU øF;¶`ÜN µÃ¿Y*oØ·u–ܸÅðß~C]éb€p²øB"qÈM"d6'™Ôa{‹1ÃÊ~ÊÚ~JÄ;ÕêŽ[6£ô¢¯ Ïá¾S ä?îFŠl�Ç ËÏ_øVá3ÆhÒ\àÙ¬”(Ò°Ò!Ÿ- ƨÓ~ßfHC ”¸‘O`¿o…ü´ßW,iXÞ‹ÕÓ~og¿KÓí=ë°(�ȹ3tzgŠË,{®!ú>Í÷�¸;�÷¥„?9/½’Æ‚'äCÛZ�\Ò¾Ó:É+´ájâ¢@V± lšû6hŽÊ^%°Ó²“Úx&hj$“ù¤¶ç `ËêuõƳFbE+_@°½ã ˜Ì�Mª»åƒIÈÈwଉÏêTÝ×#’À[s3"Ox-y��­S~*Ø*@=£�<ÕßësÚ SšÛgêà^Ü�úï¢þ[È"sÀ*‰l®¼,æ~mR[¼Bé$�zËN½…åªâ¬ƒõ–Ç»·B~j\kOÖ©r=»Êå”ÏÀ©r­Ã˜—Œ¨‚Êuº·"ïÔ¹u®y^¸·`¨Çâ}t®,�bk”W8ðÞ»/Щ§Loªƒy¿9Or’R€@+ìüËLä<ÏI*NK�Ÿ™� Á8ÝyeŸ™Xk`Þ%ç©R’„Óò.dº!e1ý@+¦¾ûñÔYTžä4¾ZÞo³öjX‹/Xè°Y|äZnÐø/6m*‘†±l%Ø’å†éëñ"T•x‘e[EÅ�uFH–r5&/Ö"DXëJÑâ+¢u iJ¼¼–œ.„ãÏþò¹î)—+/vÂ]Ýÿ#&®žr~½ëØ@½! ¶²EÕ ž‘À&~3šZΜíÉëËò³<Ѥà1Wï"„~Jþ²ØŠ$ÛJ¾5®}•âxº5îÃ/—󂯒_eÇLmÇ4÷û–í÷·u½ùÕ&\.$ÜÎXÏx>öò­›Ú#3Àâ1¯³ŠŠl樂Wö¬VkXï‘R¶eàʤW<®ÒUqW^%ok·éu@ËЧ-¢Õr×õT^*}-ÈZJr”Åb'à©wöøÃY �dµÖãïŒJNh2®WÿîÔm8°ô©qõ®Ä-‹]¹½Wªâ~‹Äfãûp-ônÂñjOG_Á.…!kç8ÁzÑ»/Âõ05i�ÖáÓ!R[pÆtvÔî½–]²3c_Üqu,˜û7| ΃6}‚uÿ®7Déd  ‡YâÛÓ÷¾ ê3|¹Ü7àÆý?£€+é“Á&ªÎ|ξ|Œ8c€7¾3Ê”H¼…gp3öÎ(àRç‘¥U”´ÉXìÕ4±-l€J¼:+ê×/ßÿ¯›-'å@X+Íç¥Tm„úTªrDv3J˜ôO�ê@�*"ÏS§zr�JyðÆKÓ˸S©ZÃ4h+¦‘éTg.ûFÜ�Õâð†B‹¼k•êЀtŠ‚ÞáZI΀B!9#÷sÒÆ¶‚}ªc3Lzð +9çTÇŽSÇbú<õ±'×ÇœãVÃ8Õ±us’Œ�.®ƒ�wêc‹úØ<)Ó+ÐÔa±µ:vXù}ÝË�DP"Í yVõlЧrV @Þ´û§r¶Ž:…r« ãOåì¡H‰ Ü©œÝB“¬‹E㩜mEÞ©œ-*gX ? +ÑUñÚ°¥êlk=PŒ3L"[§Ò¶y§Ö¶¨µÑ²ûN{Ÿ³zàsÒ¨¶}jT‹N°S¡jà;ªÏÉ vjT7{ræ +ÕY;° u§:µ¨NÍû‘'¤4êõ)r`õçå¡Úô©OÍܳ¨IKuëî?<ºòS\y®NUðÙUA-@+˜à© ®B™©ÌÈ5NßÚ1È;•ÁEeÐT"¢%e°AéØ'×N�³6ŠY7ѼðÔ¬*@MÚ¶ÞŽ*mÝHÙøÏ…¶ÝkÛ k£5óèÏHÅÝõ©ãÎÙ1«›·ÿÔ×’ç©*>»ª(µMÖžºâ-8³ ÉÛSU<w§¦¸¨)ΚK#ÁYßÚÆšb^âšõ…¥®Aa\nm®\M嵤Gl;¢b>¶agîžÕ|Ü“ÔÅSÛ’w "Ol-uJ�ÖìEê©~Ý# Îj°ÖF{u*_×ò¸¬ZMÞ§òUÁÝ©}-j_•ºÚX°Ê¤C›ž& î&‰ú,Ip§>uLÜ©N5H‚;Õ©Ï(îÔ§nÍã:Õ©ƒPwjS±6µ6†¹‚4H²æ)''×Á¼ß˜oš÷!6�A+륟òMóN}Ž9œ@©Ë 7I¿8…vš‚�7>äŸÌ뀳'·iË,‰ ÅÑ�ÎÇGǬ·A}ªøóø ‚Uâæí?uüµäy*ùO®äK-AHA§’ÊŒÄ�k¤Zþ²ÞмSÏ_òšM!ÝQÕÛÝ–ùzL›j�m´6 È7zÏ<�2I« óÛ1üžge&]m¾Ú¦’ +{ËC‘îíÓØnWà¼>J½¥=7¯µ—ÂõàÎ éHs úSò¡Bóó:6‰œØšæC—¦BbñûOô·`ìUðPMá&v^ÝŸ¦WN�õ×;ZH�¶£$ÀÓ<Û–Ñr&Oûl%}*Ö`r¬NóìISZH�2*Ú«Ó:»––A +Äjò>�³ +îNãlÑ8³•”¥AaF€Ï’Ñrê&e‡Ü¦š<¾¤+ä§Rµî`�JÕg”ØrjU·fgœJÕA¨;uªE�ªZÛTPª”ó§nDê9䘟û „6þô>íN@ †5%ýùéxÛa?µ¼•§ëTóž]Í“¨Á“Xá©æ­B™­Å€²TÏ;S¶"ïÔô5½yA˜T<¨Ãâó¹Ï¤"0ˆx«X=µ«9& "´Ÿ¡rµôS·Zy¶NÝêéu+e@Ëñ œºÕ*”Y�ÒàéC;w§jµ¤ZéyM“$†”“E›;ÑRÇØ»—×¼÷Þx×eùU øó'ÔcÞ +rq–§VУ|y-źɅY¢Üè› +�ÆÊ§ôëI²YÙ‹8>9›”8¬Èzwb1�õŠgòUáÇ<Óïe@Á¬5éKúÈ>Ë÷r=ÅOceK9=SÈf[:y`cì‡ëø×�·t!IYJ‹Ü±·ð·˜,�ÌvK& ºÅjѬ@ÏŠ‚´`Xóù ªÜ6B}šZ…؉â.�·nÿi®¬%OG2�¹{Ú+Oe¯h Úw�2¥âÊ™Ó\¹‚1Ò›c’b™vz‚7âî´V­•yÅŽAðØ!±µn¸§ÈEÖ{ç'ï8/õñH¤ì“*ŽÞpy<ëµ§¶ËÙ-x ;áÔÀÓÀ"ê<°gWÀ¼cçþpNl Æ< Ò€±T;ÝÅÛPwê_‹ú×¼üV +^wX¼“6øHçÞâkîÍw·¥cnqÒ¢È`•I‚èBªÅvÙýI^OÍòÃä§|æTŒ¾O¥iU¿ÊTáî ¿HP0yQÛ>ü&SžUÖì+D5â8WÌ76ùBÄš‚¾h¡À" ÂS�Ý”QG œfVp&OEv-�’wàEÚ:5Ù§Òd%"(£­hOä:UÙE”ñì²e¸š¾O]¶‚»S™]Tf]¹ Â[–\Íu­4\þg“ùaRž^buLÚy-P¯‚Þ¬8mkXÔPçÁzuªG››u ýjnB䤴n…üÔëVž+omÊrNµî©Ô:´C§>º“_§VWǘ»Å0ÊÐÆQ�3D¼y§Z·¨Ö¦GqÿnnµCN‚Vi\­�Nw{E·¼)/6T€KLÛ“fž¶TY=•6oj8/X_ŸÀe¥O䨊ÒUwá»wøf¦GCï7Ë>T#*BÖòæ6›yz€÷²°•RŒ«Ä«ŒW«ßü1CdG³s£¹ÄF»ÑJ€—ÖzÛ!5ZíÙpE ”H#+ºM÷�ؾ#vwÑÕ3hýÅÒ~«b‹?ê A–rhŽœ$Ó¡àï²ãoG’ÉÉX¢!Òˆ]ýÛA­KxŸ9B8 +�áÓÓz¤‡ñMÆ¿�k™ ‹ü*{¤+{$˜Ô‡tè�Xêßó’¡,Û€\j‡—T;¦�à {ߌGìäF°�/�€÷„Ü€ ¹8z{7n`E…h ^gÐ<7h'´±\> vîhñ´A�å×+"Ó*eôÃBÄ8nEarÜ�Œ?oÌþ4…á£$ÀkíìS2¨:˜åOnn" ®ƒ¶H:bPnnã¹®‚Áùv$>….c陀57±œc‹µq…~²×Ë`Íõsç�¬4ª9CȪð’ŽÀrƒ[ K3P‚Û×�B(1« T³§¼è1¦œ' $è eÍ �â?¥žTõB/A)4ô”“”¯ÀùÐIÊN/«^å]?޵Ajv„#Q±¢\aаK^J]†·‹[ß™Êy/¥zr*½çc©tn hÈàRs2}“Ú´«Ètn)XÏYìîiÉÔIðݳóÒ:˜�%Ò¹…á¨ÚÆ4:oqº”Cì -„¹ì[�OJ¦Rhð¢ƒï©éô +œ%T?7¤° zpSêb¨¦B¦X,÷´F`C2�5/1y–µ.ç…‡ln*UÎ].•W5]Ò-´môâI ÒËk9šit.ö@Å®¥Ð]zÉ}‘¼éÜø°ÎvvéE�`’4Y0g»hyËk¾Ž÷–=Û÷EÉÐðRè§Í³FCs$Z¯µ™BÂ5 Ϋ4J´šÏsý�÷8”å…•g¯�Ó~àžãâh8™§EŸÓo;°ýÏÅàyP^ôÕ|Éuøð"3/p4ÃtAí¸b&ÝÓx¹¾8@·BéÎ‡à„¨õ‚ çÀ£íÊsK•^Ÿ÷rýjÁ¿6±¯,�6üîWÞ¯Ò + Á:£Õ0½™ªÖ +ŸcYý¬Š®\³à®_­Zñ6‡ŒW ‚K�Ï~Û:ÝHÒŠ›1ù 3º¶‚~v4Xy¶ÈbƪΖOÕÒ@ +¤ûC À¡�åæÙÔ`g„Æg�޲nή›±w¶5Xjkà ‰õ’²Cc[�0K³ˆ’D6vÚÔ|{ݵô¶OxùQ^~ü—Û²*GîÃÞ Õ™•áêÒ3$0Ò2‹ï¸�‹Òx¶�Ñ„¿„oM÷˜M+ ¢s�ñNwH©sûðXßÐD¿n½½t&cp †_ 7ÅôHýf|Äš(ÌÅEþ÷ºØM7x‹e9åxÙ¼‘¢à4Ö|Ù#ÐŒœCØ|‹Óx²¿”fþÞ3­EL´k= +Ä"[tÇþý´ðLô£ßxZìh)…’µ££á”$'Kt>£ñz”ÒIPR¸ÃÊc¢ío´Ú,iÐä¼~R¬ZåÐ�>‚N¹v‹Í¢ÞB›V‡QjíNR]õp´@­‹°G¯¼û v+nS–/+~ctÀ�}»J†´xýc,©DTŠP“Yó’¥@¾ÜâA)ÛNK[¸ÌZʇ‘µWP•=�ž�!q£âíÁºW¡ÚnHÏåãô»QöiŽíBWWÖÀgìç¡òr›¤ßÖÐU©AáÁkö!‚åä9RžßƒCÅauÁÖá\A¯1P�^§›{è iØZ€Q\$Òš^³¢–Ñ .7¯¬r!;ÛiææR=Ž�SUMÞÍ’oO´íš™™–çs‹½UǺJ³flÝ®A[Uƒ•ô"u°^Þ‘�)Í¢’ôÞ%dÈ)‰†)wCÕPr”päYcÛ‹€ë|yì·VÉæ–ª §!'ü �¹ºú¨4$ åaé'G/QÖô€ #5dUýqÈÙ2žSïë�[›¬ž;ßËÓ Òƒ3�(„® %ÿ|M’+¬¤.p%8g´î~ÑÜìß)wõ™µ´Y +yijIrY¶Š‡¨¹n'…á¥8mWyHè®W±ÐOX°ÉSë­]©"«‚Ÿ�‹Ê4±;«9oŒ°¨‚ó YO°Ìgž¡sUD*ÎZ÷ì×mŽP7G¨«A[ÈQå‡$Ÿ¡eA PH„MÚé—]®TJˆ$�JKó$¸£’«Á�´–] ͉qÔ(þœÿw©ÁYð%FxåÚ£rM¡²¤‚¼a'‡–K ^ª\ƒ®ÒÄ©“9Ú[Îg>ºy³ù0¦¡¤†Í-¥èƒjcŒt®ç} ‰‰}³¯È»S<¤·V?k•·w�Ó’¤+eÓÜ£CD‹yZJ¾`P÷õ´÷£.šV·ŽŽ¹ñnê Ë&ù n¤„̤*ÙʵãZévk�çîìM¸]ž²�M™ëOÇoŠ)#ùÔ§…sÏ׫'-­qF‘}óû?}øñëúð2�—;phPv-­µ£�léiÛ§ö;µ—)�Ú` w]k»ï·×hÏxjÌM³œ”| ef2瓵N°UbðËÇÆx@DÙª+ÊÝRù&e„ÿµ 0cJµ‘SGÈ0e!O…ñ”ŸŠ2öÓ¼¨ìUÝë]ÙN]P �Çyê{·óš^ÿo–õz]Pš 'ö¥Û“YÙï·r˜õ«¨¢» d{^i¹ÿ½vØQº Y{Ö,´o†îëÍk¥®¨Ô𳝥ŠKˆ6I’¼™kq»wïÐX­±S7¦Žcè�:‡U'y Jkë�•{â ã©«M}/�+ût­Ar73׬¬Vƒ6ܬ£G<c½gõˆ»1 ß ·¸¦6,â’Úp3”¿N� űá'ÛÔJ]¨’pà©x!Û5É;ØÚRðoê²¼¥ƒ±D�Ü.äÜ÷�û^EéÀ0Vmó}½eÓÉ€WÎunúæMŸ;×É�b¬Þá¬oìmÀh�D:w}Ó®æ¯8.«¾ý®¬hˆssÔ Ô¬Pï¬I]Ó·4·0:‰q1šâLk´–í‰ñÝ–=·†{Py:÷|óžÒ[,P‡ÔÖ{~ÙÔÔ�{‘¡bôœ{¾qÏ Ãk,Hõ²Ë¼^;fî/ñv°zÉrKB��²h_Ug‘}sµqö «m>Ôm®ŒÑà&Í•Zbè±Ñâ`HÊjÛuÇì&g‘JñJºð—ð­éŸ�iŽén åé±�Ò§ßmy<¨bv+Ê;·§‚ûÊùP• +=S;«»žq1h?âmÛžº;-êE[¯`¸z°HÄ@¶…BMäÜyÒ*í!6²-tŠE ª›MÖsÛ2aP)°‚Çnœ§fש)øc•)Œ³�>6… -ÜBý3›B-FçäôØqivÁêtLâ± †ÚŸ™ŸipÏ–fõiîÝÎ'¼ñ¦WRÏíÜËsn{mØYPֵ먴¢CèÌøÃµ|ôä)im^Þ_{�/3®@øt­ã�õ|ZR8Ѭ“M½¬b£‹tT1­gPÿÆsïDE·4œ7 cú¸‰Ù#²™Ãæ¹ç›ö¼`O ö8m»é¿Ú¦#a½9w|ãŽì4E „õºõŽÿÛeáîTEq¡5,þ¼=˜N=HýRaçÒ„ µ‘ }óBmöNùi8—«§‚óhÝp´¨"@µã¶×Ä]9Y¿«œ,];Y‚SWz¿l“£Uš÷’ÅÏCÅx¹µXÖXoõôŠ»Ùezó”s·ï h ~ØÔó ÜpPLí  !hÔÆ§vjšç¦oÛt[S5[ﺠ�Úæ¹ëÛvÝÕÔͶ»þ‹ŠP¬ù>º±áÝ$í&B1oO‘7#ÕõϱG^ÿþЬæX¯ 9°–°s�Gdýñ5¿ I@à §1Æ;…á¹é7½êxi¼ëßì”…ç¦oÜôªï¥ñ¦¿Y–†¾æ|!ÉÓíï3y`×À³^´_�s¥–Oy+ÆYýU]rΛ7ËrVxè߸S¬r6’é' Ÿg톳VsÆ(¡eÈÿÞhƹéÛ6]פjÛ]‡ +5þªHl·�®ð×�³Øò»•Ì-kcøn/ äŸ}EÛ +c~±kð5W™ØËÆÎMß´é®ÆÆšïºÝiœ»¾m×}Í:h»ë±iË A!·x?·|Ó–£(¸~H�åÞŒ­·ü/·eW"EçŽoÞñ‚ßG+ §­9»Ø–…n¸Ã¾ÃSžoÞô‚ßÇp5�Cl½ëµh– ¨¹}vBuµ‡ï -œCëœM&ˆ–‡)èöÔ+5/ÐöU«Ò€ôäÈr …íÿbãŠp¯«¡«¤†"Ü�j(Âc§Šð»-ixîOQÂ�í0ÛŒ„C‰Ì”dCIRP =nx:¡�<ž£1ag}ã3o`Ö1¾œÛr½�üN[%È'¿áÔÒV¤ƒ^¶Jðêrî3ÆÏ]ß¶ëÕ¼•ÆÛþËŠô®•ÃHÞµÀZˆ‚DiWFjü°%Q/ýŽ´Qnl1¯6e˜º˜6±j2ŠZªˆ °²OBo"Ld1Ä�”Ù) ¸Ö{€ÿä ëy‚¬¤l¯�|ß®�Nïç¦oÛôZÊFã]ÿóe9 q™?1T®á˜ÍÛYw6Ï*Yæ®l©–X‰™¦—Qäûß—ëØ8ǽbGGäá\¦eæ÷ÉãÜð>'K¸�%T’ Œµ Œ÷ªKørŸ8·|ã–×R Zïy7S}WpîÜö�Ûn*Á¹öÛ.—{¬¢´Ae-XlÕñ|æ¸ýan.š\kE–£"‹¹*CÏõD;x+'Bî”�Vƒ1¾]FÖϹJW‘“Æ�Ô®a2^j/¥€ùJת²GtßA•¦UÍñ¶1û'ô¬:�Ìž#ƒ²Ò³ê¡g±Ò²êñgF-w¬z,Ú¨"¦�ãɲ™˜Ö×äì»8jåní@°ÊÛšíÁ_\³Á±R»n4w…Ê´nQTnë0ùŽqÅmA“Pg|æVFY‰Ê-@ ­Ür]9î5­\ PNêfݵ‚’\‰—díÇ~XÐמà¾Ô¾aRçµ}ä85nQ‰ˆ’Ü.¹Ýhòkí(äÂßêÙÂM‹I +Û0»åg­mù +Q\Ë€N¥?(*Q3P"È¢l)Y3PZãmc'�É@9ÏÌž3£°f¡<ôШš…òðCC ¥1Ú>UÀªéÚ +µÜ×m-1†n§£¥`W¨+Êt³>ó�|Ê+w3Õ§¦{¨J‰ŸAälÙÈ ûÕËk‰i+»RC��‰‡6dëÔÕ¼(ʘ´ìþ(Ýïë�Ú J@¾hňÑ�1FPLJуµÂ0JŒ÷ÃWÂ-fÂaóàp3ðËðÄÀLödÀ•Ú@#U7q£]Jî›V*"¶�µ#Rj¤À(r)¼í¸ò¯+ì¯T}eÁ8e±!6÷©2,6¼•ú<@›•ʯ,(o%=ã ¢‚ºm �æ1@?ATЭà¬(kÚŸ ¬åB +Y-•GHÄv®˜¤Eìhîe$�jÖ¥óXˆ?ú[ÐTT Á�"wvõâùB¢e Œ´<´ã,š‹ù÷ÄMøKøÖt�™Ë´Š¹Ëtwb/á± ¿Û’ÁÔòƒ�ÖýশE38ϤíW?m£ ’à»jÀæ¤ñ³®§¢ÒàŠÒh# ”è¸Åe)L×6!?,jVÁ„Ë,O{ã…¹›ç)xëfññ­GY€q¾ÛS>®iW^Ž/¢%Ö5†£"Áõ$©yÀe·xÝ­Þ_xƒÙJÏ}}?ÜMWý·Ç•àfˆhIFWñçúë·1ï/„�Î*¶’»gtOîõŸÛ/ø=84˜­úGná5JÈ[ÙsÂám˜ ‚Ñgž¨ÀHÈ §­²Ãz|“~EÀeˆÌ„†«ûAPýÓ°+ãž§ô€à½±8Þè bÚÜ~=½Ô5r›®&`Þ_ßâ‘âÆÕH(FŠŽ©G$ÓÓÛ¬ŽK{R‰½Xµ -e+«1¬ø-µäàHÇêÂåIÝ,×o‡/õ«îì(NXwÃ�þ£úeÿ•··mÁÜð@6Mœ»HÖÊHv›¬Ç7è¯ß@yõþ¢Áúî;ý Ãî§õ˲~µýð"�ð*®ìeNä;i옆+5œ^ v4´¬ +ÔÉeÿ�ÎÚê/ø@pÖ&zV<ÅŸïÖÝ'ù,PG“åuG^{äIíáÊ™þ+ýåÛxñ>~xKD�Ãó7Ñ7{0Ùe”ÐweœqΔsF§’Ëá=ÒTwÕ1²Ê)•‰¿2Þ௽V¾ãŒýJ�òºûúô ÖÑðýõÛáýê}üý-=H ?q$ò¾ýn‰9|÷í?ðŸ.ÿz¡Ë†~ú<0öôýš]ÿ⻢&‹­g¼äÖNmõ°ý›Zû}jYÛµä”G{+"O]e%yžºÊóë*R1ŽÀ©«¬BÎT•ºivj*K¨;•eEe§UÒƒ´¾c°m•1MhK–ËԎݥƜ%7Æš´ZCj'�¤îëNDæ+išºRÅ`YcÛuVÚ4T2 ÓOµËH¡þ+OLž›‡÷çOû°®‰`Í\ˆ+J9 ã�X'‹ƒ ‚]ù‹ë8dw.„a~)oAéërˆS�p–ã™5‹ûµ„üÚY»^[‚qfS HZæ¼JqBÂûh%¹'nÇ…‡« qÉÀ׺ٰ)|šiZY�í‹C¥yDРc{~Õ_Ù®þb‘%"’](É2<žÙfO 2/ΛÒä…ô&¥qñÕÀó †ùz*GÏ„INàRØY“€�BœìTúŸÞü(bɲ–P¬-½%fÉï£Z !ú- ×[ˆe•˜1’òו³ ©³2Âå@¥cµj¨gy?`§Å–Ô+8{î +ðž _LŸ"Gí€ô(CzÌöOpîßÿ2œÇí~`À¤ÁÊžá�Ù³«µÊJú¹VŽ3õDɳº–~Ãû�äY]K?o‡Í¡äv.SžPáˆS¤÷ÂU7Ù™½+)¾ù±þ™š‹FVÒâ[Ó¢Àm}®5ïµÐöÜõ­»^Hß×–‹æ©mwýõ¶¹$•wç–oÝò‚_Èà äæÇ|#s·¤â‘ñçžoÜó‚ÓÍÐʶßô�=£T}lFãL9ÐÚÛVåÇK~¿O•¾õÒtÇòèÌUÉ�¹'lœKüòÚ€÷Þ¯‹ý–3'c¯¢SÃ2z@ç¶ ¾‚å¤[s„¹¬ÅKifsÚ&i +ýUôìwå®ÑY·h{û¢¬}uB Ù¶ŠlBºf¤Ó¦UÁ_V…·�.ºá´¤wÃ˦‘B¿¨íû +k(dz (µtÍðxH¼Š›uH×®(÷g] e+3´ä¬cãŸdà”•µ“ÎQí›÷©Û2ijmÀëön»kâf+x’Åf…çœn¤|U㤙ÐN«5ÆR* +h]›†3Gø»©Áâ4¸`�ü±ª‚;â8¿´¶Ý€¿´ëãœÒ +³ÎfMá:Ff:•šÜ¥ãË¿Ù#û§½®a›jØv\Ù9øìïξ>Gnr»*Ä9aÈôjc1G^%{1GÂ×e_…¿„oM÷XÌM«XÌMwƒLš$Öô»-Åœ^sd ¤ÒœiÔFÎ�,|‡q +gFvâ$U0X²V§¿œ›Ú¹Ù÷6ÝÉj„e¨ør²š›YMÍ+-wOÀjL�ÕD`>†ÕØ«i†Äàlª@Vu7 (ZqšÑ£9x€—<7+1Wx¬Óxk�ïÕ¯¦Ü*/Á+nCØ*ØWò#FÚîÆÆ¾cá–rÚgð?S½¤rb`ã‚I%ÄrÁ¤² +œ3d›TLÓ>-$à¸F•–Un£ÃuªÜÍ€C¾–Û¼4Ìl²š<7ê3›œöšÒöÀ4±i¸7$6 + è…Ó¾Ïknr„Rúé¡~üØô£áV/YÃcbÉ:ÜÓ™„Æï-’QA‡·D‡ÖÝÂ8Xq@w�s,Öͦ –<ãHñÑjJòY,,ísÂi7ó¬¼|8IU½T¥ÄÜ�ÌÒ°~0àa[•#!XI^÷~¾iu`�ã,9PB .Ëg=8×»ˆžV)�4'�|À¢W ”Qî³ÖòœåÔg¬æ\YîÿõÄÀjÎaŽb]$íl·hë1œë>°¸îê1|ë.°Ķîë1\ë>°ôZ ?cÀ ý‹Úøô&ÏûãläÓ³ŸžM|z¶èÓ³sŸž�ûôt{Ÿž•Ü¥y`wl˜h:¤ü`¦r§@¼àÌO;—^ å#F·*QÊX Á¥×‡}P³VÁªõÈãµ2Ö´sG…|ÎÒ„Ðåj:ólrøísü+m¹Ÿb3&¡L¬¢) Nz�Ý@þ2ef„{]jFX%¹án8ÑÓcÃyŸ~·%“¨4uQäÁ�JØc¹„«q‰Ìǰ _cí°òc—A“¥~.bȹz<æd©õˆ«ÐÐ=0·¹÷ÈÈk-¨‘ù<ݸ©+p®`�í&P)Yn?‚Þ0-íü�3¨’J„_�~Å�‚ˆ¸™#ñD‘¬i«Ì±<Ú‡Ë!YÕV#(ÃL«Új3®‘B¦*…�7[B�ñ–åÝÎÛÉ�*­YX¾ }²nÇË œ+8c T�AÓÍ]2ÈUeÐ|ヘ´Þí?Êñ¨…¡ó?·Š_?J Þ‡Š5ñAù6в&~šáp…øA¬‰Ÿ‡ãMÕÄÏ�ñv;[W\Æ&ŸÑ*€ùX©&| +Û~¨ð›kŒ-Æ™ñ¸× +â*#'©�„œbèF1„•<\…hÅ3È!S“C1˜�a¨¶&ˆÚaq�$r5IôxÌùš(j�¹´¾ìv&�œ°˜øŒ²¨æce‘5YTÚ÷#…QšÔ=¤÷íC´òC›Ä�ªTžñ¼?¡�¸RX“B”a¥JÕ„P3®�AŠj2èáxÓ5ÔoŸöÊd…Ü4yJIàLë‘¡„UT€s_Œ� +hº¹K™š*lû�èMZ3RÅÇfNcg¯½¦‘” Æ£uФ[ER-QAtJŸ§ ªy +”�a­Õ4…f8\!’¨š¥ðh¼Q5I¡5Þ²ÂÎÛ™½”€ó|F™Tó±"‰ª +…m?ÖAJ¶2)d³Þ�b§T’lÃ!»?ë$[ª¤- '0Êlo7y˜\¢ZÞBæcl-q¡!Ç£¦vrX� 2^ðŒø˜��¿SMé/îû¡,V¥ŠþÇ}Œ=‚W¦a‘ôÏZ¿§Š~�Ž'iùx>ZÓïc(ÃFkú};^ïu¤tM¿8ÞtM¿oŽ7µSú0ßqʨg?E8+tMÃ/mü±â'ø•øß_ì”>N1ù·›=ô³>º¦Å[ž=Õ—¡>TøèªAù&ZÕá›áp�ð©%?oµäãÆxûv§äq + j¹­úÅð<".Cî¼aÕBò”à\p�€šîáæ.ÉSË<.ízKÉÓ‘ÂQw.ƒ×R5Òúó–B•d4ìàÂíC6C¥ ñ“ŠÁ|?- 3ŸäP;,3A*€Õ’�Ÿoµ,äæx˧À§ Q�¹ JkÑndǶñ¼S8¹Ë´½ìä¬FƒÜjíä¬8kiÚtà¬Ú‚õR=¾FiZóÄYc0Ã!jiµ ±ØÁõºW-§ö ÐVË©½/Únלy`š@>ZO�Q[„ó±)µ¥qÆ“†_ÚöCUül}K¸7‰‰»G æÕn“C¥ÁÑA‘í„x¼* ažäP æCjiÎñ$‡Úañš*MžäÐãÑVK¬m�¶?~Ü)ˆxƤ—ÛÊ ™„vuaÑB • \“Ä4Á4å0�÷v ¡j€½´çÇV¸�Âg(6T:jÏü1Ëc:J@‘×®þg�ÌTš¡Ä“ò Œ³�oÂRž<‰§ÌÇðÙj¾;¸~± Wi†ïĹ”‹Û ¬Ï“ê³±ºaŒ1ÍKÂ”ÝÆ¼£¬ûûYôlÀ~=Û°ŸAÏvE\)„V=Û#XŸ¾g{ë³÷l�@}úží¬Ïß³=‚õé{¶G°>}Ïv%Ĥl�=Û·Z`nî ìÒö•eÔ>KÓv7w*iA¡ú�?´i»›û¹……²Æ·Äá81y®¹P‘¹|ó®í+ °¬K{:'›{¿o1Å&îpvkßÅt�=<* Q�„Pë&ï³qWYXj0’ö +¦³íûÁäk‚éIú¾Sa¤m$—Ü¿œ +m#±Ôºï{M*&®NRéáhS5¡ÔmiÐ~«ßÓöýnÞ»­Mßyï¨0L5’Gm[¾“” ØrŠD]ÚÙ~’Rg#øBª0å6ROÒ ž +o#!õàŽæT˜x ©æ�à—{}Pa$ë$¤޶jþCk´mkS €�àïé½ÛÖ¾¡÷®0v5T­Á�]Šó"Ê�2¨yÛ÷Ÿµ*̺�„ÐÓô}§ÂàÛI +=¼ï;&ßNb¨}ß÷š*Lg rè WËvhޏMS²"¿£]¾2 IyžBXµ�CÛÚåÇ0MöR¸¹KÕÒZ·ËφdMåúiZÃø©}Òé쥿O:ÕÒž¥™>fáFÂéÁMá©0 +7’MÍ›ÂWDSaXë$š�¶ÂäÐH25ŸA°i˜ýÄówõÒ¿cpik/ý†Ñ¥Â4ÖH8µí¥ÿ—©, + x™_wf‡Ÿ=ö÷¥Â@ÜH(=I“}* Ç�„Òƒ›ÅSa8n$”Z7Ù¯ +¥JÊÃãÑVËxh�¶M#f¿§Íþ=…ÒÆ6û-…R-å¡}›ý<žÔJ.�m÷w ¦ZÖÃÓôݧŒÜH2=º<†äF¢é‘ýã©0Èu’M�G\-ó¡=âöÕ2ó!©Üs�¹çC‡ÀPa*k$�J;ßf +LV·tL…Ò9±`—P*ŒÄ�„Ò³Œ, Â×H(=º÷>†ŠFB©qïý+B©’èðˆ«e:´GœÒ;…Òž¹wËÈÛ:µ YF^aLk$�Ï,øj!Àd²AâØ–Íüœû•Qatn$¦že¢½FbêÑ­ù©0~4S�[óÿíNV»§3ÿÓʶöæo˜WVè±ÛæÝùCo7Ì:ñoíÀ/‡üJ€@g7¥ÃK‹à¥R~H=®¤K^‡« -€Ãˆts5Ÿe,E1ð¥p¨4zŠ Ô`,3Ê÷Õë/7»0~£##Û_(6)¾êÀaûIÇZiòBz“øÚ>Û£²±@ƒôü�4]ŸÚ+aÖ0MîÀìÓ”T«¤ÜëCü; ß"“á)âL…ÔkÌžnÔ &ÌÑB×Ä]¸il‰ô ¹g3J ƈaAåÂ�1Fôº*We[a%Æû“<Þêìßq‘˜¿ãÍI­Ÿ8iã¶T* +c(P€ïPZÚñ#uŠ©oËàùT*LLá- ÒQ +o;åâ×å¢4Ž@«°%:;¸.Ëp•æÈjqÌwÃu­êȦÂÜ ·= ªûëW•½/�›µÈ‚Áš#°k@¡_äP¾‚ÞÂ/k€XìµÆniùCÌǪ©…ÉÀ +%èÜ¢>Þ)0:B yíH–Ôj Þøöl% ÿ5*z±å©Á³¶aùüàœ#½h?>!p§ô²^"½�¦Ù´Ÿµg{z‘ÄÇóiÁ>ÑÙhË}œ�Ù´'ò,5xVýŸ1¿¢æcÓ+J‹-�"òe;Ô~ÅÔný˜E±í­vDJiÒ +õÎÈâ)^íÀt Œ%³‹|I€–xx,DX'ت`® ߦ@¾ÓÍ]ä[Á¶·=ý†økG©¿èÔøNgÎÞ£ì«É…!ÓÜ•-¹†¤<D±¬†–Æ �Ö»tŒ¾5"/ã]z/)Åš‡ Ñvn¢‹èÈT»’(ÍN¬nñº[½¿(ð³•Ù®þnºê¿=®©Ñ’Œ®âÏõ×ocÞ_$!�UlÿwÏè>žÜë?ÿ¶_P€4˜­úGn\¨@Zs+"'€ÞmÄ\ŠUï�ÅñF�Ö Eýz|ÉëH›®&`Þ_GÔ¸oãjD7‚‘¢cKâû]ÛâÄ ä)@pEÙ>¤ZЖ²² :¬ø%µtöb@:¾P Nw°8\¿¾Ô¯:TÎq‚L§ÿ�ð¨~Ùåím;07<�¹‚sÉå$»=æ�¾~å{m­ï¾Óß0ທÔ/GÈúÕöÀ“»†`¼�úóqö�0qL ÕD³;úþ¬ +ÔÉeÿv| ÿ„·ìý¢øóݺû$êHr \¢‹âCã‘CMáÊ™þ+ýåÛxñ>~xKD�Ãó·�7"·}éQÆ“+™«<Æ (SÎiœJ.‡Oô8SÝUÇRÈ*§ø÷P™ø+ã þÚÛaÅá~ÿ~¥@yÝ}}z�ëhø‰þúíðŒ~õ>þ‰þ–ˆ$†Ÿ8wß~·„»ï¾ýþÓå_/tùCÀÐOŸ†Âž¾_³ë_|WTO +î;4`£± ž4ð¼KlÞtúÒÜUÖ]ÿ&I…È»©ÌLN�êìSÙ_±èƒøX4ËS£} +-•�ùìÅ*º¬Å7¿ÿÓ‡¿þ§/Åx®a®SÚœ›"fëÜÃ7D±j–¦U˯4It«A¡ê»ê6x§™?e„¿–9açÎ4TŽgxyY†øHÃbSnr„P mj* �Fo‡@tX¡ô¤UÇu¦Å6í Óðм¹1Û`Áƒí½ÒÝ…ê­ßþbÉòµ¥`´çw±ò" k¬(ÝF:¼fù~™‘ߘ蕄¦¿¬ÝLÃу?Uvwÿ]ú½Àœ¶÷ïãoÌ=±S"Dü¹lò]ŠÏB¬î¦áZ[Æç�ž„ÿPpƒ 2AÖ|ÖVhR#HlÖ~ï—ñîü*Ý…qWŠã3RY÷!õ�äOÈê¯j!\ë*n + …îGš>¡Ÿ‚,hiž3®U…ò±a-ë—³ Ê[ÞøÈVÈÓ¼h$�¤£ú

 qS7íís&iR[|ÒÎOu0^ÕÂ,§÷¼aÙl˜j‹•Ü-l%©ò}B¬º0Ó>äíkE àÎæéª5\úJúQ+\TuŒù(óì§¿çc�a€=ìàm}þS;|ȱ¨Pkaž=:+ŠžüÂ4{t¦Wîpò³6AM®e`éÒ�{žÃ*„ØÏ®Ö;_½¼–øõB"€.6ÜH›v”û'­¨ëÑÅyï”�xfýëÈ@YpD,ŒãH_¢ìœò¹8‡�ÿýû$¯;-µ®™w8·ŒˆÏ®Ñˆ»qT—:߬on!‘µ€D®ý&»1ªŒmwc®Üë®± í'Øc’næ°–9ªsÏ9µåcÍ<,t9ô°ƒÖ¨®#´~®ÁÜ)üså›ÐqŸpoÊ/p'Ÿ‹š«Ù¤8Œ«zvv]*ÜÎÔ\/$Ò`Pùv˜¬²è•Ç‹Èsb¹~n&P…ò±L@ÍkÒP(�͹ÀöIÈé;ÔIÇ‘rœ·ÕUt©‡§óäü2J…¹±IÖ¼ÁÖ§-^ÓQseU³•ªÑ–ñtxNQ 8]žš¥Içà܆§¼Ì>¬Ó°ošN»-AhÂ;¬yºéI“%I4°µ)©LÅ”T¬áê‰ BËÆbðP‹�»­„pϼ¨Bù`yf+J-hŸ5?Ô!›y1Ø”IçÄ‘¾�«©µ…Wh Þ¤‹)HÀ®$& )\ïT:G<ß8æJ«‚a£xzóѽpÔèLM+‡<EB%P>br¦¦‚E£ ŒC߇!y´YAã6ˆ Ç[A—6Èw:bk¼ ª@6W^ÉJîõº°uc«Ö4Ñ…ùìdמìÇßÓŸB3ÌWù Åk)|ó§ò— £bE˜¾0!^k„†U·Ör®TƒvecmE’ÞR³ŽÐ;:¯,µ:@ü“Á)–'»Ô�|šðlÊÇg© ø‘å6l¦H`Mb³!è¥nH\¦‚³•²ªÙÙXáˆ-Œ­'K`�²¸®5YàYD'IÔ˜\6WRéÂ4u-x†„ó­yÏ1ÙFZ8¦Cûî Ù|'Ô=w˜V‡q‡:˜+ØC S`ÓÍ=ì¡0ª^ d”½{ ,uC'ªÂvoaÖ}§x×\¼®RìJCÙƒü”æðN+}%TRÎ<ʨ_^K�§„-9*õRpYÆjío‚5ñx›'Ê,¬ƒùØÄÂÂPxÖ¼v Äv—Ó^;?¬áq(ïp:lÔÑr+ÑZ ä¼ßE³Ê€$ž°Ó»¥Âê8š­A¹Æó�4y^ÃÍ]$;·�Èp´�IöM9ã)O0\¡ÊF¶k)Y•u®=!ÏâL }B”ÐŒâ Ë©É[vÊÔ¤�= +#ム4Þ€pBÒ36%Þ8 È“'àqkÄ8Š„|ÚÀœqf`ëÀœË�9cÙOŒ)©V¹Ÿ9>MuÊýܹçV�³(ÕsÇçŠ`>6@gär€Îd„ —c &h° +½BËl“¥Úºuj^��e8pæ­Ùw&Ú;þêp>Öõg +Q+@Jv�?Á©¨�†BXÆkPÊp'ËF§a…ïÏ,(o�Üpµêa +1Vôѻ֬eÐÒ€~§`ä”S+77æ¹uauœ¯ +æš¡óLÓÐùps($æKçé<@.¶-(ºø>®®Ü2ƒÊ h'ÐÜ™?ܬ=qï JgÝ= )W¡|0%ûŠŠ§ 8Åh{´Ž—9;?®`϶”ò‚ ‘UßìN®0­˜ˆÀX‰j?`+¤]¤NþÇ<PCh)F�Eòíðù�·x%ý²vŠ*¹ý¹Ç«¢Ãaqa–yð‘æNÖ\%*�?šÇÖªü¤'Ñ¢ëMìv£â*£öAÓÿˈ«„"@Ïÿû¶ûtíe +.çAX¶²›nkHUªy7f[üîåµï½7~ ˜Îf\¥›Y:ŒŸ‡bu³]…ì;Ý^4é­¼e³§FÆ@Uvû²2d=ºýowÈö�¶÷Ti<�AÖ}8͘Kƒ%)ÓHMå„C" ¯&)}+éûN¤#<ôÍÒ!Vσ××&Ã+­ÏD¬`9ÿFʀ߭dÃ+ZÅë˜bòx€È^,¯;Ÿ!p·�B[m¾Z˜W¬¹]³Á;IšA{•¯ØîB1díåÕò ÑÞƒå\‰V¦ƒIè3÷µ|~6ÎJŒ°a@%ƒÅÙvê¼cÓ¥Óš{dtÓX¤m­·ÔÏlŠotC’¸ …K^º—tèÒxaïÐ\׋pWE�’‹;õm–�¶Ø % $ æ†E¹ÝHåé¿#©gé¹'"Hÿã»ÌîÄß_M!ñ ¸Gˆ¬Å±J³|§}aƒOP£}™ó»À6º7øU‚°ÉÚŸKkÂSrïÍÍ'Åò€±á¤pnû¦›Å7n8)¦²#ƃ&Óö¤|˜�� ÇýÍ? 6jXùdîîþ?lµ5¢_6:íGU3Ÿ3wví T*;8Õ +L9Ô-µXL b¹«î×+ ZŽ ãâ'”7ÑjJe¸z‚øOü¿ÿþw�—Œ©À)µé­¤[uçö†0s*$¥\;‘ÜÚu› bulï(¤\™ +šCÞ”ùŠÂUì(/ÓY£¶ÂŒßˆÚJ Jniðk±±e +²ªH'|;*›úè+­½Úw—¿=Ú^Azë[5áÊ* ÷ZY�J< 9ê9 =–ùÍZ ‡æÉ5˜M�•�Ÿ›_@?\N¸‹kjzpÆûç GW£Ç¤-¹cµæ§0/¢Bô`¸3q3*\®ªùTò%¥~¿ÑØÝQ©Ê1ó1F9Û1)Ï¿âr5…Y}"O]M3Z$Áÿr šÂô¾˜  £Sf™Œ6ÍŠ/S˜¹7!Xj.ºÑ�r #/;Æoâ¦0�{:©mùMVÈÓ¶÷ïj�R�H ŠRHåïêO+¢I­^:í·já¦0öm"AáØ5-ìƒHðF`*$Xz“CYÀ»èð\sôkÒ]H>�BûÁœ¡ÜfÀzNû*½éÁœ!óà ÿVRMa.ZÄ!xÀ½²êÊjuºkrì?r7f¦Tþå vd eíáªâ\Õ# +sÆ­“Wà�ñ?b/ )›ˆ½øªÛf£a1t~¨�Š*gP ·÷®[Aå›zÌäþ¶­Ý!�èO³K™À¿¡b\“s*Ƈ~háÆôÕq±¥=DÎu%ã(b8†’ñá&·Œ �&‹ðñ¥à�)Ì�Ó‚¸ïðôÔn�&áê�ãF œÁºÑ"�ç±w ÷�óh4:¦ÁN—yjš­Ãù`š�+»š;¥s“¾;�ìœ�­é\f +3õ&ñɵ¶Ö?ÊH±ö/âüï¿ +y·?‰§Í#CkH¨´…S^ƒZÙæóî‚(Mþw¸Kƒú¤/Øi´ð#êÏMi2ŸôàÉ0Ž 6)?Ÿ[¬!�b16žÆ©×`ü–ÿ{°o» endstream endobj -407 0 obj +423 0 obj <> stream xœ}�¿KqÆ?×U–X 94%MQKS�†Nø#Ô¦óüQ vÝ÷BšË¡©hˆFk ¢ÙÆú‚ ! @@ -1495,20 +1584,20 @@ x ô’0l+ϽߣÈy7½®Ó;¯×«É¥º;QŽ?V.ø_îtFÀà3LËEÆK¶)y ðëz”80eÅIPö¤Ÿkñ‰äT‹/%[Ñp” å:8ÕÁ…ü¶¼+%¿÷dбÐŒ"ÂÿG¦·™ `d_¿{Ù¹ÙÖ–gzžçm\‡Ð8rœÏSÇiœ�úµ­öþfæë ´½Ô1\íÃÈCÛóU`¨ ÕS·ô¦¥]Ù ¨ŸÃ@†oÁ½ö ãâ_± endstream endobj -408 0 obj -<> +424 0 obj +<> endobj -409 0 obj +425 0 obj <> stream -Typst 0.15.1en2026-10-01T12:57:20-03:002026-10-01T12:57:20-03:001application/pdfDzyaajGJifpizox+vCC3sA==DzyaajGJifpizox+vCC3sA==proof1.7 +Typst 0.15.1en2026-10-01T13:12:15-03:002026-10-01T13:12:15-03:001application/pdf116eLL5M9WfWkWoq4e2ZbQ==116eLL5M9WfWkWoq4e2ZbQ==proof1.7 endstream endobj -410 0 obj -<>/ViewerPreferences<>/Outlines 16 0 R>> +426 0 obj +<>/ViewerPreferences<>/Outlines 16 0 R>> endobj xref -0 411 +0 427 0000000000 65535 f 0000000016 00000 n 0000000069 00000 n @@ -1528,400 +1617,416 @@ xref 0000001365 00000 n 0000001433 00000 n 0000001600 00000 n -0000006505 00000 n -0000006610 00000 n -0000006691 00000 n -0000006834 00000 n -0000006991 00000 n -0000007059 00000 n -0000007140 00000 n -0000007237 00000 n -0000007305 00000 n -0000007448 00000 n -0000007617 00000 n -0000007685 00000 n -0000007779 00000 n -0000007894 00000 n -0000007962 00000 n -0000008118 00000 n -0000008283 00000 n -0000008351 00000 n -0000008444 00000 n -0000008555 00000 n -0000008711 00000 n -0000008870 00000 n -0000008938 00000 n -0000009032 00000 n -0000009126 00000 n -0000009194 00000 n -0000009353 00000 n -0000009515 00000 n -0000009583 00000 n -0000009677 00000 n -0000009789 00000 n -0000009857 00000 n -0000010013 00000 n -0000010175 00000 n -0000010243 00000 n -0000010336 00000 n -0000010434 00000 n -0000010511 00000 n -0000010651 00000 n -0000010720 00000 n -0000010790 00000 n -0000010883 00000 n -0000010951 00000 n -0000011020 00000 n -0000011118 00000 n -0000011186 00000 n -0000011290 00000 n -0000011376 00000 n -0000011454 00000 n -0000011611 00000 n -0000011768 00000 n -0000011836 00000 n -0000011931 00000 n -0000012026 00000 n -0000012094 00000 n -0000012251 00000 n -0000012322 00000 n -0000012494 00000 n -0000012562 00000 n -0000012657 00000 n -0000012728 00000 n -0000012799 00000 n -0000012920 00000 n -0000012988 00000 n -0000013145 00000 n -0000013216 00000 n -0000013396 00000 n -0000013464 00000 n -0000013559 00000 n -0000013658 00000 n -0000013726 00000 n -0000013883 00000 n -0000013954 00000 n -0000014126 00000 n -0000014194 00000 n -0000014301 00000 n -0000014372 00000 n -0000014443 00000 n -0000014514 00000 n -0000014585 00000 n -0000014656 00000 n -0000014788 00000 n -0000014880 00000 n -0000014955 00000 n -0000015028 00000 n -0000015101 00000 n -0000015215 00000 n -0000015402 00000 n -0000015561 00000 n -0000015633 00000 n -0000015750 00000 n -0000015847 00000 n -0000015919 00000 n -0000016102 00000 n -0000016265 00000 n -0000016337 00000 n -0000016442 00000 n -0000016539 00000 n -0000016611 00000 n -0000016770 00000 n -0000016929 00000 n -0000017001 00000 n -0000017106 00000 n -0000017203 00000 n -0000017275 00000 n -0000017442 00000 n -0000017601 00000 n -0000017673 00000 n -0000017774 00000 n -0000017871 00000 n -0000017943 00000 n -0000018122 00000 n -0000018289 00000 n -0000018361 00000 n -0000018462 00000 n -0000018563 00000 n -0000018635 00000 n -0000018798 00000 n -0000018961 00000 n -0000019033 00000 n -0000019138 00000 n -0000019235 00000 n -0000019307 00000 n -0000019486 00000 n -0000019649 00000 n -0000019721 00000 n -0000019818 00000 n -0000019919 00000 n -0000019991 00000 n -0000020170 00000 n -0000020333 00000 n -0000020405 00000 n -0000020522 00000 n -0000020619 00000 n -0000020691 00000 n -0000020854 00000 n -0000021037 00000 n -0000021109 00000 n -0000021206 00000 n -0000021303 00000 n -0000021375 00000 n -0000021578 00000 n -0000021648 00000 n -0000021734 00000 n -0000021921 00000 n -0000021994 00000 n -0000022173 00000 n -0000022245 00000 n -0000022342 00000 n -0000022451 00000 n -0000022523 00000 n -0000022690 00000 n -0000022865 00000 n -0000022937 00000 n -0000023054 00000 n -0000023155 00000 n -0000023227 00000 n -0000023394 00000 n -0000023553 00000 n -0000023625 00000 n -0000023730 00000 n -0000023831 00000 n -0000023903 00000 n -0000024010 00000 n -0000024120 00000 n -0000024287 00000 n -0000024446 00000 n -0000024518 00000 n -0000024631 00000 n -0000024728 00000 n -0000024800 00000 n -0000024975 00000 n -0000025134 00000 n -0000025206 00000 n -0000025319 00000 n -0000025416 00000 n -0000025488 00000 n -0000025663 00000 n -0000025822 00000 n -0000025894 00000 n -0000026007 00000 n -0000026104 00000 n -0000026176 00000 n -0000026351 00000 n -0000026510 00000 n -0000026582 00000 n -0000026687 00000 n -0000026784 00000 n -0000026856 00000 n -0000027031 00000 n -0000027190 00000 n -0000027262 00000 n -0000027375 00000 n -0000027472 00000 n -0000027544 00000 n -0000027719 00000 n -0000027878 00000 n -0000027950 00000 n -0000028063 00000 n -0000028160 00000 n -0000028232 00000 n -0000028407 00000 n -0000028566 00000 n -0000028638 00000 n -0000028743 00000 n -0000028840 00000 n -0000028912 00000 n -0000029083 00000 n -0000029148 00000 n -0000029315 00000 n -0000029474 00000 n -0000029546 00000 n -0000029659 00000 n -0000029756 00000 n -0000029828 00000 n -0000030003 00000 n -0000030162 00000 n -0000030234 00000 n -0000030347 00000 n -0000030444 00000 n -0000030516 00000 n -0000030691 00000 n -0000030850 00000 n -0000030922 00000 n -0000031035 00000 n -0000031132 00000 n -0000031204 00000 n -0000031379 00000 n -0000031538 00000 n -0000031610 00000 n -0000031723 00000 n -0000031820 00000 n -0000031892 00000 n -0000032067 00000 n -0000032226 00000 n -0000032298 00000 n -0000032411 00000 n -0000032508 00000 n -0000032580 00000 n -0000032755 00000 n -0000032914 00000 n -0000032986 00000 n -0000033099 00000 n -0000033196 00000 n -0000033268 00000 n -0000033435 00000 n -0000033594 00000 n -0000033666 00000 n -0000033829 00000 n -0000033894 00000 n -0000033967 00000 n -0000034064 00000 n -0000034136 00000 n -0000034209 00000 n -0000034335 00000 n -0000034407 00000 n -0000034479 00000 n -0000034558 00000 n -0000034640 00000 n -0000034730 00000 n -0000034802 00000 n -0000034874 00000 n -0000034947 00000 n -0000035020 00000 n -0000035093 00000 n -0000035223 00000 n -0000035295 00000 n -0000035410 00000 n -0000035500 00000 n -0000035573 00000 n -0000035646 00000 n -0000035719 00000 n -0000035792 00000 n -0000035922 00000 n -0000036011 00000 n -0000036083 00000 n -0000036156 00000 n -0000036229 00000 n -0000036302 00000 n -0000036452 00000 n -0000036524 00000 n -0000036623 00000 n -0000036706 00000 n -0000036779 00000 n -0000036852 00000 n -0000036925 00000 n -0000037051 00000 n -0000037132 00000 n -0000037205 00000 n -0000037278 00000 n -0000037444 00000 n -0000037525 00000 n -0000037598 00000 n -0000037671 00000 n -0000037797 00000 n -0000037899 00000 n -0000037972 00000 n -0000038045 00000 n -0000038118 00000 n -0000038232 00000 n -0000038346 00000 n -0000038505 00000 n -0000038668 00000 n -0000038740 00000 n -0000038837 00000 n -0000038938 00000 n -0000039010 00000 n -0000039169 00000 n -0000039242 00000 n -0000039417 00000 n -0000039489 00000 n -0000039586 00000 n -0000039683 00000 n -0000039755 00000 n -0000039914 00000 n -0000039987 00000 n -0000040162 00000 n -0000040234 00000 n -0000040331 00000 n -0000040404 00000 n -0000040525 00000 n -0000040597 00000 n -0000040756 00000 n -0000040829 00000 n -0000041000 00000 n -0000041072 00000 n -0000041187 00000 n -0000041317 00000 n -0000041390 00000 n -0000041467 00000 n -0000041561 00000 n -0000041921 00000 n -0000041958 00000 n -0000042009 00000 n -0000042060 00000 n -0000042111 00000 n -0000042163 00000 n -0000042216 00000 n -0000042267 00000 n -0000042319 00000 n -0000042371 00000 n -0000042423 00000 n -0000042475 00000 n -0000042526 00000 n -0000042578 00000 n -0000042630 00000 n -0000042681 00000 n -0000042731 00000 n -0000042782 00000 n -0000042832 00000 n -0000043035 00000 n -0000043192 00000 n -0000043735 00000 n -0000043949 00000 n -0000044108 00000 n -0000044563 00000 n -0000044782 00000 n -0000044942 00000 n -0000045685 00000 n -0000045904 00000 n -0000046044 00000 n -0000046260 00000 n -0000046499 00000 n -0000046653 00000 n -0000046861 00000 n -0000047072 00000 n -0000047217 00000 n -0000047437 00000 n -0000047691 00000 n -0000047819 00000 n -0000047901 00000 n -0000048504 00000 n -0000052996 00000 n -0000053077 00000 n -0000053628 00000 n -0000057373 00000 n -0000057455 00000 n -0000058166 00000 n -0000065019 00000 n -0000065101 00000 n -0000065887 00000 n -0000078973 00000 n -0000079050 00000 n -0000079490 00000 n -0000080132 00000 n -0000080209 00000 n -0000080667 00000 n -0000084870 00000 n -0000105798 00000 n -0000106205 00000 n -0000106318 00000 n -0000107391 00000 n +0000006529 00000 n +0000006634 00000 n +0000006715 00000 n +0000006858 00000 n +0000007015 00000 n +0000007083 00000 n +0000007164 00000 n +0000007261 00000 n +0000007329 00000 n +0000007472 00000 n +0000007641 00000 n +0000007709 00000 n +0000007803 00000 n +0000007918 00000 n +0000007986 00000 n +0000008142 00000 n +0000008307 00000 n +0000008375 00000 n +0000008468 00000 n +0000008579 00000 n +0000008735 00000 n +0000008894 00000 n +0000008962 00000 n +0000009056 00000 n +0000009150 00000 n +0000009218 00000 n +0000009377 00000 n +0000009539 00000 n +0000009607 00000 n +0000009701 00000 n +0000009813 00000 n +0000009881 00000 n +0000010037 00000 n +0000010199 00000 n +0000010267 00000 n +0000010360 00000 n +0000010458 00000 n +0000010535 00000 n +0000010675 00000 n +0000010744 00000 n +0000010814 00000 n +0000010907 00000 n +0000010975 00000 n +0000011044 00000 n +0000011142 00000 n +0000011210 00000 n +0000011314 00000 n +0000011400 00000 n +0000011478 00000 n +0000011635 00000 n +0000011792 00000 n +0000011860 00000 n +0000011955 00000 n +0000012050 00000 n +0000012118 00000 n +0000012275 00000 n +0000012346 00000 n +0000012518 00000 n +0000012586 00000 n +0000012681 00000 n +0000012752 00000 n +0000012823 00000 n +0000012944 00000 n +0000013012 00000 n +0000013169 00000 n +0000013240 00000 n +0000013420 00000 n +0000013488 00000 n +0000013583 00000 n +0000013682 00000 n +0000013750 00000 n +0000013907 00000 n +0000013978 00000 n +0000014150 00000 n +0000014218 00000 n +0000014325 00000 n +0000014396 00000 n +0000014467 00000 n +0000014538 00000 n +0000014609 00000 n +0000014680 00000 n +0000014812 00000 n +0000014904 00000 n +0000014979 00000 n +0000015052 00000 n +0000015125 00000 n +0000015239 00000 n +0000015426 00000 n +0000015585 00000 n +0000015657 00000 n +0000015774 00000 n +0000015871 00000 n +0000015943 00000 n +0000016126 00000 n +0000016289 00000 n +0000016361 00000 n +0000016466 00000 n +0000016563 00000 n +0000016635 00000 n +0000016794 00000 n +0000016953 00000 n +0000017025 00000 n +0000017130 00000 n +0000017227 00000 n +0000017299 00000 n +0000017466 00000 n +0000017625 00000 n +0000017697 00000 n +0000017798 00000 n +0000017895 00000 n +0000017967 00000 n +0000018146 00000 n +0000018313 00000 n +0000018385 00000 n +0000018486 00000 n +0000018587 00000 n +0000018659 00000 n +0000018822 00000 n +0000018985 00000 n +0000019057 00000 n +0000019162 00000 n +0000019259 00000 n +0000019331 00000 n +0000019510 00000 n +0000019673 00000 n +0000019745 00000 n +0000019842 00000 n +0000019943 00000 n +0000020015 00000 n +0000020194 00000 n +0000020357 00000 n +0000020429 00000 n +0000020546 00000 n +0000020643 00000 n +0000020715 00000 n +0000020878 00000 n +0000021061 00000 n +0000021133 00000 n +0000021230 00000 n +0000021327 00000 n +0000021399 00000 n +0000021602 00000 n +0000021672 00000 n +0000021758 00000 n +0000021945 00000 n +0000022018 00000 n +0000022197 00000 n +0000022269 00000 n +0000022366 00000 n +0000022475 00000 n +0000022547 00000 n +0000022714 00000 n +0000022889 00000 n +0000022961 00000 n +0000023078 00000 n +0000023179 00000 n +0000023251 00000 n +0000023418 00000 n +0000023577 00000 n +0000023649 00000 n +0000023754 00000 n +0000023855 00000 n +0000023927 00000 n +0000024034 00000 n +0000024144 00000 n +0000024311 00000 n +0000024470 00000 n +0000024542 00000 n +0000024655 00000 n +0000024752 00000 n +0000024824 00000 n +0000024999 00000 n +0000025158 00000 n +0000025230 00000 n +0000025343 00000 n +0000025440 00000 n +0000025512 00000 n +0000025687 00000 n +0000025846 00000 n +0000025918 00000 n +0000026031 00000 n +0000026128 00000 n +0000026200 00000 n +0000026375 00000 n +0000026534 00000 n +0000026606 00000 n +0000026711 00000 n +0000026808 00000 n +0000026880 00000 n +0000027055 00000 n +0000027214 00000 n +0000027286 00000 n +0000027399 00000 n +0000027496 00000 n +0000027568 00000 n +0000027743 00000 n +0000027902 00000 n +0000027974 00000 n +0000028087 00000 n +0000028184 00000 n +0000028256 00000 n +0000028431 00000 n +0000028590 00000 n +0000028662 00000 n +0000028767 00000 n +0000028864 00000 n +0000028936 00000 n +0000029107 00000 n +0000029172 00000 n +0000029339 00000 n +0000029498 00000 n +0000029570 00000 n +0000029683 00000 n +0000029780 00000 n +0000029852 00000 n +0000030027 00000 n +0000030186 00000 n +0000030258 00000 n +0000030371 00000 n +0000030468 00000 n +0000030540 00000 n +0000030715 00000 n +0000030874 00000 n +0000030946 00000 n +0000031059 00000 n +0000031156 00000 n +0000031228 00000 n +0000031403 00000 n +0000031562 00000 n +0000031634 00000 n +0000031747 00000 n +0000031844 00000 n +0000031916 00000 n +0000032091 00000 n +0000032250 00000 n +0000032322 00000 n +0000032435 00000 n +0000032532 00000 n +0000032604 00000 n +0000032779 00000 n +0000032938 00000 n +0000033010 00000 n +0000033123 00000 n +0000033220 00000 n +0000033292 00000 n +0000033459 00000 n +0000033618 00000 n +0000033690 00000 n +0000033853 00000 n +0000033918 00000 n +0000033991 00000 n +0000034088 00000 n +0000034160 00000 n +0000034233 00000 n +0000034359 00000 n +0000034431 00000 n +0000034503 00000 n +0000034582 00000 n +0000034664 00000 n +0000034754 00000 n +0000034826 00000 n +0000034898 00000 n +0000034971 00000 n +0000035044 00000 n +0000035117 00000 n +0000035247 00000 n +0000035319 00000 n +0000035434 00000 n +0000035524 00000 n +0000035597 00000 n +0000035670 00000 n +0000035743 00000 n +0000035816 00000 n +0000035946 00000 n +0000036035 00000 n +0000036107 00000 n +0000036180 00000 n +0000036253 00000 n +0000036326 00000 n +0000036476 00000 n +0000036548 00000 n +0000036647 00000 n +0000036730 00000 n +0000036803 00000 n +0000036876 00000 n +0000036949 00000 n +0000037075 00000 n +0000037156 00000 n +0000037229 00000 n +0000037302 00000 n +0000037468 00000 n +0000037549 00000 n +0000037622 00000 n +0000037695 00000 n +0000037821 00000 n +0000037923 00000 n +0000037996 00000 n +0000038069 00000 n +0000038142 00000 n +0000038256 00000 n +0000038370 00000 n +0000038476 00000 n +0000038541 00000 n +0000038599 00000 n +0000038709 00000 n +0000038774 00000 n +0000038880 00000 n +0000038945 00000 n +0000039055 00000 n +0000039120 00000 n +0000039226 00000 n +0000039291 00000 n +0000039401 00000 n +0000039466 00000 n +0000039572 00000 n +0000039637 00000 n +0000039747 00000 n +0000039812 00000 n +0000039918 00000 n +0000039983 00000 n +0000040093 00000 n +0000040158 00000 n +0000040216 00000 n +0000040326 00000 n +0000040391 00000 n +0000040497 00000 n +0000040562 00000 n +0000040672 00000 n +0000040737 00000 n +0000040795 00000 n +0000040905 00000 n +0000040970 00000 n +0000041076 00000 n +0000041141 00000 n +0000041251 00000 n +0000041316 00000 n +0000041434 00000 n +0000041499 00000 n +0000041609 00000 n +0000041674 00000 n +0000041780 00000 n +0000041845 00000 n +0000042078 00000 n +0000042208 00000 n +0000042281 00000 n +0000042358 00000 n +0000042452 00000 n +0000042812 00000 n +0000042849 00000 n +0000042900 00000 n +0000042951 00000 n +0000043002 00000 n +0000043054 00000 n +0000043107 00000 n +0000043158 00000 n +0000043210 00000 n +0000043262 00000 n +0000043314 00000 n +0000043366 00000 n +0000043417 00000 n +0000043469 00000 n +0000043521 00000 n +0000043572 00000 n +0000043622 00000 n +0000043673 00000 n +0000043723 00000 n +0000043926 00000 n +0000044083 00000 n +0000044626 00000 n +0000044840 00000 n +0000044999 00000 n +0000045454 00000 n +0000045673 00000 n +0000045833 00000 n +0000046586 00000 n +0000046805 00000 n +0000046945 00000 n +0000047161 00000 n +0000047402 00000 n +0000047556 00000 n +0000047764 00000 n +0000047975 00000 n +0000048120 00000 n +0000048341 00000 n +0000048594 00000 n +0000048722 00000 n +0000048804 00000 n +0000049407 00000 n +0000053899 00000 n +0000053980 00000 n +0000054531 00000 n +0000058276 00000 n +0000058358 00000 n +0000059073 00000 n +0000065972 00000 n +0000066054 00000 n +0000066856 00000 n +0000080053 00000 n +0000080130 00000 n +0000080570 00000 n +0000081212 00000 n +0000081291 00000 n +0000081786 00000 n +0000086764 00000 n +0000108039 00000 n +0000108446 00000 n +0000108559 00000 n +0000109632 00000 n trailer -<> +<> startxref -107578 +109819 %%EOF \ No newline at end of file diff --git a/docs/typ/cheatsheet.typ b/docs/typ/cheatsheet.typ index c4be1641..3c5ea2b2 100644 --- a/docs/typ/cheatsheet.typ +++ b/docs/typ/cheatsheet.typ @@ -2,7 +2,7 @@ // cheatsheet-a4.typ lays it out; style.typ says how each element looks. // config.zig's "docs/typ" test checks every #word, #key and #tag here // against the registry, the keymap and the default tags. -#import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs +#import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs, fstree == The mouse #pairs( @@ -134,15 +134,18 @@ Helix-style: motions *select*, then an edit acts on the selection. Mode box: bla Pane shells get `$PARDES_9P` (the socket) and `$PARDES_PANE` (their own pane); a command clicked in a pane also gets `$winid`, the pane it was clicked in. #cmd("9ns --mntgen # then m=$PARDES_MOUNT in every pane") #cmd("9p -a \"unix!$PARDES_9P\" read index") -#pairs( - file("index"), [a line per pane: serial, kind, name], - file("look exec"), [write a line: a #btn("B3") or #btn("B2")], - file("log"), [events; write `follow` to wait], - file("pane/new"), [open to make a pane], - file("pane/N/addr"), [an address; `data` reads/replaces it], - file("pane/N/ctl"), [builtins: #word("Save"), #word("Edit") `...`], - file("pane/N/body tag"), [its text (`>>` appends)], -) +#fstree(``` +index a line per pane @rules +look write: a right click @look-and-exec +exec write: a middle click @look-and-exec +log events; follow waits @log +pane/ + new open: a new pane @panes + / + addr where data reads, writes @addresses + ctl builtins: #word("Save"), #word("Edit") @panes + body its text (>> appends) @panes +```) #cmd("echo notes.txt:12 > $m/pane/$n/look") #cmd("echo /foo/ > $m/pane/$n/addr; printf bar > $m/pane/$n/data") #cmd("echo 'Edit ,x/foo/c/bar/' > $m/pane/$n/ctl") diff --git a/docs/typ/install.typ b/docs/typ/install.typ index 6d853f3f..f4fc7fd3 100644 --- a/docs/typ/install.typ +++ b/docs/typ/install.typ @@ -5,7 +5,6 @@ #let first = project.mirrors.first() #cmd("git clone " + first.clone + " && cd pardes") -Every mirror holds the same tree: #project.mirrors.map(m => link(m.web, m.name)).join(", "). With Zig 0.16 (the build fetches everything else): #cmd("# pardes, in a terminal\nzig build -Dplatform=tty --prefix ~/.local") diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ index e79f9c4d..916f6b33 100644 --- a/docs/typ/reference.typ +++ b/docs/typ/reference.typ @@ -2,7 +2,7 @@ // does, how it fails, and the limits. How pardes behaves on screen is the // guide's; recipes and traps are scripting's; how a mount cuts writes and // the listeners are building's. -#import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs +#import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs, fstree Every native session is a virtual filesystem, served as 9P2000 (not .u, not .L), in acme's manner: panes, columns, tags and the session are @@ -16,29 +16,57 @@ it names, or else run it as a shell line. The files #file("look") and = The tree -``` -/README the one-screen summary (src/fs-help.txt) -/index a line per pane: serial kind dirty name column -/status pid, version, panes -/look /exec write a line: a right / middle click at the pane with the keyboard; read: the serials touched -/pager write a directory: its one +Pager, made or emptied; read: its serial -/log the event log; write `follow` to wait for more -/screen the rendered screen as JSON -/listeners dial addresses -/focus the serial of the pane with the keyboard; write one to move it -/ctl settings and session builtins -/commands every builtin, one a line -/recent files opened lately: open|closed -/layout a line per column, then `active ` -/tag /tagexec the workspace tag, and a word clicked in it -/col// tag ctl exec of column ; rmdir closes an empty one -/pane/new open it to make a pane; read answers the serial -/pane// name body tag ctl addr dot limit data xdata sel dirty mark scroll - errors event look exec tagexec, and pty/{ctl,status,data,run} on terminals; - rmdir closes the pane -/os/ the host filesystem -/src/ the editor's sources (only with -Dembed-sources=true) -``` +#fstree(``` +README the one-screen summary (src/fs-help.txt) @other-files +index a line per pane: serial kind dirty name column @rules +status pid, version, panes @other-files +look write a line: a right click at the pane with the keyboard; read: the serials touched @look-and-exec +exec write a line: a middle click there; read: the serials touched @look-and-exec +pager write a directory: its one +Pager, made or emptied; read: its serial @pardes-stdin +log the event log; write follow to wait for more @log +screen the rendered screen as JSON @on-screen +listeners dial addresses @other-files +focus the serial of the pane with the keyboard; write one to move it @columns-and-tags +ctl settings and session builtins @root-ctl +commands every builtin, one a line @other-files +recent files opened lately: open|closed @other-files +layout a line per column, then active @columns-and-tags +tag the workspace tag @columns-and-tags +tagexec a word clicked in the workspace tag @columns-and-tags +col/ the columns @columns-and-tags + / column ; rmdir closes it when empty @columns-and-tags + tag its tag + ctl its builtins (Delcol Joincol New Tty) + exec a word clicked in its tag +pane/ the panes @panes + new open it to make a pane; read answers the serial @panes + / pane ; rmdir closes it @panes + name the file name; write to rename @panes + body the text; a write appends, > replaces @panes + tag its path, then its words; a write replaces the words @panes + ctl builtins and ctl words, a line each @panes + addr the address data and xdata work on @addresses + dot the selection, as an address @addresses + limit where a forward search stops @addresses + data the text at addr; a write replaces it @addresses + xdata the text in addr's range only @addresses + sel the selected text; a write replaces it @panes + dirty 1 while the text differs from its file @flags + mark 0 or 1; a write marks an undo point @flags + scroll 0 or 1; a write scrolls the pane @flags + errors write-only: text for the directory's +Errors @panes + event the pane's clicks and keys, as acme's event file @event + look a right click at this pane @look-and-exec + exec a middle click at this pane @look-and-exec + tagexec a word clicked in this pane's tag @look-and-exec + pty/ terminals only @pty + ctl winsize, sig, exec @pty + status cols rows busy @pty + data the live stream: bytes in as typed, output out @pty + run write a command line; read: exit N, then its output @pty +os/ the host filesystem @mounts +src/ the editor's sources (only with -Dembed-sources=true) @mounts +```) Panes and columns are named by serials the editor gives: stable while they live, never reused (so they can have gaps). Nothing is created by a listing, stat, walk or read: diff --git a/docs/typ/style.typ b/docs/typ/style.typ index 065cc210..2f63f3b2 100644 --- a/docs/typ/style.typ +++ b/docs/typ/style.typ @@ -33,6 +33,7 @@ reference: ("reference", none), themes: ("themes", none), building: ("building", none), + builtins: ("builtins", none), tags: ("guide", none), fs: ("reference", none), config: ("guide", "config"), @@ -55,6 +56,7 @@ (id: "cheatsheet", title: "Cheatsheet", file: "cheatsheet.typ"), (id: "scripting", title: "Scripting", file: "scripting.typ"), (id: "reference", title: "Reference", file: "reference.typ"), + (id: "builtins", title: "Builtins", file: "builtins.typ"), (id: "themes", title: "Themes", file: "themes.typ"), (id: "building", title: "Building, for contributors", file: "building.typ"), ) @@ -174,9 +176,52 @@ ((mouse((held,)),) + clicks.map(c => mouse((held, c)))).join(arrow) } -/// A tag word or builtin, as it sits in a tag. -#let word(w) = context if html-out() { span("word", raw(w)) } else { - box(fill: palette.tag-bg, inset: (x: 1.4pt, y: 0pt), outset: (y: 1.4pt), m(w, fill: palette.tag-fg)) +/// A tag word or builtin, drawn as a thing to click: the tag's ground and +/// ink in the tag's monospace, over a rule. Look and Exec take acme's look +/// and exec sweep colours (green and red, src/themes/acme.zig) for the +/// rule; every other word the tag's box colour. In HTML a , so a text browser still shows the plain word. +#let word-accent = (Look: rgb("#006600"), Exec: rgb("#aa0000")) + +/// Every builtin of either build, written by `zig build builtins-json` +/// from the registry and the Help rows (src/builtins_json.zig), a file per +/// build: name, leader, also (Help's other shortcuts), arg, scope, setting, +/// choices, doc. Merged here, each with `platforms`: "both", "tty" (the +/// terminal only) or "gui" (the window only). +#let builtin-data = { + let tty = json("builtins-tty.json") + let gui = json("builtins-gui.json") + let in-tty = tty.map(b => b.name) + let in-gui = gui.map(b => b.name) + let all = (tty + gui.filter(b => b.name not in in-tty)).sorted(key: b => b.name) + all.map(b => { + b.insert("platforms", if b.name in in-tty and b.name in in-gui { "both" } else if b.name in in-tty { "tty" } else { "gui" }) + b + }) +} +#let builtin-names = builtin-data.map(b => b.name) + +#let word-chip(w) = context if html-out() { + let base = w.split("+").first() + let kind = if base == "Look" { " look" } else if base == "Exec" { " exec" } else { "" } + html.elem("code", attrs: (class: "word" + kind), w) +} else { + let rule = word-accent.at(w.split("+").first(), default: palette.grip) + box( + fill: palette.tag-bg, inset: (x: 1.4pt, y: 0pt), outset: (y: 1.4pt), + stroke: (bottom: 0.6pt + rule), + m(w, fill: palette.tag-fg), + ) +} + +/// A builtin's word links to its glossary entry wherever the glossary is +/// part of the same output (the book, the site); elsewhere it is the chip. +#let word(w) = context { + let base = w.split("+").first() + let target = label("builtin-" + base) + if doc-links.get() and base in builtin-names and query(target).len() > 0 { + link(target, word-chip(w)) + } else { word-chip(w) } } /// A whole tagline: its grip, the path, then its words. @@ -299,3 +344,173 @@ }) }) } + +/// The newcomer's words, first in the glossary; every other builtin goes +/// under its group below. Each must be in builtins.json. +#let everyday = ("Look", "Exec", "Save", "Undo", "Redo", "New", "Newcol", "Del", "Delcol", + "Tty", "Kill", "Find", "Grep", "Recent", "Dump", "Restore", "Exit", "Help", "Tutor", "Themes", "Config") +/// Debugging and developer words, last whatever their leader path. +#let internals = ("Debug", "EffectCode", "Lspwhy", "Messages", "DumpConfig", "DumpThemes") + +/// The glossary's groups, in order: by the leader path's first key, the +/// way Help groups them, then settings, the words with no path, internals. +#let builtin-groups = ( + (title: "Files", keys: ("f",)), + (title: "Panes and columns", keys: ("c", "d")), + (title: "Moving and jumps", keys: ("w", "j")), + (title: "Terminals", keys: ("n",)), + (title: "Language server", keys: ("l",)), + (title: "Sessions", keys: ("s", "q")), + (title: "Help", keys: ("h", "?")), + (title: "Clipboard", keys: ("y", "Y", "p", "P", "R")), + (title: "Toggles", keys: ("t",)), + (title: "Settings and themes", keys: "setting"), + (title: "Animations", keys: ("a",)), + (title: "Other words", keys: "none"), +) + +#let group-of(b) = { + if b.name in internals { return "internals" } + if b.setting { return "setting" } + if b.leader == none { return "none" } + b.leader.split(" ").at(1) +} + +/// Help spells a shortcut its own way (C-w left, right-click, topbar); +/// this draws it as the docs do. +#let shortcut(s) = { + if s == "topbar" { return [in the workspace tag] } + if s == "middle-click" { return btn("B2") } + if s == "right-click" { return btn("B3") } + if s == "left-click" { return btn("B1") } + let names = (enter: "Enter", tab: "Tab", escape: "Esc", left: "Left", right: "Right", up: "Up", down: "Down", + home: "Home", end: "End", backspace: "Backspace", delete: "Delete", page_up: "PgUp", page_down: "PgDn") + key(s.split(" ").map(t => { + let mods = "" + while t.len() > 2 and t.at(1) == "-" and t.at(0) in ("C", "A", "S") { + mods += (C: "Ctrl-", A: "Alt-", S: "Shift-").at(t.at(0)) + t = t.slice(2) + } + mods + names.at(t, default: t) + }).join(" ")) +} + +/// A doc comment's text, its `code` spans set as code. +#let prose(t) = t.split("`").enumerate().map(((i, part)) => if calc.odd(i) { raw(part) } else { part }).join() + +#let builtin-entry(b) = [ + #heading(depth: 2, raw(b.name)) #label("builtin-" + b.name) + #let keys = (if b.leader != none { (key(b.leader),) } else { () }) + b.also.map(shortcut) + #if b.platforms != "both" [#emph(if b.platforms == "gui" [window only] else [terminal only]) · ] + #if keys.len() > 0 [#keys.join([, ]) · ] + #if b.choices != none [#raw(b.choices.replace(", ", "|")) · ] else if b.arg [takes an argument · ] + #prose(b.doc) +] + +/// The glossary: everyday words first, then the groups, then internals, +/// each alphabetical. A level-1 heading per group in the content file. +#let builtin-glossary() = { + let by-name = (:) + for b in builtin-data { by-name.insert(b.name, b) } + [= Everyday ] + for n in everyday.sorted() { builtin-entry(by-name.at(n)) } + let rest = builtin-data.filter(b => b.name not in everyday) + for g in builtin-groups { + let members = rest.filter(b => { + let k = group-of(b) + if type(g.keys) == str { k == g.keys } else { k in g.keys } + }) + if members.len() > 0 { + heading(depth: 1, g.title) + for b in members { builtin-entry(b) } + } + } + let inner = rest.filter(b => group-of(b) == "internals") + if inner.len() > 0 { + [= Debugging and internals] + for b in inner { builtin-entry(b) } + } + // a builtin no group took is a bug in builtin-groups, not a silent drop + let placed = everyday + rest.filter(b => { + let k = group-of(b) + k == "internals" or builtin-groups.any(g => if type(g.keys) == str { k == g.keys } else { k in g.keys }) + }).map(b => b.name) + for b in builtin-data { assert(b.name in placed, message: "builtin " + b.name + " is in no glossary group") } + // last, every word at once, A to Z, each a link to its entry + [= All builtins, A–Z ] + context if html-out() { + html.elem("p", attrs: (class: "all-words"), + builtin-data.map(b => link(label("builtin-" + b.name), word-chip(b.name))).join(" ")) + } else { + par(builtin-data.map(b => link(label("builtin-" + b.name), word-chip(b.name))).join(h(0.4em))) + } +} + +/// A directory tree drawn as `tree` draws one. `spec` is a raw block, a +/// line per file: two spaces of indent per level, the name (a directory +/// ends in `/`), two or more spaces, a one-line description, and an +/// optional `@label` naming the section that documents it, which becomes +/// a link wherever that section is in the same output. A description may +/// call #word, #key, #keys or #btn. src/config.zig's +/// test reads the same block in reference.typ against the served tree. +#let fstree(spec, root: "/") = { + // a description is text, unless it calls #word, #key or #btn + let said(d) = if d.contains("#") { eval(d, mode: "markup", scope: (word: word, key: key, keys: keys, btn: btn)) } else { d } + let rows = spec.text.split("\n").filter(l => l.trim() != "").map(l => { + let depth = calc.quo(l.len() - l.trim(at: start).len(), 2) + let m = l.trim().match(regex("^(\S+)(?:\s{2,}(.*?))?(?:\s+@([a-z0-9-]+))?$")) + (depth: depth, name: m.captures.at(0), desc: m.captures.at(1), anchor: m.captures.at(2)) + }) + // the connector for each row: is each ancestor, and the row itself, the + // last among its siblings? + let last(i) = { + let d = rows.at(i).depth + for j in range(i + 1, rows.len()) { + if rows.at(j).depth < d { return true } + if rows.at(j).depth == d { return false } + } + true + } + let lasts = range(rows.len()).map(last) + let prefix(i) = { + let d = rows.at(i).depth + let out = "" + // for each ancestor depth, the nearest row above at that depth + for k in range(d) { + let a = range(i).rev().find(j => rows.at(j).depth == k) + out += if lasts.at(a) { " " } else { "│ " } + } + out + if lasts.at(i) { "└── " } else { "├── " } + } + let named(r) = context { + let t = if r.anchor != none { label(r.anchor) } else { none } + if t != none and query(t).len() > 0 { link(t, r.name) } else { r.name } + } + let width = calc.max(..range(rows.len()).map(i => prefix(i).len() + rows.at(i).name.len())) + context if html-out() { + let nl = html.elem("span", attrs: (class: "nl"), "\n") + html.elem("pre", attrs: (class: "fstree", style: "--name:" + str(width + 2) + "ch"), { + html.elem("span", attrs: (class: "row root"), [#html.elem("span", attrs: (class: "name dir"), root)#nl]) + for (i, r) in rows.enumerate() { + let pad = " " * (width - prefix(i).clusters().len() - r.name.len() + 2) + html.elem("span", attrs: (class: "row"), { + html.elem("span", attrs: (class: if r.name.ends-with("/") { "name dir" } else { "name" }), + [#html.elem("span", attrs: (class: "branch"), prefix(i))#named(r)#pad]) + if r.desc != none { + html.elem("span", attrs: (class: "desc", style: "--cols:" + str(prefix(i).clusters().len())), said(r.desc)) + } + nl + }) + } + }) + } else { + set text(font: mono, size: 0.82em) + block(width: 100%, grid(columns: (auto, 1fr), column-gutter: 1.2em, row-gutter: 0pt, inset: (y: 0.12em), + text(weight: "bold", fill: palette.grip, root), [], + ..rows.enumerate().map(((i, r)) => ( + [#text(fill: palette.rule, prefix(i))#text(fill: if r.name.ends-with("/") { palette.grip } else { palette.ink }, + weight: if r.name.ends-with("/") { "bold" } else { "regular" }, named(r))], + text(font: "Libertinus Serif", size: 1.2em, fill: palette.tag-fg, if r.desc == none { [] } else { said(r.desc) }), + )).flatten())) + } +} diff --git a/src/builtins_json.zig b/src/builtins_json.zig new file mode 100644 index 00000000..7f998388 --- /dev/null +++ b/src/builtins_json.zig @@ -0,0 +1,97 @@ +//! Every builtin as JSON, for the docs' glossary (docs/typ/builtins-tty.json +//! and builtins-gui.json, a build's list each; style.typ merges them): +//! the rows the `Help` builtin draws (pardes.builtin_rows: the leader path +//! and the other shortcuts) with what /commands says of each word (its doc +//! comment's first sentence, or a setting's doc). One source, so the +//! glossary and Help cannot drift; the test below fails when the committed +//! copy is stale, and `zig build builtins-json` rewrites it. +const std = @import("std"); +const pardes = @import("pardes.zig"); +const builtins = @import("builtins.zig"); +const config = @import("config.zig"); +const ctl = @import("ninep/ctl.zig"); + +fn str(w: *std.Io.Writer, s: []const u8) !void { + try w.writeByte('"'); + for (s) |c| switch (c) { + '"' => try w.writeAll("\\\""), + '\\' => try w.writeAll("\\\\"), + '\n' => try w.writeAll("\\n"), + 0...9, 11...0x1f => try w.print("\\u{x:0>4}", .{c}), + else => try w.writeByte(c), + }; + try w.writeByte('"'); +} + +const Entry = struct { name: []const u8, row: usize }; + +fn lessName(_: void, a: Entry, b: Entry) bool { + return std.mem.lessThan(u8, a.name, b.name); +} + +pub fn write(w: *std.Io.Writer) !void { + var order: [pardes.builtin_rows.len]Entry = undefined; + for (pardes.builtin_rows, 0..) |row, i| order[i] = .{ .name = @tagName(row.cmd), .row = i }; + std.mem.sort(Entry, &order, {}, lessName); + try w.writeAll("[\n"); + for (order, 0..) |e, n| { + const row = pardes.builtin_rows[e.row]; + const b = row.cmd; + const name = @tagName(b); + try w.writeAll(" {\"name\": "); + try str(w, name); + try w.writeAll(", \"leader\": "); + if (row.path) |p| { + try w.writeAll("\"SPC"); + for (p) |c| try w.print(" {c}", .{c}); + try w.writeByte('"'); + } else try w.writeAll("null"); + // Help's line ends in the other shortcuts, after the name's column. + try w.writeAll(", \"also\": ["); + const at = std.mem.indexOf(u8, row.line, name).? + name.len; + const rest = std.mem.trim(u8, row.line[at..], " "); + var parts = std.mem.splitSequence(u8, rest, ", "); + var first = true; + while (parts.next()) |part| if (part.len > 0) { + if (!first) try w.writeAll(", "); + first = false; + try str(w, part); + }; + try w.writeAll("], \"arg\": "); + try w.writeAll(if (builtins.registry.takesArg(b)) "true" else "false"); + try w.writeAll(", \"scope\": "); + try str(w, if (b == .Edit) "both" else if (builtins.registry.scope(b) == .session) "root" else "pane"); + const setting = config.Runtime.find(name); + try w.writeAll(", \"setting\": "); + try w.writeAll(if (setting != null) "true" else "false"); + try w.writeAll(", \"choices\": "); + if (setting) |s| if (config.Runtime.choices(s.action)) |v| try str(w, v) else try w.writeAll("null") else try w.writeAll("null"); + var buf: [2048]u8 = undefined; + const doc = if (setting) |s| s.doc else ctl.summaryOf(name, &buf); + try w.writeAll(", \"doc\": "); + try str(w, doc); + try w.writeAll(if (n + 1 < order.len) "},\n" else "}\n"); + } + try w.writeAll("]\n"); +} + +test "docs/typ/builtins-.json is what the registry says now" { + // a terminal build checks its file, a window build its own + const file = switch (pardes.platform) { + .tty => "builtins-tty.json", + .gui => "builtins-gui.json", + else => return error.SkipZigTest, + }; + const gpa = std.testing.allocator; + var out: std.Io.Writer.Allocating = .init(gpa); + defer out.deinit(); + try write(&out.writer); + var dir = try std.Io.Dir.cwd().openDir(std.testing.io, @import("doc_typ").dir, .{}); + defer dir.close(std.testing.io); + const committed = try dir.readFileAlloc(std.testing.io, file, gpa, .limited(1 << 20)); + defer gpa.free(committed); + if (!std.mem.eql(u8, committed, out.written())) { + std.debug.print("docs/typ/{s} is stale: run `zig build builtins-json -Dplatform={s} --prefix

`\n", .{ file, @tagName(pardes.platform) }); + return error.StaleBuiltinsJson; + } +} diff --git a/src/config.zig b/src/config.zig index e9595a2a..f83e7945 100644 --- a/src/config.zig +++ b/src/config.zig @@ -2101,9 +2101,16 @@ const doc_typ = struct { } } + /// The other build's builtins (docs/typ/builtins-*.json), so the docs + /// may name a window-only word in a terminal build's test, and back. + var other_build: []const u8 = ""; + fn word(w: []const u8) bool { const name = w[0 .. std.mem.indexOfScalar(u8, w, '+') orelse w.len]; - return std.meta.stringToEnum(Builtin, name) != null; + if (std.meta.stringToEnum(Builtin, name) != null) return true; + var buf: [96]u8 = undefined; + const needle = std.fmt.bufPrint(&buf, "{{\"name\": \"{s}\",", .{name}) catch return false; + return std.mem.indexOf(u8, other_build, needle) != null; } fn chord(tok: []const u8) ?Chord { @@ -2195,6 +2202,10 @@ test "docs/typ names only words, keys and default tags that exist" { var dir = try std.Io.Dir.cwd().openDir(io, @import("doc_typ").dir, .{ .iterate = true }); defer dir.close(io); var found: [3]std.ArrayList([]const u8) = @splat(.empty); + for ([_][]const u8{ "builtins-tty.json", "builtins-gui.json" }) |f| { + const text = dir.readFileAlloc(io, f, gpa, .limited(1 << 20)) catch continue; + doc_typ.other_build = try std.mem.concat(gpa, u8, &.{ doc_typ.other_build, text }); + } var it = dir.iterate(); while (try it.next(io)) |entry| if (entry.kind == .file and std.mem.endsWith(u8, entry.name, ".typ")) { const source = try dir.readFileAlloc(io, entry.name, gpa, .limited(1 << 20)); @@ -2331,3 +2342,61 @@ test "the tutor names only words, keys, paths and default tags that exist" { } } } + +test "reference.typ's #fstree is the tree the session serves, file for file" { + const tree = @import("ninep/tree.zig"); + var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); + defer arena.deinit(); + const gpa = arena.allocator(); + const io = std.testing.io; + var dir = try std.Io.Dir.cwd().openDir(io, @import("doc_typ").dir, .{}); + defer dir.close(io); + const source = try dir.readFileAlloc(io, "reference.typ", gpa, .limited(1 << 20)); + const open = "#fstree(```"; + const start = (std.mem.indexOf(u8, source, open) orelse return error.NoFsTree) + open.len; + const end = std.mem.indexOfPos(u8, source, start, "```)") orelse return error.NoFsTree; + + // what the reference draws: a path per line, from its indent + var drawn: std.StringArrayHashMapUnmanaged(void) = .empty; + var stack: [8][]const u8 = undefined; + var lines = std.mem.tokenizeScalar(u8, source[start..end], '\n'); + while (lines.next()) |line| { + const body = std.mem.trimStart(u8, line, " "); + if (body.len == 0) continue; + const depth = (line.len - body.len) / 2; + const name = body[0 .. std.mem.indexOfScalar(u8, body, ' ') orelse body.len]; + stack[depth] = name; + var path: std.ArrayList(u8) = .empty; + for (stack[0 .. depth + 1]) |part| try path.appendSlice(gpa, part); + try drawn.put(gpa, path.items, {}); + } + + // what the session serves: tree.zig's files, and fs.zig's os/ and src/ + var served: std.StringArrayHashMapUnmanaged(void) = .empty; + for (std.enums.values(tree.TopFile)) |f| switch (f) { + .root => {}, + .new => try served.put(gpa, "pane/new", {}), + else => try served.put(gpa, if (f.dir()) try std.fmt.allocPrint(gpa, "{s}/", .{f.fileName()}) else f.fileName(), {}), + }; + try served.put(gpa, "os/", {}); + try served.put(gpa, "src/", {}); + try served.put(gpa, "pane//", {}); + for (std.enums.values(tree.PaneFile)) |f| if (f != .dir) { + const under = if (f.inPty() and f != .pty) "pane//pty/" else "pane//"; + try served.put(gpa, try std.fmt.allocPrint(gpa, "{s}{s}{s}", .{ under, f.fileName(), if (f.isDir()) "/" else "" }), {}); + }; + try served.put(gpa, "col//", {}); + for (std.enums.values(tree.ColFile)) |f| if (f != .dir) + try served.put(gpa, try std.fmt.allocPrint(gpa, "col//{s}", .{f.fileName()}), {}); + + var drift = false; + for (served.keys()) |k| if (!drawn.contains(k)) { + std.debug.print("reference.typ's tree lacks {s}\n", .{k}); + drift = true; + }; + for (drawn.keys()) |k| if (!served.contains(k)) { + std.debug.print("reference.typ's tree has {s}, which the session does not serve\n", .{k}); + drift = true; + }; + if (drift) return error.FsTreeDrift; +} diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig index adfc91fa..f2490e38 100644 --- a/src/ninep/ctl.zig +++ b/src/ninep/ctl.zig @@ -789,7 +789,7 @@ fn sizeOf(line: []const u8) ?[2]u16 { /// itself, so a new builtin is listed the moment it exists. /// A builtin's doc comment, its first sentence, from the source itself: a /// line of /commands says what each word does without a second copy of it. -fn summaryOf(word: []const u8, buf: []u8) []const u8 { +pub fn summaryOf(word: []const u8, buf: []u8) []const u8 { const source = @embedFile("../builtins.zig"); var needle_buf: [64]u8 = undefined; const needle = std.fmt.bufPrint(&needle_buf, "\npub const {s} = struct", .{word}) catch return ""; diff --git a/src/pardes.zig b/src/pardes.zig index 38373266..310a4b56 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -46,6 +46,8 @@ pub const Region = @import("surface.zig").Region; pub const Chrome = @import("surface.zig").Chrome; pub const MAX_REGIONS = @import("surface.zig").MAX_REGIONS; pub const builtins = @import("builtins.zig"); +/// Every builtin as JSON, for the docs (tools/gen_builtins_json.zig). +pub const builtins_json = @import("builtins_json.zig"); const limits = memory.limits; const selection_pipe = @import("selection_pipe.zig"); pub const config = @import("config.zig"); @@ -477,6 +479,7 @@ pub const Loc = struct { test { _ = @import("tagline.zig"); + _ = @import("builtins_json.zig"); _ = @import("exec.zig"); _ = @import("look.zig"); _ = @import("sam_edit.zig"); diff --git a/tools/gen_builtins_json.zig b/tools/gen_builtins_json.zig new file mode 100644 index 00000000..71df5307 --- /dev/null +++ b/tools/gen_builtins_json.zig @@ -0,0 +1,14 @@ +//! Writes every builtin as JSON to the path given (docs/typ/builtins-.json, +//! by way of `zig build builtins-json`). +const std = @import("std"); +const pardes = @import("pardes"); + +pub fn main(init: std.process.Init) !void { + const args = try init.minimal.args.toSlice(init.arena.allocator()); + var file = try std.Io.Dir.cwd().createFile(init.io, args[1], .{}); + defer file.close(init.io); + var buf: [4096]u8 = undefined; + var w = file.writer(init.io, &buf); + try pardes.builtins_json.write(&w.interface); + try w.interface.flush(); +} -- cgit v1.3 From bc3d18d27f9fc1155db7fac3946c4d38774f9e65 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 21 Oct 2026 14:35:15 -0300 Subject: Build with Zig 0.17 ghostty, libvaxis and uucode move to ghostty's 0.17 pins, cloud9 to its 0.17 main, SDL to castholm's release-3.4.x (3.4.18), zstbi and tree-sitter to forks with 0.17 build files (see build.zig.zon). A bare zig build copies the binaries into ~/.local/bin (-Dhome-install=false leaves it out): 0.17 keeps the prefix from build scripts. A terminal's edited copy goes when the program clears the screen. tinywin.snap is gone; perf baselines are re-recorded. Co-Authored-By: Claude Opus 5.5 --- README.md | 2 +- build.zig | 289 +++++++++++++++----------------- build.zig.zon | 45 ++--- build/snap.zig | 6 +- docs/typ/building.typ | 12 +- docs/typ/install.typ | 2 +- mupdf.zig | 6 +- src/9p_io.zig | 14 +- src/CHANGELOG.md | 8 + src/Layer.zig | 4 +- src/Messages.zig | 14 +- src/TerminalImages.zig | 82 ++++++++- src/builtins.zig | 26 +-- src/colors.zig | 70 ++++---- src/config.zig | 21 ++- src/detached/client.zig | 8 +- src/detached/wire.zig | 39 +++-- src/draw.zig | 22 +-- src/dump.zig | 24 +-- src/esp32p4.zig | 2 +- src/esp32p4/input_rescue.zig | 2 +- src/esp32p4/selftest.zig | 2 +- src/fs.zig | 8 +- src/gui/Post.zig | 14 +- src/gui/gui.zig | 20 +-- src/host_io.zig | 14 +- src/image.zig | 6 +- src/linux/v9fs.zig | 4 +- src/locations.zig | 24 +-- src/look.zig | 6 +- src/lsp/lsp.zig | 2 +- src/lsp/lsp_client.zig | 2 +- src/macos.zig | 26 +-- src/main.zig | 6 + src/memory.zig | 2 +- src/modal.zig | 2 +- src/ninep/addr.zig | 2 +- src/ninep/cols.zig | 10 +- src/ninep/ctl.zig | 14 +- src/ninep/events.zig | 10 +- src/ninep/pane.zig | 11 +- src/ninep/pty.zig | 6 +- src/ninep/screen.zig | 2 +- src/ninep/tree.zig | 16 +- src/normal.zig | 2 +- src/pager.zig | 2 +- src/panes.zig | 2 +- src/pardes.zig | 32 ++-- src/pdf.zig | 10 +- src/regexp.zig | 12 +- src/sam_edit.zig | 2 +- src/syntax.zig | 2 +- src/terminal.zig | 30 +++- src/tty/tty.zig | 22 +-- test/deck/replay.zig | 5 +- test/deck/schema.zig | 10 +- test/e2e_harness.zig | 2 +- test/fs_bench.zig | 4 +- test/history.zig | 10 +- test/hxdiff.zig | 14 +- test/image_harness.zig | 2 +- test/lspbench.zig | 2 +- test/monkey.zig | 2 +- test/panes.zig | 50 +++--- test/pdf.zig | 8 +- test/pdf_scroll_bench.zig | 2 +- test/pdf_sections_bench.zig | 2 +- test/perf-baseline-gui-Debug.json | 1 - test/perf-baseline-gui-debug.json | 1 + test/perf-baseline-tty-Debug.json | 1 - test/perf-baseline-tty-ReleaseFast.json | 1 - test/perf-baseline-tty-debug.json | 1 + test/perf-baseline-tty-fast.json | 1 + test/perf.zig | 15 +- test/snapshot.zig | 40 ++--- test/snapshots/exec.golden | 8 +- test/snapshots/tinywin.golden | 83 --------- test/snapshots/tinywin.snap | 31 ---- test/unit_profile_test.zig | 7 +- tools/gen_themes.zig | 15 +- 80 files changed, 664 insertions(+), 677 deletions(-) delete mode 100644 test/perf-baseline-gui-Debug.json create mode 100644 test/perf-baseline-gui-debug.json delete mode 100644 test/perf-baseline-tty-Debug.json delete mode 100644 test/perf-baseline-tty-ReleaseFast.json create mode 100644 test/perf-baseline-tty-debug.json create mode 100644 test/perf-baseline-tty-fast.json delete mode 100644 test/snapshots/tinywin.golden delete mode 100644 test/snapshots/tinywin.snap (limited to 'tools') diff --git a/README.md b/README.md index 3a566d2a..0a03bdba 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ looks; the keys are helix's; every session is a virtual filesystem, served over 9P, that any program can drive. Get the source with `git clone https://git.sr.ht/~gbrls/pardes && cd pardes` -(also at https://git.0x4200.cafe/pardes). Install with Zig 0.16: +(also at https://git.0x4200.cafe/pardes). Install with Zig 0.17: `zig build -Dplatform=tty --prefix ~/.local` for `pardes` in a terminal, or `-Dplatform=gui` for the `pardes-gui` window. The terminal should report the mouse; Shift-Esc needs the kitty keyboard diff --git a/build.zig b/build.zig index 0246d55f..ddd41a03 100644 --- a/build.zig +++ b/build.zig @@ -59,13 +59,14 @@ pub fn build(b: *std.Build) void { const requested_platform = b.option(Platform, "platform", "which shell to build (tty, gui, web, macos, esp32p4); absent builds the tty cli and the SDL gui together"); const platform = requested_platform orelse .tty; const also_gui = requested_platform == null; - const home_install = also_gui and prefixIsUntouched(b); - if (home_install) { - if (b.graph.environ_map.get("HOME")) |home| { - b.resolveInstallPrefix(b.pathJoin(&.{ home, ".local" }), .{}); - std.debug.print("pardes: installing into {s} (override with --prefix)\n", .{b.install_prefix}); - } - } + // A bare `zig build` also copies the binaries into ~/.local/bin. Zig + // 0.17 keeps the prefix in the maker process, out of this script's + // reach, so `--prefix` no longer turns it off: -Dhome-install=false does. + const home_bin: ?[]const u8 = if (also_gui and (b.option(bool, "home-install", "a bare `zig build` also copies the binaries into ~/.local/bin (default: true)") orelse true)) + if (b.graph.environ_map.get("HOME")) |home| b.pathJoin(&.{ home, ".local", "bin" }) else null + else + null; + const home_install = home_bin != null; const esp32p4_target: std.Target.Query = .{ .cpu_arch = .riscv32, .os_tag = .freestanding, @@ -114,18 +115,18 @@ pub fn build(b: *std.Build) void { const is_web_target = target.result.cpu.arch == .wasm32 and target.result.os.tag == .freestanding; const is_esp32p4_target = target.result.cpu.arch == .riscv32 and target.result.os.tag == .freestanding; const optimize = if (is_web) - .ReleaseSmall - else if (is_esp32p4_target and requested_optimize == .Debug) - .ReleaseFast + .small + else if (is_esp32p4_target and requested_optimize == .debug) + .fast else requested_optimize; const test_build = b.step("test-build", "compile unit-test programs without running them"); const doc_typ_opts = b.addOptions(); - doc_typ_opts.addOption([]const u8, "dir", b.pathFromRoot("docs/typ")); + doc_typ_opts.addOptionPathUntracked("dir", b.path("docs/typ")); // The docs (docs/typ, docs/site): each output is one typst run, and each // reads docs/typ/builtins-*.json; `builtins-json` refreshes this build's from the // registry first (the tool is wired below, once the core module is). - const typst_bin: ?[]const u8 = b.findProgram(&.{"typst"}, &.{}) catch null; + const typst_bin: ?[]const u8 = b.findProgram(.{ .names = &.{"typst"} }); var doc_renders: [3]?*std.Build.Step.Run = @splat(null); const cheatsheet_step = b.step("cheatsheet", "render docs/typ/cheatsheet-a4.typ to /share/doc/pardes/cheatsheet.pdf (needs typst)"); const book_step = b.step("book", "render docs/typ/book.typ to /share/doc/pardes/pardes.pdf (needs typst)"); @@ -139,11 +140,13 @@ pub fn build(b: *std.Build) void { sheet.addFileArg(b.path("docs/typ/cheatsheet-a4.typ")); sheet.has_side_effects = true; cheatsheet_step.dependOn(&b.addInstallFile(sheet.addOutputFileArg("cheatsheet.pdf"), "share/doc/pardes/cheatsheet.pdf").step); - const book = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts", "--root", b.pathFromRoot(".") }); + const book = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts", "--root", "." }); + book.setCwd(b.path(".")); book.addFileArg(b.path("docs/typ/book.typ")); book.has_side_effects = true; book_step.dependOn(&b.addInstallFile(book.addOutputFileArg("pardes.pdf"), "share/doc/pardes/pardes.pdf").step); - const site = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", b.pathFromRoot(".") }); + const site = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", "." }); + site.setCwd(b.path(".")); site.addFileArg(b.path("docs/site/site.typ")); const site_dir = site.addOutputDirectoryArg("site"); site.has_side_effects = true; @@ -168,7 +171,7 @@ pub fn build(b: *std.Build) void { .root_source_file = b.path("test/unit_profile.zig"), }), }); - const c_optimize: std.builtin.OptimizeMode = if (optimize == .Debug) .ReleaseFast else optimize; + const c_optimize: std.lang.Optimize = if (optimize == .debug) .fast else optimize; const default_grammars: TreeSitterGrammars = if (is_web) .zig else if (is_esp32p4) .disabled else .full; const requested_grammars = b.option(TreeSitterGrammars, "tree-sitter", "tree-sitter grammar set: disabled, zig, minimal (c/c++/zig), full"); const tree_sitter_grammars = requested_grammars orelse default_grammars; @@ -321,7 +324,7 @@ pub fn build(b: *std.Build) void { .name = "pardes-gen-themes", .root_module = b.createModule(.{ .target = b.graph.host, - .optimize = .Debug, + .optimize = .debug, .root_source_file = b.path("tools/gen_themes.zig"), }), }); @@ -353,7 +356,7 @@ pub fn build(b: *std.Build) void { // `pardes ` alone, like a tarball build; -Dstamp-commit=true // stamps one anyway. const stamp_commit = b.option(bool, "stamp-commit", "embed the git commit in --version and crash records (default: release builds and the ~/.local install)") orelse - (optimize != .Debug or home_install); + (optimize != .debug or home_install); const shell_cfg: ShellConfig = .{ .tree_sitter_grammars = tree_sitter_grammars, .tracy = tracy != null, @@ -391,9 +394,7 @@ pub fn build(b: *std.Build) void { if (tree_sitter_grammars != .disabled) { const tree_sitter_mod = b.dependency("tree_sitter", .{ .target = target, .optimize = c_optimize }).module("tree_sitter"); if (is_web) { - const web_libc_include: std.Build.LazyPath = .{ - .cwd_relative = b.path("src/web/libc/include").getPath(b), - }; + const web_libc_include = b.path("src/web/libc/include"); for (tree_sitter_mod.link_objects.items) |link_object| switch (link_object) { .other_step => |lib| { lib.root_module.link_libc = false; @@ -417,12 +418,11 @@ pub fn build(b: *std.Build) void { (tree_sitter_grammars == .zig and g.tier == .zig)) { const dep = b.dependency(g.dep, .{}); - const query_path = dep.path(g.query); - const query = std.Io.Dir.cwd().readFileAlloc(io, query_path.getPath(b), b.allocator, .limited(0x100000)) catch @panic("read " ++ g.name ++ " highlights"); + const query = configureRead(b, io, dep.builder.root, g.query, 0x100000) catch @panic("read " ++ g.name ++ " highlights"); ts_queries.addOption([]const u8, g.name ++ "_highlights", query); // helix's textobject queries, vendored (vendor/queries); a // grammar without one gets none - const objects = std.Io.Dir.cwd().readFileAlloc(io, b.pathFromRoot("vendor/queries/" ++ g.name ++ "/textobjects.scm"), b.allocator, .limited(0x100000)) catch ""; + const objects = configureRead(b, io, b.root, "vendor/queries/" ++ g.name ++ "/textobjects.scm", 0x100000) catch ""; ts_queries.addOption([]const u8, g.name ++ "_textobjects", objects); const lib = b.addLibrary(.{ @@ -438,8 +438,9 @@ pub fn build(b: *std.Build) void { const ts_cflags = [_][]const u8{ "-fno-sanitize=function", "-DTREE_SITTER_REUSE_ALLOCATOR", + // Relative to the build root, the compiler's working directory. "-include", - b.path("src/tree_sitter_heap.h").getPath(b), + "src/tree_sitter_heap.h", }; lib.root_module.addCSourceFile(.{ .file = dep.path(g.src ++ "/parser.c"), .flags = &ts_cflags }); if (g.scanner) lib.root_module.addCSourceFile(.{ .file = dep.path(g.src ++ "/scanner.c"), .flags = &ts_cflags }); @@ -467,7 +468,7 @@ pub fn build(b: *std.Build) void { // (src/regexp.zig). A bump that moves the anchor stops the build. const mvzr_mod = mvzr: { const dep = b.dependency("mvzr", .{ .target = target, .optimize = optimize }); - const src = std.Io.Dir.cwd().readFileAlloc(io, dep.path("src/mvzr.zig").getPath(b), b.allocator, .limited(1 << 20)) catch @panic("read mvzr"); + const src = configureRead(b, io, dep.builder.root, "src/mvzr.zig", 1 << 20) catch @panic("read mvzr"); const anchor = "fn matchPattern(patt: []const RegOp, sets: []const CharSet, haystack: []const u8, i_in: usize) ?OpMatch {\n"; const at = (std.mem.indexOf(u8, src, anchor) orelse @panic("mvzr's matchPattern changed: redo its step budget in build.zig")) + anchor.len; const spend = @@ -536,7 +537,17 @@ pub fn build(b: *std.Build) void { \\ ; if (std.mem.count(u8, backed, end_anchor) != 1) @panic("mvzr's parser changed: redo its `$` before `|` in build.zig"); - const patched = std.mem.replaceOwned(u8, b.allocator, backed, end_anchor, end_before_alt) catch @panic("OOM"); + var patched = std.mem.replaceOwned(u8, b.allocator, backed, end_anchor, end_before_alt) catch @panic("OOM"); + // Zig 0.17 removed `**`; mvzr still has it (its PR #16 replaces it upstream). + for ([_][3][]const u8{ + .{ "[1]RegOp{.{ .unused = {} }} ** ops", "@splat(.{ .unused = {} })", "1" }, + .{ "[1]CharSet{.{ .low = 0, .hi = 0 }} ** char_sets", "@splat(.{ .low = 0, .hi = 0 })", "1" }, + .{ "\"a\" ** 2048", "&@as([2048]u8, @splat('a'))", "2" }, + .{ "\"12345,\" ** 255", "std.mem.asBytes(&@as([255][6]u8, @splat(\"12345,\".*)))", "1" }, + }) |edit| { + if (std.mem.count(u8, patched, edit[0]) != std.fmt.parseInt(usize, edit[2], 10) catch unreachable) std.debug.panic("mvzr changed at `{s}`: redo its `**` patch in build.zig", .{edit[0]}); + patched = std.mem.replaceOwned(u8, b.allocator, patched, edit[0], edit[1]) catch @panic("OOM"); + } break :mvzr b.createModule(.{ .root_source_file = b.addWriteFiles().add("mvzr.zig", patched), .target = target, .optimize = optimize }); }; @@ -582,6 +593,7 @@ pub fn build(b: *std.Build) void { }); mupdf.linkTo(mupdf_mod); mupdf_mod.addImport("c_heap", c_heap_mod); + mupdf_mod.addImport("pdf_c", b.addTranslateC(.{ .root_source_file = b.path("src/pdf_bridge.h"), .target = target, .optimize = optimize }).createModule()); mupdf_mod.addIncludePath(b.path("src")); mupdf_mod.addCSourceFile(.{ .file = b.path("src/pdf_bridge.c"), @@ -599,12 +611,13 @@ pub fn build(b: *std.Build) void { const pdf_bench_mod = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("src/pdf.zig"), .link_libc = true, }); mupdf.linkTo(pdf_bench_mod); pdf_bench_mod.addImport("c_heap", c_heap_mod); + pdf_bench_mod.addImport("pdf_c", b.addTranslateC(.{ .root_source_file = b.path("src/pdf_bridge.h"), .target = target, .optimize = .fast }).createModule()); pdf_bench_mod.addIncludePath(b.path("src")); pdf_bench_mod.addCSourceFile(.{ .file = b.path("src/pdf_bridge.c"), @@ -614,14 +627,14 @@ pub fn build(b: *std.Build) void { .name = "pardes-pdf-bench", .root_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/pdf_bench.zig"), .link_libc = true, }), }); pdf_bench.root_module.addImport("mupdf", pdf_bench_mod); const run_pdf_bench = b.addRunArtifact(pdf_bench); - if (b.args) |args| run_pdf_bench.addArgs(args); + run_pdf_bench.addPassthruArgs(); run_pdf_bench.setCwd(b.path(".")); pdf_bench_step.dependOn(&run_pdf_bench.step); @@ -629,7 +642,7 @@ pub fn build(b: *std.Build) void { .name = "pardes-pdf-sections-bench", .root_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/pdf_sections_bench.zig"), .link_libc = true, }), @@ -637,10 +650,10 @@ pub fn build(b: *std.Build) void { pdf_sections_bench.root_module.addImport("pardes", core_module); pdf_sections_bench.root_module.addImport("mupdf", mupdf_mod); const sections_bench_opts = b.addOptions(); - sections_bench_opts.addOption(bool, "release_fast_core", optimize == .ReleaseFast); + sections_bench_opts.addOption(bool, "release_fast_core", optimize == .fast); pdf_sections_bench.root_module.addOptions("pdf_sections_bench_config", sections_bench_opts); const run_pdf_sections_bench = b.addRunArtifact(pdf_sections_bench); - if (b.args) |args| run_pdf_sections_bench.addArgs(args); + run_pdf_sections_bench.addPassthruArgs(); run_pdf_sections_bench.setCwd(b.path(".")); pdf_sections_bench_step.dependOn(&run_pdf_sections_bench.step); @@ -648,7 +661,7 @@ pub fn build(b: *std.Build) void { .name = "pardes-pdf-pointer-bench", .root_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/pdf_pointer_bench.zig"), .link_libc = true, }), @@ -656,7 +669,7 @@ pub fn build(b: *std.Build) void { pdf_pointer_bench.root_module.addImport("pardes", core_module); pdf_pointer_bench.root_module.addImport("mupdf", mupdf_mod); const run_pdf_pointer_bench = b.addRunArtifact(pdf_pointer_bench); - if (b.args) |args| run_pdf_pointer_bench.addArgs(args); + run_pdf_pointer_bench.addPassthruArgs(); run_pdf_pointer_bench.setCwd(b.path(".")); pdf_pointer_bench_step.dependOn(&run_pdf_pointer_bench.step); @@ -672,11 +685,11 @@ pub fn build(b: *std.Build) void { pdf_scroll_bench.root_module.addImport("pardes", core_module); pdf_scroll_bench.root_module.addImport("mupdf", mupdf_mod); const scroll_bench_opts = b.addOptions(); - scroll_bench_opts.addOption(bool, "release_fast_core", optimize == .ReleaseFast); + scroll_bench_opts.addOption(bool, "release_fast_core", optimize == .fast); scroll_bench_opts.addOption([]const u8, "core_optimize", @tagName(optimize)); pdf_scroll_bench.root_module.addOptions("pdf_scroll_bench_config", scroll_bench_opts); const run_pdf_scroll_bench = b.addRunArtifact(pdf_scroll_bench); - if (b.args) |args| run_pdf_scroll_bench.addArgs(args); + run_pdf_scroll_bench.addPassthruArgs(); run_pdf_scroll_bench.setCwd(b.path(".")); pdf_scroll_bench_step.dependOn(&run_pdf_scroll_bench.step); } @@ -712,15 +725,13 @@ pub fn build(b: *std.Build) void { // - An X10 mouse report and a kitty graphics reply cut short by a read // wait for their rest: the first became three bytes of text, the // second sliced past its input. - // - A malformed color or clipboard reply is dropped instead of failing - // the parse, which stopped input; so is a byte no UTF-8 starts with. - // - An OSC reply ends at its first terminator: one ended by BEL ran on to - // the next sequence's ESC and left what lay between as text. + // - A byte no UTF-8 starts with is dropped instead of failing the parse, + // which stopped input. (vaxis itself now drops a malformed color or + // clipboard reply and ends an OSC at its first terminator.) // - A device report's fields are sought in the sequence, not past it. // A bump that moves an anchor stops the build. { - const parser_path = vaxis_dep.path("src/Parser.zig").getPath(b); - var src = std.Io.Dir.cwd().readFileAlloc(io, parser_path, b.allocator, .limited(1 << 20)) catch @panic("read vaxis Parser.zig"); + var src = configureRead(b, io, vaxis_dep.builder.root, "src/Parser.zig", 1 << 20) catch @panic("read vaxis Parser.zig"); const edits = [_]struct { anchor: []const u8, with: []const u8, count: usize = 1 }{ .{ .anchor = @@ -731,7 +742,7 @@ pub fn build(b: *std.Build) void { \\ 0x5F => return parseApc(input), \\ // pardes's patch (its build.zig): ESC before a key's sequence is Alt on the key. \\ 0x1B => if (input.len > 2 and (input[2] == '[' or input[2] == 'O')) { - \\ var inner = if (input[2] == '[') parseCsi(input[1..], &self.buf) else parseSs3(input[1..]); + \\ var inner = if (input[2] == '[') parseCsi(input[1..], &self.buf, self.cursor_position_requests) else parseSs3(input[1..]); \\ if (inner.n == 0) return inner; \\ if (inner.event) |*event| switch (event.*) { \\ .key_press, .key_release => |*key| key.mods.alt = true, @@ -765,71 +776,17 @@ pub fn build(b: *std.Build) void { \\ switch (input[2]) { , }, - .{ - .anchor = - \\ const esc_result = skipUntilST(input); - \\ if (esc_result.n > 0) break :blk esc_result.n; - \\ - \\ // No escape, could be BEL terminated - \\ const bel = std.mem.indexOfScalarPos(u8, input, 2, 0x07) orelse return .{ - \\ .event = null, - \\ .n = 0, - \\ }; - \\ bel_terminated = true; - \\ break :blk bel + 1; - , - .with = - \\ // pardes's patch (its build.zig): whichever terminator comes first ends it. - \\ const esc = std.mem.indexOfScalarPos(u8, input, 2, 0x1b); - \\ const bel = std.mem.indexOfScalarPos(u8, input, 2, 0x07); - \\ if (bel != null and (esc == null or bel.? < esc.?)) { - \\ bel_terminated = true; - \\ break :blk bel.? + 1; - \\ } - \\ const esc_result = skipUntilST(input); - \\ if (esc_result.n > 0) break :blk esc_result.n; - \\ return .{ .event = null, .n = 0 }; - , - }, - .{ - .anchor = " const color = try Color.rgbFromSpec(color_spec);\n", - .with = " const color = Color.rgbFromSpec(color_spec) catch return null_event; // pardes's patch (its build.zig)\n", - .count = 2, - }, - .{ - .anchor = - \\ if (input[semicolon_idx + 1] != 'c') return null_event; - \\ const payload = if (bel_terminated) - \\ input[semicolon_idx + 3 .. sequence.len - 1] - \\ else - \\ input[semicolon_idx + 3 .. sequence.len - 2]; - \\ const decoder = std.base64.standard.Decoder; - \\ const text = try paste_allocator.?.alloc(u8, try decoder.calcSizeForSlice(payload)); - \\ try decoder.decode(text, payload); - , - .with = - \\ // pardes's patch (its build.zig): a malformed reply is dropped. - \\ const body_end = if (bel_terminated) sequence.len - 1 else sequence.len - 2; - \\ if (semicolon_idx + 3 > body_end or input[semicolon_idx + 1] != 'c') return null_event; - \\ const payload = input[semicolon_idx + 3 .. body_end]; - \\ const decoder = std.base64.standard.Decoder; - \\ const gpa = paste_allocator orelse return null_event; - \\ const text = gpa.alloc(u8, decoder.calcSizeForSlice(payload) catch return null_event) catch return null_event; - \\ decoder.decode(text, payload) catch { - \\ gpa.free(text); - \\ return null_event; - \\ }; - , - }, .{ .anchor = \\ 'A', 'B', 'C', 'D', 'E', 'F', 'H', 'P', 'Q', 'R', 'S' => { + \\ // Legacy keys \\ , .with = \\ 'A', 'B', 'C', 'D', 'E', 'F', 'H', 'P', 'Q', 'R', 'S' => { \\ // pardes's patch (its build.zig): a cursor position report is no key. \\ if (final == 'R' and cursorReport(sequence)) return null_event; + \\ // Legacy keys \\ , }, @@ -882,8 +839,7 @@ pub fn build(b: *std.Build) void { // (InactiveDim on a focus change) sent every blank of every pane it // touched again: 7 KB a click for three shell panes. The terminal // keeps the old ink there, and so does vaxis's last frame. - const render_path = vaxis_dep.path("src/Vaxis.zig").getPath(b); - var render_src = std.Io.Dir.cwd().readFileAlloc(io, render_path, b.allocator, .limited(1 << 20)) catch @panic("read vaxis Vaxis.zig"); + var render_src = configureRead(b, io, vaxis_dep.builder.root, "src/Vaxis.zig", 1 << 20) catch @panic("read vaxis Vaxis.zig"); const render_anchor = \\ if ((!self.refresh and \\ last.eql(cell) and @@ -941,7 +897,7 @@ pub fn build(b: *std.Build) void { var ghostty_vt_for_snap: ?*std.Build.Module = null; const ghostty_simd = !freestanding_core and (!target.result.os.tag.isDarwin() or b.graph.host.result.os.tag.isDarwin()); - const ghostty_optimize: std.builtin.OptimizeMode = if (optimize == .Debug) .ReleaseSafe else optimize; + const ghostty_optimize: std.lang.Optimize = if (optimize == .debug) .safe else optimize; const ghostty_dep = if (is_esp32p4) null else b.lazyDependency("ghostty", .{ .target = target, .optimize = ghostty_optimize, .simd = ghostty_simd, .@"app-runtime" = .none, .@"emit-xcframework" = false }); if (ghostty_dep) |dep| { const ghostty_vt = dep.module("ghostty-vt"); @@ -1017,6 +973,17 @@ pub fn build(b: *std.Build) void { const sdl_lib = dep.artifact("SDL3"); gm.linkLibrary(sdl_lib); gm.addIncludePath(dep.path("include")); + // gui.zig's `c`: SDL and the font shim, which @cImport gave it before Zig 0.17. + const header = b.addWriteFiles().add("gui_c.h", + \\#define SDL_DISABLE_OLD_NAMES 1 + \\#include + \\#include "font.h" + \\ + ); + const gui_c = b.addTranslateC(.{ .root_source_file = header, .target = target, .optimize = optimize }); + gui_c.addIncludePath(dep.path("include")); + gui_c.addIncludePath(b.path("src/gui")); + gm.addImport("gui_c", gui_c.createModule()); } gm.linkLibrary(freetype.?); // HarfBuzz from source, like FreeType: its FreeType integration @@ -1105,7 +1072,7 @@ pub fn build(b: *std.Build) void { }) |file| web_step.dependOn(&b.addInstallFileWithDir(b.path(file[0]), .{ .custom = "web" }, file[1]).step); const run_web_harness = b.addSystemCommand(&.{ "node", "test/web_harness.mjs" }); - run_web_harness.addArg(b.getInstallPath(.{ .custom = "web" }, "")); + run_web_harness.addDirectoryArg(installed("web")); run_web_harness.step.dependOn(web_step); b.step("web-harness", "run the dependency-free JS/WASM DOM harness").dependOn(&run_web_harness.step); b.getInstallStep().dependOn(web_step); @@ -1149,9 +1116,9 @@ pub fn build(b: *std.Build) void { const min_version = b.fmt("{d}.{d}", .{ macos_min_version.major, macos_min_version.minor }); const swift_mode: []const u8 = switch (optimize) { - .Debug => "-Onone", - .ReleaseSmall => "-Osize", - .ReleaseFast, .ReleaseSafe => "-O", + .debug => "-Onone", + .small => "-Osize", + .fast, .safe => "-O", }; const link = b.addSystemCommand(&.{ "swiftc", swift_mode, "-target", triple, "-import-objc-header" }); @@ -1218,7 +1185,8 @@ pub fn build(b: *std.Build) void { const sign = b.addSystemCommand(&.{ "codesign", "--force", "--sign", macos_identity }); if (!std.mem.eql(u8, macos_identity, "-")) sign.addArgs(&.{ "--options", "runtime", "--timestamp" }); - sign.addArg(b.getInstallPath(.prefix, "pardes.app")); + sign.setCwd(installed("")); + sign.addArg("pardes.app"); sign.has_side_effects = true; sign.step.dependOn(&install_app_bin.step); sign.step.dependOn(&install_plist.step); @@ -1227,8 +1195,8 @@ pub fn build(b: *std.Build) void { app_step.dependOn(&sign.step); const dmg = b.addSystemCommand(&.{ "hdiutil", "create", "-volname", "pardes", "-ov", "-format", "UDZO", "-srcfolder" }); - dmg.addArg(b.getInstallPath(.prefix, "pardes.app")); - dmg.addArg(b.getInstallPath(.prefix, "pardes.dmg")); + dmg.setCwd(installed("")); + dmg.addArgs(&.{ "pardes.app", "pardes.dmg" }); dmg.has_side_effects = true; dmg.step.dependOn(&sign.step); dmg_step.dependOn(&dmg.step); @@ -1267,7 +1235,7 @@ pub fn build(b: *std.Build) void { const run_e2e = std.Build.Step.Run.create(b, "run macos-e2e"); run_e2e.addFileArg(runnable); run_e2e.setCwd(b.path(".")); - if (b.args) |args| run_e2e.addArgs(args); + run_e2e.addPassthruArgs(); run_e2e.has_side_effects = true; e2e_step.dependOn(&run_e2e.step); } else e2e_step.dependOn(&b.addFail("macos-e2e needs a Darwin host and target").step); @@ -1290,7 +1258,7 @@ pub fn build(b: *std.Build) void { .linkage = if (static) .static else null, .root_module = root_mod, }); - b.installArtifact(exe); + installHome(b, exe, home_bin); if (gui_mod) |gm| { var gui_name: []const u8 = "pardes-gui"; if (target.result.os.tag != .linux or target.result.cpu.arch != .x86_64) @@ -1300,7 +1268,7 @@ pub fn build(b: *std.Build) void { .linkage = if (static) .static else null, .root_module = gm, }); - b.installArtifact(gui_exe); + installHome(b, gui_exe, home_bin); } const run = b.addRunArtifact(exe); b.step("run", "descend to the pardes").dependOn(&run.step); @@ -1312,7 +1280,7 @@ pub fn build(b: *std.Build) void { }); const run_iso = b.addRunArtifact(iso_exe); // Something to look at on arrival, read out of the binary itself. - if (b.args) |args| run_iso.addArgs(args) else run_iso.addArg("src/pardes.zig"); + run_iso.addPassthruArgs(); const iso_step = b.step("run-isolated", "descend to a pardes with no host but the terminal"); iso_step.dependOn(&run_iso.step); } @@ -1370,15 +1338,9 @@ pub fn build(b: *std.Build) void { hxdiff.root_module.addImport("pardes", core_module); const run_hxdiff = b.addRunArtifact(hxdiff); run_hxdiff.has_side_effects = true; - if (b.args) |args| run_hxdiff.addArgs(args) else { - run_hxdiff.addArgs(&.{ - "--strict", - "test/hxcases/cases.jsonl", - "test/hxcases/goldens.jsonl", - "test/hxcases/waivers.jsonl", - }); - run_hxdiff.setCwd(b.path(".")); - } + // Bare, it runs the checked-in suite (test/hxdiff.zig). + run_hxdiff.addPassthruArgs(); + run_hxdiff.setCwd(b.path(".")); const hxdiff_step = b.step("hxdiff", "compare Helix results (-- --strict cases reference [waivers]; cases alone emits)"); hxdiff_step.dependOn(&run_hxdiff.step); @@ -1403,16 +1365,8 @@ pub fn build(b: *std.Build) void { const run_hxparity = b.addRunArtifact(hxdiff); run_hxparity.has_side_effects = true; run_hxparity.addArg("--parity"); - if (b.args) |args| run_hxparity.addArgs(args) else { - run_hxparity.addArgs(&.{ - "--strict", - "--waivers", - "test/hxcases/parity-waivers.jsonl", - "test/hxcases/cases.jsonl", - "test/hxcases/parity.jsonl", - }); - run_hxparity.setCwd(b.path(".")); - } + run_hxparity.addPassthruArgs(); + run_hxparity.setCwd(b.path(".")); const hxparity_step = b.step("hxparity", "run the file-vs-pty editing parity suite (-- [--waivers w.jsonl] ...)"); hxparity_step.dependOn(&run_hxparity.step); @@ -1427,21 +1381,21 @@ pub fn build(b: *std.Build) void { .name = "pardes-lspbench", .root_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/lspbench.zig"), .link_libc = true, }), }); lspbench.root_module.addImport("pardes", core_module); const run_lspbench = b.addRunArtifact(lspbench); - if (b.args) |args| run_lspbench.addArgs(args); + run_lspbench.addPassthruArgs(); run_lspbench.setCwd(b.path(".")); run_lspbench.has_side_effects = true; const lspbench_step = b.step("lspbench", "language-backend latency + feature matrix (-- [--json] [--check] [repo-root]), or one query (-- probe : [arg] [--reps N])"); lspbench_step.dependOn(&run_lspbench.step); const run_lspbench_check = b.addRunArtifact(lspbench); run_lspbench_check.addArg("--check"); - if (b.args) |args| run_lspbench_check.addArgs(args); + run_lspbench_check.addPassthruArgs(); run_lspbench_check.setCwd(b.path(".")); run_lspbench_check.has_side_effects = true; const lspbench_check_step = b.step("lspbench-check", "require every configured language probe to complete correctly"); @@ -1449,12 +1403,12 @@ pub fn build(b: *std.Build) void { const locations_bench_step = b.step("locations-bench", "measure cold/warm result formatting (-Doptimize=ReleaseFast; CSV on stderr)"); - if (optimize != .ReleaseFast) { + if (optimize != .fast) { locations_bench_step.dependOn(&b.addFail("locations-bench requires -Doptimize=ReleaseFast").step); } else { const locations_bench_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/locations_bench.zig"), .link_libc = true, }); @@ -1465,7 +1419,7 @@ pub fn build(b: *std.Build) void { locations_bench_step.dependOn(&run_locations_bench.step); } - const perf_optimize: std.builtin.OptimizeMode = .ReleaseFast; + const perf_optimize: std.lang.Optimize = .fast; const perf_options = b.addOptions(); const perf_target = std.Target.Query.fromTarget(&target.result); perf_options.addOption(PerfBuild, "identity", .{ @@ -1499,7 +1453,7 @@ pub fn build(b: *std.Build) void { perf.root_module.addOptions("perf_options", perf_options); const run_perf = b.addRunArtifact(perf); run_perf.has_side_effects = true; - if (b.args) |args| run_perf.addArgs(args); + run_perf.addPassthruArgs(); run_perf.setCwd(b.path(".")); const perf_step = b.step("perf", "gesture latency or bounded terminal stress (-- [--json] [--reps N] [--base old.json] [--terminal-mib N])"); perf_step.dependOn(&run_perf.step); @@ -1536,7 +1490,7 @@ pub fn build(b: *std.Build) void { .name = "pardes-fs-bench", .root_module = b.createModule(.{ .target = target, - .optimize = .ReleaseFast, + .optimize = .fast, .root_source_file = b.path("test/fs_bench.zig"), .link_libc = true, }), @@ -1544,7 +1498,7 @@ pub fn build(b: *std.Build) void { fs_bench.root_module.addImport("pardes", core_module); const run_fs_bench = b.addRunArtifact(fs_bench); run_fs_bench.has_side_effects = true; - if (b.args) |args| run_fs_bench.addArgs(args); + run_fs_bench.addPassthruArgs(); run_fs_bench.setCwd(b.path(".")); const fs_bench_step = b.step("fs-bench", "9P filesystem request cost and allocation count (-- [--json] [--reps N])"); fs_bench_step.dependOn(&run_fs_bench.step); @@ -1581,11 +1535,11 @@ pub fn build(b: *std.Build) void { }); syntax_runner.root_module.addImport("syntax", syntax_module); const run_syntax = b.addRunArtifact(syntax_runner); - if (b.args) |args| run_syntax.addArgs(args); + run_syntax.addPassthruArgs(); b.step("syntax", "emit deterministic syntax snapshots").dependOn(&run_syntax.step); const run_syntax_bench = b.addRunArtifact(syntax_runner); run_syntax_bench.addArg("--bench"); - if (b.args) |args| run_syntax_bench.addArgs(args); + run_syntax_bench.addPassthruArgs(); run_syntax_bench.has_side_effects = true; b.step("syntax-bench", "measure highlighting latency and allocations").dependOn(&run_syntax_bench.step); const syntax_test = b.addTest(.{ @@ -1611,7 +1565,7 @@ pub fn build(b: *std.Build) void { // part of fs-test; the long run is manual. const run_monkey9p = b.addSystemCommand(&.{ "python3", "-B", "test/monkey9p.py" }); run_monkey9p.addArtifactArg(exe); - if (b.args) |args| run_monkey9p.addArgs(args); + run_monkey9p.addPassthruArgs(); run_monkey9p.setCwd(b.path(".")); run_monkey9p.has_side_effects = true; b.step("monkey-9p", "random 9P operations checking the documented rules (-- [--seed N]... [--steps M] [--replay F] [--shrink F] [--no-shrink])").dependOn(&run_monkey9p.step); @@ -1622,7 +1576,7 @@ pub fn build(b: *std.Build) void { if (platform == .gui) { const run_monkey_gui = b.addSystemCommand(&.{ "python3", "-B", "test/gui_monkey.py" }); run_monkey_gui.addArtifactArg(exe); - if (b.args) |args| run_monkey_gui.addArgs(args); + run_monkey_gui.addPassthruArgs(); run_monkey_gui.setCwd(b.path(".")); run_monkey_gui.has_side_effects = true; monkey_gui_step.dependOn(&run_monkey_gui.step); @@ -1653,7 +1607,7 @@ pub fn build(b: *std.Build) void { }), }); // Ordinary executable; each launch asks sudo inside its own PTY. - b.installArtifact(v9fs_helper); + installHome(b, v9fs_helper, home_bin); const run_v9fs = b.addSystemCommand(&.{ "python3", "-B", "test/v9fs.py" }); run_v9fs.addArtifactArg(exe); run_v9fs.addArtifactArg(v9fs_helper); @@ -1688,7 +1642,7 @@ pub fn build(b: *std.Build) void { }), }); const run_history = b.addRunArtifact(history); - if (b.args) |args| run_history.addArgs(args); + run_history.addPassthruArgs(); run_history.has_side_effects = true; b.step("history", "compare command output and test/build runtime across jj revisions").dependOn(&run_history.step); @@ -1843,7 +1797,7 @@ pub fn build(b: *std.Build) void { if (unit_match) |check| check.addArtifactArg(shell_test); const run_profile = b.addRunArtifact(unit_profile); run_profile.addArtifactArg(shell_test); - if (b.args) |args| run_profile.addArgs(args); + run_profile.addPassthruArgs(); run_profile.has_side_effects = true; b.step("unit-profile", "report test request time and process memory as JSONL (-- optional filter, --timeout-ms=N)").dependOn(&run_profile.step); const profile_test = b.addExecutable(.{ @@ -1876,19 +1830,38 @@ fn testMatch(b: *std.Build, profiler: *std.Build.Step.Compile, filters: []const return check; } -fn prefixIsUntouched(b: *std.Build) bool { - if (b.dest_dir != null) return false; - const zig_out = b.build_root.join(b.allocator, &.{"zig-out"}) catch @panic("OOM"); - if (!std.mem.eql(u8, b.install_prefix, zig_out)) return false; - return std.mem.eql(u8, b.exe_dir, b.pathJoin(&.{ b.install_path, "bin" })) and - std.mem.eql(u8, b.lib_dir, b.pathJoin(&.{ b.install_path, "lib" })) and - std.mem.eql(u8, b.h_dir, b.pathJoin(&.{ b.install_path, "include" })); +/// Installs `artifact` in the prefix and, given `home_bin`, copies it there +/// too (`install` unlinks first, so a running binary is replaced). +fn installHome(b: *std.Build, artifact: *std.Build.Step.Compile, home_bin: ?[]const u8) void { + b.installArtifact(artifact); + const dir = home_bin orelse return; + const copy = b.addSystemCommand(&.{ "install", "-Dm755" }); + copy.addArtifactArg(artifact); + copy.addArg(b.pathJoin(&.{ dir, artifact.name })); + copy.has_side_effects = true; + b.getInstallStep().dependOn(©.step); +} + +/// A file read while configuring, under a package's root. A dependency's is +/// hash-addressed and never changes under the same pin; this repo's are not +/// tracked one by one, since the configure runs again on every build anyway +/// (findProgram and gitCommit poison its cache). +// ponytail: untracked repo reads; b.dependOnFileContents each one if the configure cache ever stays pure. +fn configureRead(b: *std.Build, io: std.Io, root: std.Build.Cache.Path, sub: []const u8, limit: usize) ![]u8 { + return root.root_dir.handle.readFileAlloc(io, b.pathJoin(&.{ root.subPathOrDot(), sub }), b.allocator, .limited(limit)); +} + +/// `sub` under the install prefix, known only when the build runs. +fn installed(sub: []const u8) std.Build.LazyPath { + return .{ .relative = .{ .base = .install_prefix, .sub_path = sub } }; } fn gitCommit(b: *std.Build) ?[]const u8 { + // HEAD is not a file the configure cache can track. + b.graph.poisonCache(); var code: u8 = 0; const out = b.runAllowFail( - &.{ "git", "-C", b.build_root.path orelse ".", "rev-parse", "--short=12", "HEAD" }, + &.{ "git", "rev-parse", "--short=12", "HEAD" }, &code, .ignore, ) catch return null; @@ -1985,7 +1958,7 @@ fn compileGlsl(b: *std.Build, name: []const u8) std.Build.LazyPath { fn vendoredThemes(b: *std.Build, io: std.Io) []const []const u8 { var count: usize = 0; { - var dir = b.build_root.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes"); + var dir = b.root.root_dir.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes"); defer dir.close(io); var it = dir.iterate(); while (it.next(io) catch @panic("read vendor/themes")) |e| { @@ -1995,7 +1968,7 @@ fn vendoredThemes(b: *std.Build, io: std.Io) []const []const u8 { } const names = b.allocator.alloc([]const u8, count) catch @panic("OOM"); - var dir = b.build_root.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes"); + var dir = b.root.root_dir.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes"); defer dir.close(io); var it = dir.iterate(); var index: usize = 0; diff --git a/build.zig.zon b/build.zig.zon index b1f501fe..a2fc90dd 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,52 +9,59 @@ // read-only HTTPS URL is what a manifest can carry. Re-pin with // `zig fetch --save=cloud9 git+https://git.sr.ht/~gbrls/cloud9#`. .cloud9 = .{ - .url = "git+https://git.sr.ht/~gbrls/cloud9#fe9772b178575fcab93de09fc61c2f13db7db1a8", - .hash = "cloud9-0.1.0-yt86qh4qHgC6OpG4gZE9yoQaO8huc5mnQCaqGwuJ0OU1", + .url = "git+https://git.sr.ht/~gbrls/cloud9#d5c37d9122240fe95d308fbe15874e14dd786c5a", + .hash = "cloud9-0.1.0-yt86qnAvHgB1dEWGakukcJ54GZ7J3mv_lm_kApzAuEOY", }, // Pinned to the exact libvaxis commit ghostty is built against, so it // is compatible with ghostty's uucode configuration (the one we share // with it via `external_uucode` in build.zig). .vaxis = .{ - .url = "git+https://github.com/rockorager/libvaxis.git#1dbbe575dff4586fe51e3217aa5c3fecdcbb6089", - .hash = "vaxis-0.6.0-BWNV_CrbCQCscGpzsAlR402rYQ_tV3aAl081c2iRRkka", + .url = "git+https://github.com/rockorager/libvaxis.git#6fd944a27fb3d6f596e981076381a3131f2448b4", + .hash = "vaxis-0.6.0-BWNV_MafDAAEzkVUvrW9NFUqnnMUoeHqrs2mecnD6D7w", }, .ghostty = .{ - .url = "git+https://github.com/ghostty-org/ghostty.git#82e53e3f6e219e0cf0499fe29c82d925ea26cd5e", - .hash = "ghostty-1.3.2-dev-5UdBCzeJJQXw_vG5Hsfx0DYUmF7Exs_9yctijqOIfp7W", + .url = "git+https://github.com/ghostty-org/ghostty.git#521cf2c5d30bd48028ca61546c64e7913764073d", + .hash = "ghostty-1.3.2-dev-5UdBC6WZfwXgQ6HmA5DH6dGNAUqtDMLrhhrHiBX-99J0", }, // Same uucode commit ghostty and vaxis both depend on. We build it // ourselves (with uucode_config.zig) so ghostty-vt and vaxis can share // a single uucode module. See build.zig for the why. .uucode = .{ - .url = "git+https://github.com/jacobsandlund/uucode#2826a37a4562284fdacd8fa029d49509cc9bffcd", - .hash = "uucode-0.2.0-ZZjBPlK5VADj7fdoq7G8LIHzD5o6FSkcBXXrRWr4jnrA", + .url = "git+https://github.com/jacobsandlund/uucode#ea62149739404a73c202b48a33bf6dd2af4bd9b0", + .hash = "uucode-0.2.0-ZZjBPoGFVgCiflJNFc6Io8xzC67B6PA5bUkk4LT0kCxg", }, + // Pivok7's fork: zig-gamedev/zstbi PR #16, "Upgrade to zig 0.17.0" + // (two lines of build.zig). Back to upstream once it is merged. .zstbi = .{ - .url = "git+https://github.com/zig-gamedev/zstbi#3813f5f113b26f644cfa01a30155cc76b3526e91", - .hash = "zstbi-0.11.0-dev-L0Ea_3GWBwAh7m54XX055vwLKPTPij5hyqyeq92MXPE2", + .url = "git+https://github.com/Pivok7/zstbi#bc96f28d341f9c7fb9cbc5dc65aa4c5cf0c8f007", + .hash = "zstbi-0.11.0-dev-L0Ea_3GWBwCpNHVwGU4MPR_oDd0FoQOYNrGodwvJ6Z45", }, - // SDL3 (castholm/SDL zig bindings) — only fetched/compiled when `-Dsdl` - // is set. Lazy so the default vaxis build never touches it. The sdl + // SDL3 (castholm/SDL zig bindings, its release-3.4.x branch for Zig + // 0.17; david-vanderson's fork, pinned before, has no 0.17 build) — only + // fetched/compiled when `-Dsdl` is set. Lazy so the default vaxis build never touches it. The sdl // package resolves its own linux deps from its own build.zig.zon. .sdl = .{ - .url = "git+https://github.com/david-vanderson/SDL#5bbcf665494fe14acadf50601edf6d5f74ebf96a", - .hash = "sdl-0.4.2+3.4.4-SDL--tB1pQFLgwvCakiiOSoZIuVaz6a6-_gOZC66AGRD", + .url = "git+https://github.com/castholm/SDL#dbcb19aa3583c318556ecae3ecbeb29b102d37c5", + .hash = "sdl-0.6.0+3.4.18-SDL--p-gqAGWpnfTLlhs0dgjDtc4P4_CHeNLGY_SX_Fv", .lazy = true, }, // tree-sitter: Zig bindings + the C runtime, plus grammars (parser.c // we link, highlights.scm we read at build time into the ts_queries module). + // pierrelgol's forks of zig-tree-sitter (here) and tree-sitter-c + // (ts_c), which pin a fork of the tree-sitter core: upstream's + // build.zig files still use APIs Zig 0.17 removed. Their diffs touch + // only the build files and tests. Back to upstream once it moves. .tree_sitter = .{ - .url = "git+https://github.com/tree-sitter/zig-tree-sitter#b55d4977d61330390fc733944da06106ff972660", - .hash = "tree_sitter-0.26.0-8heIf3CaAQB4SSumoGzq3gLSz2rkvXxcKFyskRWqDGBz", + .url = "git+https://github.com/pierrelgol/zig-tree-sitter#2ffef82a12d0305e646ade0e67c693cabc661e05", + .hash = "tree_sitter-0.26.0-8heIf1HEAQCVBaR2wlDhGTw16Ttn1bzERVIwlzNcyO6b", }, .ts_rust = .{ .url = "git+https://github.com/tree-sitter/tree-sitter-rust#77a3747266f4d621d0757825e6b11edcbf991ca5", .hash = "N-V-__8AAHJYbgAipcanYj2A6rnj9wtGzjGzANkrOsqiFAxm", }, .ts_c = .{ - .url = "git+https://github.com/tree-sitter/tree-sitter-c#b780e47fc780ddc8da13afa35a3f4ed5c157823d", - .hash = "tree_sitter_c-0.24.2-y5boS-ptQADHoCoVfjGT_nFtFQ5LbomIkW0fxG3_cmdB", + .url = "git+https://github.com/pierrelgol/tree-sitter-c#67949e4c8dc630c18a522919f2bde2e025a0d025", + .hash = "tree_sitter_c-0.24.2-y5boS-htQACe3pz6jHq4tpS8dB6WIo4-zk_ct7lAjvQT", }, .ts_typst = .{ .url = "git+https://github.com/uben0/tree-sitter-typst#13863ddcbaa7b68ee6221cea2e3143415e64aea4", @@ -185,7 +192,7 @@ .lazy = true, }, }, - .minimum_zig_version = "0.16.0", + .minimum_zig_version = "0.17.0", .paths = .{""}, .fingerprint = 0x41dc46101fc764d8, } diff --git a/build/snap.zig b/build/snap.zig index 7aa06884..35a246ad 100644 --- a/build/snap.zig +++ b/build/snap.zig @@ -44,7 +44,7 @@ pub fn addTty(b: *std.Build, opts: struct { const run_snap = b.addRunArtifact(snap); run_snap.addArtifactArg(opts.exe); run_snap.addPrefixedFileArg("--lspmock=", lspmock.getEmittedBin()); - if (b.args) |args| run_snap.addArgs(args); + run_snap.addPassthruArgs(); // scripts fork children and drive real ptys: never cached, never "up to date" run_snap.has_side_effects = true; const snap_step = b.step("snap", "run the snapshot parity suite (-- --update regenerates goldens)"); @@ -63,7 +63,7 @@ pub fn addTty(b: *std.Build, opts: struct { const run_monkey = b.addRunArtifact(monkey); run_monkey.addArtifactArg(snap); run_monkey.addArtifactArg(opts.exe); - if (b.args) |args| run_monkey.addArgs(args); + run_monkey.addPassthruArgs(); run_monkey.has_side_effects = true; b.step("monkey", "random snapshot scripts hunting panics (-- [steps] [--from=N] [--out=DIR])").dependOn(&run_monkey.step); const monkey_tests = b.addTest(.{ .root_module = monkey.root_module }); @@ -101,7 +101,7 @@ pub fn addWeb(b: *std.Build) void { run_web_snap.step.dependOn(&build_web_snap.step); run_web_snap.step.dependOn(&driver_test.step); run_web_snap.has_side_effects = true; - if (b.args) |args| run_web_snap.addArgs(args); + run_web_snap.addPassthruArgs(); b.step("web-snap", "run browser highlighting, touch, Look, resize and scroll checks").dependOn(&run_web_snap.step); b.step("web-e2e", "run the Chrome-driven DOM end-to-end suite").dependOn(&run_web_snap.step); } diff --git a/docs/typ/building.typ b/docs/typ/building.typ index ae2f3a60..8d7524f9 100644 --- a/docs/typ/building.typ +++ b/docs/typ/building.typ @@ -9,7 +9,7 @@ pieces fit. To install it, see #doc("setup", section: "install"). = Platforms -Zig *0.16.0* (`build.zig.zon` pins `minimum_zig_version`). Dependencies are +Zig *0.17.0* (`build.zig.zon` pins `minimum_zig_version`). Dependencies are fetched and pinned by the manifest; the terminal build needs no system package. The SDL shell builds SDL3 and FreeType from source. PDF support builds MuPDF and is on by default (`-Dmupdf=false` drops it). 9P over QUIC @@ -24,10 +24,11 @@ builds MuPDF and is on by default (`-Dmupdf=false` drops it). 9P over QUIC [`zig build -Dplatform=esp32p4`], [a freestanding riscv32 editor object for the ESP32-P4, with a 384 KiB heap], ) -A bare `zig build` installs into `~/.local`; `--prefix ` installs -elsewhere, except `--prefix zig-out`, which counts as no prefix. With -`-Dplatform` the default prefix is `zig-out`, so always pass `-Dplatform` -while developing. Test, benchmark and run steps build what they need +A bare `zig build` installs into the prefix (`zig-out`, or `--prefix +`) and copies the binaries into `~/.local/bin`; `-Dhome-install=false` +leaves that copy out. Zig 0.17 keeps the prefix from the build script, so +`--prefix` alone no longer stops it. With `-Dplatform` nothing is copied, +so always pass `-Dplatform` while developing. Test, benchmark and run steps build what they need without installing. `pardes --version` prints `pardes ` (from `build.zig.zon`), plus the commit for release builds and the `~/.local` install; `pardes --help` lists every flag. @@ -50,6 +51,7 @@ there; its namespace is in `src/esp32p4_gpio.zig`. [`-Djpx`], [bool, `true`: JPEG 2000, and with it scanned PDFs], [`-Dtree-sitter`], [`disabled`, `zig`, `minimal`, `full`; `full` natively, `zig` for web, `disabled` for esp32p4], [`-Dembed-sources`], [bool, `false`: serve the sources under #file("/src")], + [`-Dhome-install`], [bool: a bare `zig build` also copies the binaries into `~/.local/bin`; default true], [`-Dstamp-commit`], [bool: the git commit in `--version` and crash records; on for release builds and the `~/.local` install], [`-Dtheme-animation`], [bool; on except for esp32p4], [`-Dworkspace-tag`], [bool: draw the workspace tag row; on except for macOS, whose menu bar carries it], diff --git a/docs/typ/install.typ b/docs/typ/install.typ index 9758777d..d97d30f7 100644 --- a/docs/typ/install.typ +++ b/docs/typ/install.typ @@ -18,7 +18,7 @@ #let first = project.mirrors.first() #cmd("git clone " + first.clone + " && cd pardes") -With Zig 0.16 (the build fetches everything else; once that is +With Zig 0.17 (the build fetches everything else; once that is downloaded, a first build from a clean cache took 62 seconds on 16 cores): #cmd("# pardes, in a terminal\nzig build -Dplatform=tty --prefix ~/.local") #cmd("# pardes-gui, its own window\nzig build -Dplatform=gui --prefix ~/.local") diff --git a/mupdf.zig b/mupdf.zig index eeadaa5d..761fef92 100644 --- a/mupdf.zig +++ b/mupdf.zig @@ -293,7 +293,7 @@ fn configureModule(module: *std.Build.Module, dependency: *std.Build.Dependency, } fn flatCSources(b: *std.Build, io: std.Io, dependency: *std.Build.Dependency, relative_dir: []const u8) []const []const u8 { - var dir = std.Io.Dir.cwd().openDir(io, dependency.path(relative_dir).getPath(b), .{ .iterate = true }) catch + var dir = dependency.builder.root.root_dir.handle.openDir(io, relative_dir, .{ .iterate = true }) catch std.debug.panic("MuPDF source directory is missing: {s}", .{relative_dir}); defer dir.close(io); @@ -317,9 +317,9 @@ fn flatCSources(b: *std.Build, io: std.Io, dependency: *std.Build.Dependency, re } fn readMakelists(b: *std.Build, io: std.Io, dependency: *std.Build.Dependency) []const u8 { - return std.Io.Dir.cwd().readFileAlloc( + return dependency.builder.root.root_dir.handle.readFileAlloc( io, - dependency.path("Makelists").getPath(b), + "Makelists", b.allocator, .limited(1024 * 1024), ) catch @panic("read MuPDF Makelists"); diff --git a/src/9p_io.zig b/src/9p_io.zig index 18c51ece..27d79b93 100644 --- a/src/9p_io.zig +++ b/src/9p_io.zig @@ -1553,7 +1553,7 @@ test "a socket path too long for sun_path is no listener, and leaves the editor' } else { _ = unsetenv("XDG_RUNTIME_DIR"); }; - const long = "n" ** 120; + const long = &@as([120]u8, @splat('n')); try testing.expect(listen(testing.io, testing.allocator, p, long, "", null, null) == null); try testing.expect(pardes.turn.answer_held == null); try testing.expect(pardes.turn.wake_parked == null); @@ -1567,7 +1567,7 @@ test "a listening editor posts itself into the 9P registry and unposts on stop" _ = try std.fmt.bufPrintSentinel(&directory, "/tmp/pardes-post-XXXXXX", .{}, 0); if (mkdtemp(&directory) == null) return error.TempDirectoryFailed; const dir = std.mem.span(@as([*:0]const u8, &directory)); - const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeZ(u8, std.mem.span(v)) else null; + const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeSentinel(u8, std.mem.span(v), 0) else null; defer { if (old_runtime) |v| { _ = setenv("XDG_RUNTIME_DIR", v, 1); @@ -1628,7 +1628,7 @@ test "Unix TCP and QUIC share one listener through reads writes reconnects and r if (mkdtemp(&directory) == null) return error.TempDirectoryFailed; // What the listener posted and left inside goes with it. defer std.Io.Dir.cwd().deleteTree(testing.io, std.mem.sliceTo(&directory, 0)) catch |err| std.debug.print("deleteTree: {s}\n", .{@errorName(err)}); - const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeZ(u8, std.mem.span(v)) else null; + const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeSentinel(u8, std.mem.span(v), 0) else null; defer { if (old_runtime) |v| { _ = setenv("XDG_RUNTIME_DIR", v, 1); @@ -1749,7 +1749,7 @@ test "a change waits while the editor is out mid-step, a read does not, and the if (mkdtemp(&directory) == null) return error.TempDirectoryFailed; // What the listener posted and left inside goes with it. defer std.Io.Dir.cwd().deleteTree(testing.io, std.mem.sliceTo(&directory, 0)) catch |err| std.debug.print("deleteTree: {s}\n", .{@errorName(err)}); - const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeZ(u8, std.mem.span(v)) else null; + const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeSentinel(u8, std.mem.span(v), 0) else null; defer { if (old_runtime) |v| { _ = setenv("XDG_RUNTIME_DIR", v, 1); @@ -1824,7 +1824,7 @@ test "a held read is answered when the log has news, and a flushed one spends no if (mkdtemp(&directory) == null) return error.TempDirectoryFailed; // What the listener posted and left inside goes with it. defer std.Io.Dir.cwd().deleteTree(testing.io, std.mem.sliceTo(&directory, 0)) catch |err| std.debug.print("deleteTree: {s}\n", .{@errorName(err)}); - const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeZ(u8, std.mem.span(v)) else null; + const old_runtime = if (libc.getenv("XDG_RUNTIME_DIR")) |v| try gpa.dupeSentinel(u8, std.mem.span(v), 0) else null; defer { if (old_runtime) |v| { _ = setenv("XDG_RUNTIME_DIR", v, 1); @@ -2051,7 +2051,7 @@ test "a pane's PARDES_MOUNT is the session's directory under 9ns --mntgen, and u const names = [_][*:0]const u8{ "NINE_MNTGEN", "NINE_MOUNT", "PARDES_MOUNT" }; var saved: [names.len]?[:0]u8 = @splat(null); for (names, &saved) |name, *value| { - if (libc.getenv(name)) |old| value.* = try testing.allocator.dupeZ(u8, std.mem.span(old)); + if (libc.getenv(name)) |old| value.* = try testing.allocator.dupeSentinel(u8, std.mem.span(old), 0); } defer for (names, saved) |name, value| { if (value) |old| { @@ -2073,7 +2073,7 @@ test "9P shell environment states being inside pardes apart from how to reach it const names = [_][*:0]const u8{ "XDG_RUNTIME_DIR", "HOME", "PARDES_PID", "PARDES_9P", "PARDES_PANE" }; var saved: [names.len]?[:0]u8 = @splat(null); for (names, &saved) |name, *value| { - if (libc.getenv(name)) |old| value.* = try testing.allocator.dupeZ(u8, std.mem.span(old)); + if (libc.getenv(name)) |old| value.* = try testing.allocator.dupeSentinel(u8, std.mem.span(old), 0); } defer for (names, saved) |name, value| { if (value) |old| { diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 4fe0760c..c6c2eadd 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -17,6 +17,14 @@ - A diff paged into a session (`git show | pardes -`) opens its `+Diff` alone; the `+Pager` no longer stays folded under it. +- Built with Zig 0.17. A bare `zig build` still puts the binaries in + `~/.local/bin`, now as a copy beside the prefix, which `--prefix` no + longer prevents; `-Dhome-install=false` does. ghostty, libvaxis, uucode + and SDL (3.4.18) move to their Zig 0.17 versions, and tree-sitter to a + 0.28 development snapshot. +- A terminal's edited copy goes when the program clears the screen, + instead of staying where its rows were. + - n/N follow Helix search registers, counts, wrapping and select mode. `*` sets a search from the selection; `Alt-*` omits word boundaries. The location ring remains as LookNext/LookPrev (Space j n/p). diff --git a/src/Layer.zig b/src/Layer.zig index 7a5fcf7e..ba45bc88 100644 --- a/src/Layer.zig +++ b/src/Layer.zig @@ -51,7 +51,7 @@ cols: u16 = 0, rows: u16 = 0, /// A body's compact rows, from its top. context_rows: u16 = 0, -context_separators: std.bit_set.StaticBitSet(limits.wrap_rows) = .initEmpty(), +context_separators: std.bit_set.StaticBitSet(limits.wrap_rows) = .empty, /// `rows * cols`, row after row. cells: []pardes.Cell = &.{}, cursor: ?struct { x: u16, y: u16, bar: bool = false } = null, @@ -72,7 +72,7 @@ pub fn capacity(layer: *const Layer, metrics: Metrics) u16 { } pub fn setContextLines(layer: *Layer, lines: []const i32) void { - layer.context_separators = .initEmpty(); + layer.context_separators = .empty; const count = @min(lines.len, layer.context_rows); var index: usize = 0; while (index + 1 < count and index < limits.wrap_rows) : (index += 1) { diff --git a/src/Messages.zig b/src/Messages.zig index 2314939f..b67a8402 100644 --- a/src/Messages.zig +++ b/src/Messages.zig @@ -519,20 +519,20 @@ pub fn errorWords(err: anyerror, buf: []u8) []const u8 { /// A ZON parse failure in a person's words: the first error the parser /// found and its line, `line 3: expected ','`. pub fn zonWhy(diag: *const std.zon.parse.Diagnostics, buf: []u8) []const u8 { - var errors = diag.iterateErrors(); - const first = errors.next() orelse return "not valid ZON"; - const loc = first.getLocation(diag); - return std.fmt.bufPrint(buf, "line {d}: {f}", .{ loc.line + 1, first.fmtMessage(diag) }) catch "not valid ZON"; + if (diag.errors.len == 0) return "not valid ZON"; + const first = diag.errors[0]; + return std.fmt.bufPrint(buf, "line {d}: {s}", .{ first.loc.line + 1, first.msg }) catch "not valid ZON"; } test "errors are said in words, and a ZON failure names its line" { var buf: [128]u8 = undefined; try std.testing.expectEqualStrings("file not found", errorWords(error.FileNotFound, &buf)); try std.testing.expectEqualStrings("too large", errorWords(error.FileTooLarge, &buf)); - var diag: std.zon.parse.Diagnostics = .{}; - defer diag.deinit(std.testing.allocator); + var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); + defer arena.deinit(); + var diag: std.zon.parse.Diagnostics = undefined; const T = struct { a: u8 }; - try std.testing.expectError(error.ParseZon, std.zon.parse.fromSliceAlloc(T, std.testing.allocator, ".{\n .a = 1,\n .b = 2 }", &diag, .{})); + try std.testing.expectError(error.ParseZon, std.zon.parse.fromSlice(T, .{ .gpa = std.testing.allocator, .arena = arena.allocator(), .source = ".{\n .a = 1,\n .b = 2 }", .diagnostics = &diag })); try std.testing.expect(std.mem.startsWith(u8, zonWhy(&diag, &buf), "line 3: ")); } diff --git a/src/TerminalImages.zig b/src/TerminalImages.zig index bc1b2ea8..4140813f 100644 --- a/src/TerminalImages.zig +++ b/src/TerminalImages.zig @@ -38,6 +38,72 @@ const GlyphKey = struct { id: u32, generation: u64, src: PixelRect, cols: u16 }; /// left corner (above or left of it is negative). const Rect = struct { x: i64, y: i64, w: i64, h: i64 }; +/// The runs of Kitty placeholder cells between two pins, one row's run at a +/// time, as ghostty's own `kitty.graphics.unicode.placementIterator` gave +/// them before it moved into its RenderState, which pardes does not keep. +const PlaceholderRuns = struct { + rows: ghostty_vt.PageList.RowIterator, + row: ?ghostty_vt.Pin, + /// Where the scan of `row` resumes: a run ended by an incompatible + /// placeholder starts the next one there. + x: usize = 0, + + fn init(top: ghostty_vt.Pin, bottom: ghostty_vt.Pin) PlaceholderRuns { + var rows = top.rowIterator(.right_down, bottom); + const row = rows.next(); + return .{ .rows = rows, .row = row }; + } + + fn next(self: *PlaceholderRuns) ?gfx.unicode.Placement { + while (self.row) |row| { + if (!row.rowAndCell().row.kitty_virtual_placeholder) { + self.advance(); + continue; + } + var run: ?gfx.unicode.IncompletePlacement = null; + var start: usize = 0; + const cells = row.cells(.all); + while (self.x < cells.len) : (self.x += 1) { + const cell = &cells[self.x]; + if (cell.codepoint() != gfx.unicode.placeholder) { + if (run) |done| return complete(row, start, done); + continue; + } + const style = row.style(cell); + const curr: gfx.unicode.IncompletePlacement = .init(&style, row.grapheme(cell) orelse &.{}); + if (run) |*prev| { + if (!prev.append(&curr)) return complete(row, start, prev.*); + } else { + run = curr.start(); + start = self.x; + } + } + self.advance(); + if (run) |done| return complete(row, start, done); + } + return null; + } + + fn advance(self: *PlaceholderRuns) void { + self.row = self.rows.next(); + self.x = 0; + } + + fn complete(row: ghostty_vt.Pin, x: usize, run: gfx.unicode.IncompletePlacement) gfx.unicode.Placement { + var pin = row; + pin.x = @intCast(x); + return .{ + .pin = pin, + .image_id = run.imageId(), + .placement_id = run.placement_id orelse 0, + .col = run.col.?, + .row = run.row.?, + .width = run.width, + .height = 1, + }; + } +}; + pub fn deinit(ti: *TerminalImages, gpa: std.mem.Allocator) void { var conv = ti.converted.valueIterator(); while (conv.next()) |c| gpa.free(c.rgba); @@ -91,7 +157,7 @@ pub fn draw( // Virtual placements: shown through the placeholder cells, one run of // them on a row at a time. The placeholders themselves are not text. - var runs = gfx.unicode.placementIterator(top, bottom); + var runs: PlaceholderRuns = .init(top, bottom); while (runs.next()) |run| { const at = pages.pointFromPin(.viewport, run.pin) orelse continue; const v = at.viewport.y; @@ -104,7 +170,8 @@ pub fn draw( cell.len = 1; } const img = storage.imageById(run.image_id) orelse continue; - const rp = run.renderPlacement(storage, &img, cw, ch) catch continue; + const target = storage.placeholderTarget(run.image_id, run.placement_id) orelse continue; + const rp = run.renderPlacement(&target.placement, &img, cw, ch) catch continue; if (rp.dest_width == 0 or rp.dest_height == 0 or rp.source_width == 0 or rp.source_height == 0) continue; ctx.place(img, .{ .x = rp.source_x, .y = rp.source_y, .w = rp.source_width, .h = rp.source_height }, .{ .x = @as(i64, at.viewport.x) * cw + rp.offset_x, @@ -122,7 +189,8 @@ pub fn draw( const placed = entry.value_ptr.*; const pin = switch (placed.location) { .pin => |pin| pin, - .virtual => continue, + // ponytail: a placement relative to another (P=/Q=, new in ghostty) is not drawn; resolve its chain if a program needs it. + .virtual, .relative => continue, }; const img = storage.images.get(entry.key_ptr.image_id) orelse continue; const at = pages.pointFromPin(.screen, pin.*) orelse continue; @@ -221,7 +289,8 @@ const Ctx = struct { fn pixelsOf(ti: *TerminalImages, gpa: std.mem.Allocator, img: gfx.Image) ?[]const u8 { const n = @as(usize, img.width) * img.height; if (n == 0) return null; - if (img.format == .rgba) return if (img.data.len == n * 4) img.data else null; + const data = img.data.bytes() orelse return null; + if (img.format == .rgba) return if (data.len == n * 4) data else null; const gop = ti.converted.getOrPut(gpa, img.id) catch return null; if (gop.found_existing) { if (gop.value_ptr.generation == img.generation) { @@ -247,10 +316,11 @@ fn convert(gpa: std.mem.Allocator, img: gfx.Image, n: usize) ?[]u8 { .gray => 1, else => return null, }; - if (img.data.len != n * depth) return null; + const data = img.data.bytes() orelse return null; + if (data.len != n * depth) return null; const out = gpa.alloc(u8, n * 4) catch return null; for (0..n) |i| { - const px = img.data[i * depth ..][0..depth]; + const px = data[i * depth ..][0..depth]; out[i * 4 ..][0..4].* = switch (depth) { 3 => .{ px[0], px[1], px[2], 255 }, 2 => .{ px[0], px[0], px[0], px[1] }, diff --git a/src/builtins.zig b/src/builtins.zig index f73c5982..d9cef8c9 100644 --- a/src/builtins.zig +++ b/src/builtins.zig @@ -98,11 +98,11 @@ fn isEnabled(comptime T: type) bool { /// word that is one here, or in no build. pub fn absentWhy(name: []const u8) ?[]const u8 { @setEvalBranchQuota(20000); - inline for (@typeInfo(@This()).@"struct".decls) |d| { - if (comptime @TypeOf(@field(@This(), d.name)) == type) { - const T = @field(@This(), d.name); + inline for (@typeInfo(@This()).@"struct".decl_names) |d| { + if (comptime @TypeOf(@field(@This(), d)) == type) { + const T = @field(@This(), d); if (comptime @typeInfo(T) == .@"struct" and @hasDecl(T, "run") and !isEnabled(T)) { - if (std.mem.eql(u8, d.name, name)) return if (@hasDecl(T, "gui_only")) "GUI-only" else "not in this build"; + if (std.mem.eql(u8, d, name)) return if (@hasDecl(T, "gui_only")) "GUI-only" else "not in this build"; } } } @@ -112,12 +112,12 @@ pub fn absentWhy(name: []const u8) ?[]const u8 { fn manualBuiltinCount() comptime_int { comptime { var count = 0; - for (@typeInfo(@This()).@"struct".decls) |d| { - if (@TypeOf(@field(@This(), d.name)) != type) continue; - const T = @field(@This(), d.name); + for (@typeInfo(@This()).@"struct".decl_names) |d| { + if (@TypeOf(@field(@This(), d)) != type) continue; + const T = @field(@This(), d); if (@typeInfo(T) != .@"struct" or !@hasDecl(T, "run") or !isEnabled(T)) continue; if (@TypeOf(T.run) != fn (Ctx) void) - @compileError(d.name ++ ".run must have signature fn (Ctx) void"); + @compileError(d ++ ".run must have signature fn (Ctx) void"); count += 1; } return count; @@ -129,9 +129,9 @@ fn manualBuiltinList() [manualBuiltinCount()]type { @setEvalBranchQuota(4000); var list: [manualBuiltinCount()]type = undefined; var count = 0; - for (@typeInfo(@This()).@"struct".decls) |d| { - if (@TypeOf(@field(@This(), d.name)) != type) continue; - const T = @field(@This(), d.name); + for (@typeInfo(@This()).@"struct".decl_names) |d| { + if (@TypeOf(@field(@This(), d)) != type) continue; + const T = @field(@This(), d); if (@typeInfo(T) != .@"struct" or !@hasDecl(T, "run") or !isEnabled(T)) continue; list[count] = T; count += 1; @@ -317,7 +317,7 @@ test "Exit over a ctl write or a click names every pane it asks about, a second first.file.?.saved_hash = 0; // edited: what it had is not what it has p.newScratchBelow(p.active); const second = p.panes[p.active].?; - panes.File.setContent(p, &second.file.?, try std.testing.allocator.dupe(u8, "x" ** 120)); + panes.File.setContent(p, &second.file.?, try std.testing.allocator.dupe(u8, &@as([120]u8, @splat('x')))); try std.testing.expect(second.file.?.revision != second.file.?.saved_revision); // A ctl write, or a click through exec (ctl.captured). if (clicked) p.fs.capturing = true else p.fs.no_prompt = true; @@ -341,7 +341,7 @@ test "Exit over a ctl write or a click names every pane it asks about, a second try std.testing.expect(noticed); // Edited since: only that one is named again (acme's rule). p.fs.failure_len = 0; - panes.File.setContent(p, &second.file.?, try std.testing.allocator.dupe(u8, "y" ** 120)); + panes.File.setContent(p, &second.file.?, try std.testing.allocator.dupe(u8, &@as([120]u8, @splat('y')))); try std.testing.expect(p.executeBuiltinLine(p.active, "Exit")); try std.testing.expect(!p.quit); const again = p.fs.failure[0..p.fs.failure_len]; diff --git a/src/colors.zig b/src/colors.zig index 379d1301..dd0d8938 100644 --- a/src/colors.zig +++ b/src/colors.zig @@ -205,7 +205,7 @@ const name_tint_chroma: f32 = 0.06; /// ink where that hue holds, the name reads on its ground (nameTintFloor) /// and it stands off the ink. Null when no colour of the theme will do. fn derivedNameTint(th: *const Theme, ink: [3]u8, ground: [3]u8) ?[3]u8 { - const pal = th.palette orelse [_][3]u8{th.kw} ** 16; + const pal = th.palette orelse @as([16][3]u8, @splat(th.kw)); const sources = [_][3]u8{ th.kw, pal[4], pal[5], pal[6], pal[3], pal[2], pal[1], th.num, th.str, th.box } ++ [_][3]u8{ th.column_box orelse th.num, th.box_dirty orelse th.num, th.sel_bg, th.search_bg orelse th.num } ++ [_][3]u8{ th.diagnostic_info orelse th.num, th.diagnostic_hint orelse th.num, th.diagnostic_warning orelse th.num } ++ @@ -468,28 +468,29 @@ const curated = struct { pub const dark = @import("themes/dark.zig"); }; -fn fold(comptime C: type) [@typeInfo(C).@"struct".decls.len]Theme { +fn fold(comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme { comptime { @setEvalBranchQuota(400000); - var out: [@typeInfo(C).@"struct".decls.len]Theme = undefined; - for (@typeInfo(C).@"struct".decls, 0..) |d, i| { + var out: [@typeInfo(C).@"struct".decl_names.len]Theme = undefined; + const theme_info = @typeInfo(Theme).@"struct"; + for (@typeInfo(C).@"struct".decl_names, 0..) |d, i| { var t: Theme = undefined; - const source = @field(C, d.name).theme; - for (@typeInfo(Theme).@"struct".fields) |f| { - @field(t, f.name) = if (f.type == ?Decor and @hasField(@TypeOf(source), f.name)) decor: { + const source = @field(C, d).theme; + for (theme_info.field_names, theme_info.field_types, theme_info.field_attrs) |name, T, attrs| { + @field(t, name) = if (T == ?Decor and @hasField(@TypeOf(source), name)) decor: { // A nested literal is folded field by field too. var decor: Decor = .{}; - const given = @field(source, f.name); - for (@typeInfo(Decor).@"struct".fields) |g| if (@hasField(@TypeOf(given), g.name)) { - @field(decor, g.name) = @field(given, g.name); + const given = @field(source, name); + for (@typeInfo(Decor).@"struct".field_names) |g| if (@hasField(@TypeOf(given), g)) { + @field(decor, g) = @field(given, g); }; break :decor decor; - } else if (@hasField(@TypeOf(source), f.name)) - @field(source, f.name) - else if (f.default_value_ptr) |ptr| - @as(*const f.type, @ptrCast(@alignCast(ptr))).* + } else if (@hasField(@TypeOf(source), name)) + @field(source, name) + else if (attrs.defaultValue(T)) |value| + value else - @compileError("theme " ++ d.name ++ " is missing " ++ f.name); + @compileError("theme " ++ d ++ " is missing " ++ name); } out[i] = t; } @@ -501,7 +502,7 @@ fn fold(comptime C: type) [@typeInfo(C).@"struct".decls.len]Theme { /// takes: a faithful port (`dracula`) keeps the plain name, and helix's /// looser copy of it is still there as `dracula_helix` (the zed ones already /// carry `_zed`). -fn foldImports(comptime ours: anytype, comptime C: type) [@typeInfo(C).@"struct".decls.len]Theme { +fn foldImports(comptime ours: anytype, comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme { comptime { @setEvalBranchQuota(400000); var out = fold(C); @@ -514,7 +515,7 @@ fn foldImports(comptime ours: anytype, comptime C: type) [@typeInfo(C).@"struct" pub const themes = fold(curated) ++ foldImports(fold(curated), @import("generated_themes")); /// The first `native_count` of `themes` are pardes's own; the rest imported. -pub const native_count = @typeInfo(curated).@"struct".decls.len; +pub const native_count = @typeInfo(curated).@"struct".decl_names.len; /// The picker's sections (`Themes`), in ring order, each running from /// the theme it names to the next section's; `NextColor` and `Theme` still @@ -677,8 +678,8 @@ pub const ChromeTheme = struct { pub fn interpolate(from: ChromeTheme, to: ChromeTheme, step: u16, steps: u16) ChromeTheme { var out: ChromeTheme = undefined; const t = @as(f32, @floatFromInt(@min(step, steps))) / @as(f32, @floatFromInt(@max(1, steps))); - inline for (@typeInfo(ChromeTheme).@"struct".fields) |field| - @field(out, field.name) = if (step == 0) @field(from, field.name) else if (step >= steps) @field(to, field.name) else mixOklab(@field(from, field.name), @field(to, field.name), t); + inline for (@typeInfo(ChromeTheme).@"struct".field_names) |name| + @field(out, name) = if (step == 0) @field(from, name) else if (step >= steps) @field(to, name) else mixOklab(@field(from, name), @field(to, name), t); return out; } }; @@ -801,14 +802,16 @@ pub fn loadThemeFile(p: *Pardes, generation: u32, bytes: []const u8, animate: bo themeFileError(p, request, error.ThemeFileTooLarge); return false; } - const source = p.gpa.dupeZ(u8, bytes) catch |err| { + const source = p.gpa.dupeSentinel(u8, bytes, 0) catch |err| { themeFileError(p, request, err); return false; }; defer p.gpa.free(source); - var diagnostics: std.zon.parse.Diagnostics = .{}; - defer diagnostics.deinit(p.gpa); - const parsed = std.zon.parse.fromSliceAlloc(Theme, p.gpa, source, &diagnostics, .{}) catch |err| { + // The parse's results live in `arena`; the theme kept owns only its name. + var arena: std.heap.ArenaAllocator = .init(p.gpa); + defer arena.deinit(); + var diagnostics: std.zon.parse.Diagnostics = undefined; + var parsed = std.zon.parse.fromSlice(Theme, .{ .gpa = p.gpa, .arena = arena.allocator(), .source = source, .diagnostics = &diagnostics }) catch |err| { if (err != error.ParseZon) themeFileError(p, request, err) else { // Which line, and what the parser wanted there. var why: [200]u8 = undefined; @@ -817,10 +820,13 @@ pub fn loadThemeFile(p: *Pardes, generation: u32, bytes: []const u8, animate: bo return false; }; if (parsed.name.len == 0 or parsed.name.len > 255) { - std.zon.parse.free(p.gpa, parsed); themeFileError(p, request, error.InvalidThemeName); return false; } + parsed.name = p.gpa.dupe(u8, parsed.name) catch |err| { + themeFileError(p, request, err); + return false; + }; const target_chrome = ChromeTheme.fromTheme(&parsed); if (animate and p.animate_theme_changes) @@ -829,7 +835,7 @@ pub fn loadThemeFile(p: *Pardes, generation: u32, bytes: []const u8, animate: bo p.chrome_animation.snap(target_chrome); const old = p.custom_theme; p.custom_theme = parsed; - if (old) |theme_value| std.zon.parse.free(p.gpa, theme_value); + if (old) |theme_value| p.gpa.free(theme_value.name); var settled: [limits.host_path_cap]u8 = undefined; @memcpy(settled[0..request.path.len], request.path); _ = p.theme_file_loaded.set(settled[0..request.path.len]); @@ -847,7 +853,7 @@ pub fn carryTheme(p: *Pardes, old: *const Pardes, index: bool) !void { const t = old.custom_theme orelse return; var copy = t; copy.name = try p.gpa.dupe(u8, t.name); - if (p.custom_theme) |mine| std.zon.parse.free(p.gpa, mine); + if (p.custom_theme) |mine| p.gpa.free(mine.name); p.custom_theme = copy; _ = p.theme_file_loaded.set(old.theme_file_loaded.get()); } @@ -931,7 +937,7 @@ fn likeness(theme_name: []const u8, name: []const u8) usize { in_order += 1; pos = at + 1; } - const inside: usize = if (name.len > 0 and std.ascii.indexOfIgnoreCase(theme_name, name) != null) name.len * 4 else 0; + const inside: usize = if (name.len > 0 and std.ascii.findIgnoreCase(theme_name, name) != null) name.len * 4 else 0; return prefix * 3 + in_order + inside; } @@ -952,7 +958,7 @@ pub fn setThemeIndex(p: *Pardes, index: usize) void { p.chrome_animation.snap(target_chrome); if (p.custom_theme) |theme_value| { p.custom_theme = null; - std.zon.parse.free(p.gpa, theme_value); + p.gpa.free(theme_value.name); } p.theme_file_loaded.clear(); if (p.theme_file_path.get().len > 0) { @@ -1264,10 +1270,12 @@ test "legacy ThemeFile documents inherit Pardes UI roles without new fields" { rest = rest[at + std.mem.indexOfScalar(u8, rest[at..], '}').? + 1 ..]; rest = std.mem.trimStart(u8, rest, " ,"); } - const source = try std.testing.allocator.dupeZ(u8, legacy.items); + const source = try std.testing.allocator.dupeSentinel(u8, legacy.items, 0); defer std.testing.allocator.free(source); - const parsed = try std.zon.parse.fromSliceAlloc(Theme, std.testing.allocator, source, null, .{}); - defer std.zon.parse.free(std.testing.allocator, parsed); + var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); + defer arena.deinit(); + var diagnostics: std.zon.parse.Diagnostics = undefined; + const parsed = try std.zon.parse.fromSlice(Theme, .{ .gpa = std.testing.allocator, .arena = arena.allocator(), .source = source, .diagnostics = &diagnostics }); try std.testing.expectEqual(@as(?[3]u8, null), parsed.tag_active_bg); try std.testing.expectEqual(@as(?[3]u8, null), parsed.tag_name_fg); try std.testing.expectEqual(@as(?[3]u8, null), parsed.tag_active_name_fg); diff --git a/src/config.zig b/src/config.zig index 50009660..8166954d 100644 --- a/src/config.zig +++ b/src/config.zig @@ -2170,10 +2170,12 @@ pub const User = struct { defer gpa.free(one_path); const bytes = try std.Io.Dir.cwd().readFileAlloc(io, one_path, gpa, .limited(4096)); defer gpa.free(bytes); - const source = try gpa.dupeZ(u8, bytes); + const source = try gpa.dupeSentinel(u8, bytes, 0); defer gpa.free(source); - const parsed = try std.zon.parse.fromSliceAlloc(Sample, gpa, source, null, .{}); - defer std.zon.parse.free(gpa, parsed); + var arena: std.heap.ArenaAllocator = .init(gpa); + defer arena.deinit(); + var diagnostics: std.zon.parse.Diagnostics = undefined; + const parsed = try std.zon.parse.fromSlice(Sample, .{ .gpa = gpa, .arena = arena.allocator(), .source = source, .diagnostics = &diagnostics }); try std.testing.expectEqualStrings("one", parsed.name); try std.testing.expectEqual([3]u8{ 1, 2, 3 }, parsed.rgb); } @@ -2239,25 +2241,26 @@ const doc_typ = struct { fn hasChordField(T: type) bool { if (@typeInfo(T) != .array or @typeInfo(@typeInfo(T).array.child) != .@"struct") return false; - for (@typeInfo(@typeInfo(T).array.child).@"struct".fields) |f| if (f.type == Chord) return true; + for (@typeInfo(@typeInfo(T).array.child).@"struct".field_types) |F| if (F == Chord) return true; return false; } /// Bound somewhere in this file: a binding, a prefix or a key list. fn bound(c: Chord) bool { const config = @import("config.zig"); - inline for (@typeInfo(config).@"struct".decls) |d| { - const v = @field(config, d.name); + inline for (@typeInfo(config).@"struct".decl_names) |d| { + const v = @field(config, d); const T = @TypeOf(v); if (T == []const Chord) { for (v) |b| if (same(b, c)) return true; } else if (T == comptime_int or T == u21 or T == u8) { // a prefix or a bare key; only the tty toggle carries Ctrl - const plain = !c.alt and !c.shift and (!c.ctrl or comptime std.mem.indexOf(u8, d.name, "toggle") != null); + const plain = !c.alt and !c.shift and (!c.ctrl or comptime std.mem.indexOf(u8, d, "toggle") != null); if (plain and v >= 0x20 and v < 0x7f and v == c.cp) return true; } else if (comptime hasChordField(T)) { - for (v) |e| inline for (@typeInfo(@TypeOf(e)).@"struct".fields) |f| - if (f.type == Chord and same(@field(e, f.name), c)) return true; + const info = @typeInfo(@TypeOf(v[0])).@"struct"; + for (v) |e| inline for (info.field_names, info.field_types) |name, F| + if (F == Chord and same(@field(e, name), c)) return true; } } return false; diff --git a/src/detached/client.zig b/src/detached/client.zig index 69ab2fdd..cf1842d9 100644 --- a/src/detached/client.zig +++ b/src/detached/client.zig @@ -1182,12 +1182,12 @@ test "detached session: a frontend is never asked to fork, write, or watch" { // One: the union a frontend decodes into has no other variant. Named // rather than counted, so re-adding `spawn` fails with the name in it. - const fields = @typeInfo(wire.ServerMsg).@"union".fields; - inline for (fields) |f| { + const fields = @typeInfo(wire.ServerMsg).@"union".field_names; + inline for (fields) |name| { for (allowed) |ok| { - if (std.mem.eql(u8, f.name, ok)) break; + if (std.mem.eql(u8, name, ok)) break; } else { - std.debug.print("ServerMsg.{s} is not an effect a frontend may perform\n", .{f.name}); + std.debug.print("ServerMsg.{s} is not an effect a frontend may perform\n", .{name}); return error.MachineLocalEffectOnTheWire; } } diff --git a/src/detached/wire.zig b/src/detached/wire.zig index c9d9b578..f1b7a1b3 100644 --- a/src/detached/wire.zig +++ b/src/detached/wire.zig @@ -20,9 +20,10 @@ const chrome_layout: u64 = 0x5e758b47fb0cf8da; comptime { @setEvalBranchQuota(10_000); var hash = std.hash.Fnv1a_64.init(); - for (@typeInfo(pardes.Chrome).@"struct".fields) |field| { - hash.update(field.name); - hash.update(@typeName(field.type)); + const info = @typeInfo(pardes.Chrome).@"struct"; + for (info.field_names, info.field_types) |name, T| { + hash.update(name); + hash.update(@typeName(T)); } if (hash.final() != chrome_layout) @compileError(std.fmt.comptimePrint("pardes.Chrome changed (layout 0x{x}): bump wire.version, then chrome_layout", .{hash.final()})); } @@ -285,21 +286,22 @@ pub const Frame = struct { region.clip > region.rect.w or region.thumb_y > region.rect.h or region.thumb_h > region.rect.h - region.thumb_y) return error.BadValue; regions.appendAssumeCapacity(region); } - inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| { - const rgb = &@field(chrome, field.name); - if (field.type == ?[3]u8) { + const info = @typeInfo(pardes.Chrome).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + const rgb = &@field(chrome, name); + if (T == ?[3]u8) { if (try r.getBool()) { rgb.* = .{ 0, 0, 0 }; for (&rgb.*.?) |*channel| channel.* = try r.getByte(); } - } else if (field.type == u8) { + } else if (T == u8) { rgb.* = try r.getByte(); - } else if (field.type == u32) { + } else if (T == u32) { rgb.* = try r.getU32(); - } else if (field.type == f32) { + } else if (T == f32) { rgb.* = @bitCast(try r.getU32()); if (!std.math.isFinite(rgb.*)) return error.BadValue; - } else if (field.type == [8]f32) { + } else if (T == [8]f32) { for (rgb) |*value| { value.* = @bitCast(try r.getU32()); if (!std.math.isFinite(value.*)) return error.BadValue; @@ -781,7 +783,7 @@ pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, reg const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2 + 4 + 4; /// The palette: each colour three bytes, a theme's optional ones a flag /// before them. -const chrome_len = @typeInfo(pardes.Chrome).@"struct".fields.len * 4 + 8 * 4; +const chrome_len = @typeInfo(pardes.Chrome).@"struct".field_names.len * 4 + 8 * 4; pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region, chrome: pardes.Chrome) Error![]const u8 { // The protocol's ceiling, enforced by the ENCODER too, and BEFORE the @@ -865,18 +867,19 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point try w.putU32(@bitCast(region.lift)); try w.putU32(@bitCast(region.line)); } - inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| { - const rgb = @field(chrome, field.name); - if (field.type == ?[3]u8) { + const info = @typeInfo(pardes.Chrome).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + const rgb = @field(chrome, name); + if (T == ?[3]u8) { try w.putBool(rgb != null); if (rgb) |value| for (value) |channel| try w.putByte(channel); - } else if (field.type == u8) { + } else if (T == u8) { try w.putByte(rgb); - } else if (field.type == u32) { + } else if (T == u32) { try w.putU32(rgb); - } else if (field.type == f32) { + } else if (T == f32) { try w.putU32(@bitCast(rgb)); - } else if (field.type == [8]f32) { + } else if (T == [8]f32) { for (rgb) |value| try w.putU32(@bitCast(value)); } else for (rgb) |channel| try w.putByte(channel); } diff --git a/src/draw.zig b/src/draw.zig index b35d55e8..e6420ed4 100644 --- a/src/draw.zig +++ b/src/draw.zig @@ -1598,7 +1598,7 @@ test "a tag of three rows has its grip on the first, and band under it that stil test "place puts every part where the painters and layers put it, in every layout" { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 30 }); defer p.deinit(); - _ = try p.setTestFile("placed\n" ** 80); + _ = try p.setTestFile(std.mem.asBytes(&@as([80][7]u8, @splat("placed\n".*)))); p.newColumn(0); p.newScratchIn(0, p.activeColumn().?); p.newScratchBelow(0); @@ -1713,7 +1713,7 @@ test "a notice wider than its band, as a shader's compile error is, draws its en _ = try p.setTestFile("text\n"); var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); defer arena.deinit(); - const long = "Shader /home/someone/shaders/test_shadertoy_invalid.glsl: error: Linking fragment stage: No function definition (body) found: " ** 3; + const long = std.mem.asBytes(&@as([3][126]u8, @splat("Shader /home/someone/shaders/test_shadertoy_invalid.glsl: error: Linking fragment stage: No function definition (body) found: ".*))); for ([_][]const u8{ "Msg " ++ long, "" }) |line| { // The Msg builtin, and the path a failed compile takes (Post.zig). if (line.len > 0) try std.testing.expect(p.executeBuiltinLine(p.active, line)) else p.setMessage(p.active, long); @@ -1952,7 +1952,7 @@ test "the focused cursor glides a jump, lands a step at once, and is exact at re if (!builtins.capabilities.lift) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 30 }); defer p.deinit(); - _ = try p.setTestFile("some text on a line\n" ** 20); + _ = try p.setTestFile(std.mem.asBytes(&@as([20][20]u8, @splat("some text on a line\n".*)))); p.settings.cursor_blink = false; var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); defer arena.deinit(); @@ -2078,7 +2078,7 @@ test "a terminal's cursor lands with scrolling output, never gliding against it" defer arena.deinit(); const ms = std.time.ns_per_ms; var now: u64 = std.time.ns_per_s; - p.update(.{ .output = .{ .pane = @intCast(term), .bytes = "line\r\n" ** 20 ++ "$ some command typed" } }); + p.update(.{ .output = .{ .pane = @intCast(term), .bytes = std.mem.asBytes(&@as([20][6]u8, @splat("line\r\n".*))) ++ "$ some command typed" } }); p.advance(now); _ = try p.render(arena.allocator()); // Enter: three lines of output scroll up, the cursor to a new prompt. @@ -2101,10 +2101,10 @@ test "a monkey over notices, prompts, tags and tiny panes at a gui's metrics nev const random = prng.random(); const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 }); defer p.deinit(); - _ = try p.setTestFile("fuzz\n\u{754c}\u{754c} wide\n" ** 20); + _ = try p.setTestFile(std.mem.asBytes(&@as([20][17]u8, @splat("fuzz\n\u{754c}\u{754c} wide\n".*)))); var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); defer arena.deinit(); - const words = [_][]const u8{ "error:", "\u{754c}", "x", "Shader /tmp/a.glsl:", "e\u{301}", "\t", "long-" ** 20, " " }; + const words = [_][]const u8{ "error:", "\u{754c}", "x", "Shader /tmp/a.glsl:", "e\u{301}", "\t", std.mem.asBytes(&@as([20][5]u8, @splat("long-".*))), " " }; const commands = [_][]const u8{ "New", "Newcol", "Collapse", "Tagbottom", "TreeContext", "Wrap", "Find", "Del", "FocusTint", "Debug" }; var text: std.ArrayListUnmanaged(u8) = .empty; defer text.deinit(std.testing.allocator); @@ -2143,7 +2143,7 @@ test "a monkey over notices, prompts, tags and tiny panes at a gui's metrics nev // A tag of several rows. 5 => if (p.panes[p.active]) |pane| { text.clearRetainingCapacity(); - for (0..random.uintAtMost(usize, 5)) |_| try text.appendSlice(std.testing.allocator, if (random.boolean()) " Look\nmore \u{754c}" else "\n" ++ "x" ** 150); + for (0..random.uintAtMost(usize, 5)) |_| try text.appendSlice(std.testing.allocator, if (random.boolean()) " Look\nmore \u{754c}" else "\n" ++ &@as([150]u8, @splat('x'))); if (pane.tag.own) |own| std.testing.allocator.free(own); pane.tag.own = try std.testing.allocator.dupe(u8, text.items); }, @@ -2173,7 +2173,7 @@ test "a wide glyph cut by a tag's or a notice's edge is joined into the grid as defer arena.deinit(); const pane = p.panes[p.active].?; // Both alignments, so one of them puts a wide glyph across each edge. - for ([_][]const u8{ "\u{754c}" ** 30, "x" ++ "\u{754c}" ** 30 }) |wide| { + for ([_][]const u8{ std.mem.asBytes(&@as([30][3]u8, @splat("\u{754c}".*))), "x" ++ std.mem.asBytes(&@as([30][3]u8, @splat("\u{754c}".*))) }) |wide| { if (pane.tag.own) |own| std.testing.allocator.free(own); pane.tag.own = try std.testing.allocator.dupe(u8, wide); var message: [200]u8 = undefined; @@ -2201,7 +2201,7 @@ test "a body with context rows is painted once, and the grid's rows are what a p if (comptime !@import("syntax.zig").enabled) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 60, .rows = 16 }); defer p.deinit(); - const pane = try p.setTestFile("pub const Box = struct {\n pub fn run() void {\n" ++ (" // body line\n" ** 30) ++ " }\n};\n"); + const pane = try p.setTestFile("pub const Box = struct {\n pub fn run() void {\n" ++ (std.mem.asBytes(&@as([30][21]u8, @splat(" // body line\n".*)))) ++ " }\n};\n"); p.gpa.free(pane.file.?.path); pane.file.?.path = try p.gpa.dupe(u8, "/test.zig"); if (!panes.File.supportsContext(pane)) return error.SkipZigTest; @@ -2250,7 +2250,7 @@ test "a body with context rows is painted once, and the grid's rows are what a p /// Two columns, the file in the left one and a shell in the right, the /// right one focused with its cursor settled. fn twoColumns(p: *Pardes, arena: *std.heap.ArenaAllocator) !void { - _ = try p.setTestFile("some text on a line\n" ** 6); + _ = try p.setTestFile(std.mem.asBytes(&@as([6][20]u8, @splat("some text on a line\n".*)))); _ = try p.newShell(1, ""); try std.testing.expect(layout.splitColumn(p, 0, 1, false)); p.sync(); @@ -2386,7 +2386,7 @@ test "a pane focus reaches brightens on the same spring the one it leaves dims o if (!builtins.capabilities.lift) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 }); defer p.deinit(); - _ = try p.setTestFile("some text on a line\n" ** 4); + _ = try p.setTestFile(std.mem.asBytes(&@as([4][20]u8, @splat("some text on a line\n".*)))); p.newScratchBelow(0); p.settings.inactive_dim = 40; p.settings.motion = .smooth; diff --git a/src/dump.zig b/src/dump.zig index 402918c4..545d09ec 100644 --- a/src/dump.zig +++ b/src/dump.zig @@ -421,9 +421,9 @@ pub const Parsed = struct { pub fn check(gpa: std.mem.Allocator, bytes: []const u8, why: []u8) !void { var arena: std.heap.ArenaAllocator = .init(gpa); defer arena.deinit(); - const source = try arena.allocator().dupeZ(u8, bytes); - var diag: std.zon.parse.Diagnostics = .{}; - const state = std.zon.parse.fromSliceAlloc(State, arena.allocator(), source, &diag, .{ .free_on_error = false }) catch |err| { + const source = try arena.allocator().dupeSentinel(u8, bytes, 0); + var diag: std.zon.parse.Diagnostics = undefined; + const state = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena.allocator(), .source = source, .diagnostics = &diag }) catch |err| { const said = pardes.Messages.zonWhy(&diag, why[0 .. why.len - 1]); if (said.ptr != why.ptr) @memcpy(why[0..said.len], said); why[said.len] = 0; @@ -436,21 +436,13 @@ pub fn readZon(gpa: std.mem.Allocator, bytes: []const u8, label: []const u8) !Pa var parsed: Parsed = .{ .value = undefined, .arena = .init(gpa) }; errdefer parsed.deinit(); const arena = parsed.arena.allocator(); - const source = try gpa.dupeZ(u8, bytes); + const source = try gpa.dupeSentinel(u8, bytes, 0); defer gpa.free(source); - parsed.value = if (builtin.os.tag == .emscripten or builtin.os.tag == .freestanding) - std.zon.parse.fromSliceAlloc(State, arena, source, null, .{ .free_on_error = false }) catch |err| { - if (err == error.ParseZon) log.err("parse dump {s}: {s}", .{ label, @errorName(err) }); - return err; - } - else blk: { - var diag: std.zon.parse.Diagnostics = .{}; - defer diag.deinit(arena); - break :blk std.zon.parse.fromSliceAlloc(State, arena, source, &diag, .{ .free_on_error = false }) catch |err| { - if (err == error.ParseZon) log.err("parse dump {s}: {f}", .{ label, diag }); - return err; - }; + var diag: std.zon.parse.Diagnostics = undefined; + parsed.value = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena, .source = source, .diagnostics = &diag }) catch |err| { + if (err == error.ParseZon) log.err("{f}", .{diag.fmt(label)}); + return err; }; try validate(parsed.value); return parsed; diff --git a/src/esp32p4.zig b/src/esp32p4.zig index 6772e75d..ed18efd9 100644 --- a/src/esp32p4.zig +++ b/src/esp32p4.zig @@ -506,7 +506,7 @@ fn apply(c: *pardes.Pardes, ev: vaxis.Event) void { c.update(.pointer_leave); dirty = true; }, - .focus_in, .mouse_leave => {}, + .focus_in, .mouse_leave, .cursor_position => {}, // Capability replies. vaxis's own Loop sets these fields directly (`Loop.zig:377-403`); // with no Loop, this is where they land. DA1 is the terminator: every terminal answers it // last, so it is the signal that the whole handshake is in and the detected features can be diff --git a/src/esp32p4/input_rescue.zig b/src/esp32p4/input_rescue.zig index ba6974d2..d7556d46 100644 --- a/src/esp32p4/input_rescue.zig +++ b/src/esp32p4/input_rescue.zig @@ -245,7 +245,7 @@ test "a long transmit does not lose the input that arrives during it" { defer port.sent.deinit(std.testing.allocator); var ring: Ring = .{}; - const frame = "\x1b[1;1H" ++ "x" ** 400; + const frame = "\x1b[1;1H" ++ &@as([400]u8, @splat('x')); try std.testing.expectEqual(@as(u32, 0), pump(&port, &ring, frame, 1_000_000)); // Every output byte went out, in order. diff --git a/src/esp32p4/selftest.zig b/src/esp32p4/selftest.zig index 97b43059..19b71e90 100644 --- a/src/esp32p4/selftest.zig +++ b/src/esp32p4/selftest.zig @@ -270,7 +270,7 @@ export fn zig_main() noreturn { const typed = "the quick brown fox jumps over the lazy dog, and then some more besides"; var port: FakePort = .{ .tx_cap = 2, .incoming = typed }; var ring: input_rescue.Ring = .{}; - const frame = "\x1b[1;1H" ++ "x" ** 300; + const frame = "\x1b[1;1H" ++ &@as([300]u8, @splat('x')); const abandoned = input_rescue.pump(&port, &ring, frame, 1_000_000); check("the frame went out whole", abandoned == 0 and port.sent == frame.len); diff --git a/src/fs.zig b/src/fs.zig index fb76cee3..061d4225 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -677,7 +677,7 @@ pub fn statPath(io: std.Io, path: []const u8, options: std.Io.Dir.StatFileOption } test "a path with a part over 255 bytes is NameTooLong, never a panic" { - const long = "/tmp/" ++ "x" ** 300 ++ "/f"; + const long = "/tmp/" ++ &@as([300]u8, @splat('x')) ++ "/f"; try std.testing.expectError(error.NameTooLong, statPath(std.testing.io, long, .{})); } @@ -1152,7 +1152,7 @@ pub fn find(arena: std.mem.Allocator, dir: []const u8, pat: []const u8, out: []u notes.skipped += 1; continue; }) orelse break; - if (std.ascii.indexOfIgnoreCase(e.basename, pat) != null) { + if (std.ascii.findIgnoreCase(e.basename, pat) != null) { hits[hits_len] = try arena.dupe(u8, e.path); hits_len += 1; } @@ -1167,7 +1167,7 @@ pub fn find(arena: std.mem.Allocator, dir: []const u8, pat: []const u8, out: []u } else { for (sources) |s| { if (hits_len >= hits.len) break; - if (std.ascii.indexOfIgnoreCase(std.fs.path.basename(s.path), pat) != null) { + if (std.ascii.findIgnoreCase(std.fs.path.basename(s.path), pat) != null) { hits[hits_len] = s.path; hits_len += 1; } @@ -1201,7 +1201,7 @@ fn grepText(path: []const u8, text: []const u8, pat: []const u8, out: []u8, budg while (it.next()) |raw| { line += 1; if (result.hits >= budget) break; - const at = std.ascii.indexOfIgnoreCase(raw, pat) orelse continue; + const at = std.ascii.findIgnoreCase(raw, pat) orelse continue; const ln = std.mem.trimEnd(u8, raw, " \t\r"); var cut = @min(ln.len, 200); while (cut > 0 and cut < ln.len and ln[cut] & 0xc0 == 0x80) cut -= 1; diff --git a/src/gui/Post.zig b/src/gui/Post.zig index fc256135..8d0e14d9 100644 --- a/src/gui/Post.zig +++ b/src/gui/Post.zig @@ -610,13 +610,13 @@ const GhosttyUniforms = extern struct { }; test "the uniform block is ghostty's, offset for offset, and the prefix names it in that order" { - const ours = @typeInfo(Uniforms).@"struct".fields; - const theirs = @typeInfo(GhosttyUniforms).@"struct".fields; - try std.testing.expectEqual(theirs.len, ours.len); + const ours = @typeInfo(Uniforms).@"struct"; + const theirs = @typeInfo(GhosttyUniforms).@"struct"; + try std.testing.expectEqual(theirs.field_names.len, ours.field_names.len); try std.testing.expectEqual(@sizeOf(GhosttyUniforms), @sizeOf(Uniforms)); - inline for (ours, theirs) |a, b| { - try std.testing.expectEqual(@offsetOf(GhosttyUniforms, b.name), @offsetOf(Uniforms, a.name)); - try std.testing.expectEqual(b.type, a.type); + inline for (ours.field_names, ours.field_types, theirs.field_names, theirs.field_types) |a, a_type, b, b_type| { + try std.testing.expectEqual(@offsetOf(GhosttyUniforms, b), @offsetOf(Uniforms, a)); + try std.testing.expectEqual(b_type, a_type); } // By NAME: iSelectionForegroundColor sits where ghostty's Zig says // selection_background, which is where its GLSL puts the foreground. @@ -633,7 +633,7 @@ test "the uniform block is ghostty's, offset for offset, and the prefix names it .{ "vec3", "iBackgroundColor" }, .{ "vec3", "iForegroundColor" }, .{ "vec3", "iCursorColor" }, .{ "vec3", "iCursorText" }, .{ "vec3", "iSelectionForegroundColor" }, .{ "vec3", "iSelectionBackgroundColor" }, }; - try std.testing.expectEqual(ours.len, glsl.len); + try std.testing.expectEqual(ours.field_names.len, glsl.len); // Its three blocks (Globals, Palette, Colors) read as one, in order. const start = std.mem.indexOf(u8, prefix, "uniform Globals {").?; const end = std.mem.indexOf(u8, prefix, "uniform PardesPost {").?; diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 5a026664..b8687fd3 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -25,11 +25,7 @@ const ninep_io = @import("../9p_io.zig"); const detached_client = @import("../detached/client.zig"); const tracy = @import("../tracy.zig"); -pub const c = @cImport({ - @cDefine("SDL_DISABLE_OLD_NAMES", "1"); - @cInclude("SDL3/SDL.h"); - @cInclude("font.h"); -}); +pub const c = @import("gui_c"); // SDL3 and font.h, translated by build.zig const host_io = @import("../host_io.zig"); extern "c" fn setenv(name: [*:0]const u8, value: [*:0]const u8, overwrite: c_int) c_int; @@ -4806,7 +4802,7 @@ fn dumpThemes(ctx: ?*anyopaque, pane: u8) void { } fn putClipboard(gpa: std.mem.Allocator, text: []const u8) void { - const z = gpa.dupeZ(u8, text) catch return; + const z = gpa.dupeSentinel(u8, text, 0) catch return; defer gpa.free(z); _ = c.SDL_SetClipboardText(z.ptr); } @@ -5131,7 +5127,7 @@ test "a wheel over codex in a terminal reaches its pty as the mouse reports it a wheelAt(&g, &in, .{ .y = 1, .integer_y = 1 }, mc); try std.testing.expectEqualStrings("\x1b[<64;6;4M", try Sent.take(core, &sent)); wheelAt(&g, &in, .{ .y = -3, .integer_y = -3 }, mc); - try std.testing.expectEqualStrings("\x1b[<65;6;4M" ** 3, try Sent.take(core, &sent)); + try std.testing.expectEqualStrings(std.mem.asBytes(&@as([3][10]u8, @splat("\x1b[<65;6;4M".*))), try Sent.take(core, &sent)); try std.testing.expectEqual(@as(i32, 0), g.scroll_notch); try std.testing.expect(g.scroll_pane == null); // A touchpad's fractions add up to a turn. @@ -7157,7 +7153,7 @@ test "every pixel of a grip column is band, button or ring, and the button sits const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .cols = 60, .rows = 20 }); defer core.deinit(); - const pane = try core.setTestFile("text\n" ** 60); + const pane = try core.setTestFile(std.mem.asBytes(&@as([60][5]u8, @splat("text\n".*)))); pane.tag.own = try gpa.dupe(u8, "second\nthird"); core.newScratchBelow(0); for ([_]struct { w: u32, h: u32, tag: u32 }{ .{ .w = 10, .h = 20, .tag = 12 }, .{ .w = 17, .h = 35, .tag = 30 }, .{ .w = 9, .h = 19, .tag = 15 }, .{ .w = 12, .h = 24, .tag = 24 } }) |m| for ([_]bool{ false, true }) |bottom| for ([_]usize{ 0, 1 }) |focus| for ([_]bool{ false, true }) |dirty| { @@ -10156,7 +10152,7 @@ test "the selection glows round its block, on the body only, fading in over 100 const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 }); defer core.deinit(); - _ = try core.setTestFile("some text on a line\n" ** 30); + _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*)))); core.settings.selection_glow = true; pardes.test_api.sync(core); const s = try core.render(core.scratch.allocator()); @@ -10206,7 +10202,7 @@ test "a hovered word glows along its foot, never over the cursor, fading in over const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 }); defer core.deinit(); - _ = try core.setTestFile("some text on a line\n" ** 30); + _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*)))); core.settings.hover_glow = true; pardes.test_api.sync(core); const s = try core.render(core.scratch.allocator()); @@ -10256,7 +10252,7 @@ test "occlusion shades each body's edges, inside it, never a tag, a grip or the const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 }); defer core.deinit(); - _ = try core.setTestFile("some text on a line\n" ** 30); + _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*)))); core.settings.occlusion = true; pardes.test_api.sync(core); const s = try core.render(core.scratch.allocator()); @@ -10295,7 +10291,7 @@ test "a body tells its first line, and lapis's dots under it move a quarter as f const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 }); defer core.deinit(); - const pane = try core.setTestFile("line\n" ** 80); + const pane = try core.setTestFile(std.mem.asBytes(&@as([80][5]u8, @splat("line\n".*)))); pane.scrollBy(8); try std.testing.expect(core.executeBuiltinLine(0, "Theme lapis")); core.settings.parallax = true; diff --git a/src/host_io.zig b/src/host_io.zig index a90c903d..d789a77d 100644 --- a/src/host_io.zig +++ b/src/host_io.zig @@ -172,7 +172,7 @@ pub const Lsp = struct { const declared_path = if (file) |f| f.path else ""; const path = try gpa.dupe(u8, filesystem.localPath(declared_path) orelse declared_path); errdefer gpa.free(path); - const source = try gpa.dupeZ(u8, if (file) |f| f.content else ""); + const source = try gpa.dupeSentinel(u8, if (file) |f| f.content else "", 0); errdefer gpa.free(source); const arg = try gpa.dupe(u8, req.arg); errdefer gpa.free(arg); @@ -210,7 +210,7 @@ pub const Lsp = struct { if (f.output != null) continue; const local = filesystem.localPath(f.path) orelse continue; const other_path = try gpa.dupe(u8, local); - const other_source = gpa.dupeZ(u8, f.content) catch |err| { + const other_source = gpa.dupeSentinel(u8, f.content, 0) catch |err| { gpa.free(other_path); return err; }; @@ -785,7 +785,7 @@ pub const Shell = struct { var dir_buf: [4096]u8 = undefined; const dir = dir_buf[0..try tmp.dir.realPath(std.testing.io, &dir_buf)]; var path: [4200:0]u8 = undefined; - const p = try std.fmt.bufPrintZ(&path, "{s}/mysh", .{dir}); + const p = try std.fmt.bufPrintSentinel(&path, "{s}/mysh", .{dir}, 0); try std.testing.expectEqual(Family.bash, familyOf(p.ptr)); try std.testing.expectEqual(Family.none, familyOf("/bin/sh")); } @@ -1662,7 +1662,7 @@ pub fn forkShell( test "shell spawn rejects invalid directories before creating a child" { const rcs: Shell.PromptFiles = .{}; try std.testing.expectError(error.InvalidPath, forkShell(null, 0, &rcs, "/bin/sh", "/tmp\x00/ignored", 24, 80, null)); - const too_long = [_]u8{'x'} ** 4096; + const too_long = @as([4096]u8, @splat('x')); try std.testing.expectError(error.NameTooLong, forkShell(null, 0, &rcs, "/bin/sh", &too_long, 24, 80, null)); var tmp = std.testing.tmpDir(.{}); @@ -1675,7 +1675,7 @@ test "shell spawn rejects invalid directories before creating a child" { try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", file, 24, 80, null)); const explicit_file = try std.fmt.bufPrint(&path_buf, "/n/os{s}/file", .{directory}); try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", explicit_file, 24, 80, null)); - const missing = try std.fmt.bufPrint(&path_buf, "{s}/missing/" ++ ("child/" ** 50), .{directory}); + const missing = try std.fmt.bufPrint(&path_buf, "{s}/missing/" ++ (std.mem.asBytes(&@as([50][6]u8, @splat("child/".*)))), .{directory}); try std.testing.expect(missing.len > 256); try std.testing.expectError(error.FileNotFound, forkShell(null, 0, &rcs, "/bin/sh", missing, 24, 80, null)); } @@ -1720,7 +1720,7 @@ test "shell spawn uses an explicit OS directory longer than 256 bytes" { if (!haveFile("/bin/sh")) return error.SkipZigTest; var tmp = std.testing.tmpDir(.{}); defer tmp.cleanup(); - const sub_path = "nested-directory-with-more-than-forty-characters/" ** 7; + const sub_path = std.mem.asBytes(&@as([7][49]u8, @splat("nested-directory-with-more-than-forty-characters/".*))); try tmp.dir.createDirPath(std.testing.io, sub_path); var directory_buf: [4096]u8 = undefined; const directory = directory_buf[0..try tmp.dir.realPathFile(std.testing.io, sub_path, &directory_buf)]; @@ -1801,7 +1801,7 @@ test "shell cwd rejects truncation and preserves an owned child path longer than const io = std.testing.io; var tmp = std.testing.tmpDir(.{}); defer tmp.cleanup(); - const nested = "nested-directory-with-more-than-forty-characters/" ** 24; + const nested = std.mem.asBytes(&@as([24][49]u8, @splat("nested-directory-with-more-than-forty-characters/".*))); try tmp.dir.createDirPath(io, nested); var path_buf: [pardes.memory.limits.host_path_cap + 1]u8 = undefined; const directory = path_buf[0..try tmp.dir.realPathFile(io, nested, &path_buf)]; diff --git a/src/image.zig b/src/image.zig index 72520ad6..8bf9de08 100644 --- a/src/image.zig +++ b/src/image.zig @@ -242,11 +242,11 @@ pub const GlyphArt = struct { const glyphs_ascii = glyphs ++ ascii_glyphs; fn matchCell(cell: *const [64][3]u8, pal: Palette, gset: []const Glyph) Cell { - var counts = [_]u16{0} ** 16; + var counts = @as([16]u16, @splat(0)); for (cell) |px| counts[nearest(px, pal)] += 1; var cand: [4]u4 = undefined; var ncand: usize = 0; - var used = [_]bool{false} ** 16; + var used = @as([16]bool, @splat(false)); while (ncand < 4) : (ncand += 1) { var best: ?usize = null; for (counts, 0..) |c, i| { @@ -432,7 +432,7 @@ pub const GlyphArt = struct { test "render: tiny image produces a grid within bounds" { const a = std.testing.allocator; // 2x2 checker, RGBA - var img = [_]u8{0} ** (2 * 2 * 4); + var img = @as([2 * 2 * 4]u8, @splat(0)); img[0] = 255; img[1] = 255; img[2] = 255; diff --git a/src/linux/v9fs.zig b/src/linux/v9fs.zig index 5e031bfe..15945e7b 100644 --- a/src/linux/v9fs.zig +++ b/src/linux/v9fs.zig @@ -64,11 +64,11 @@ pub fn helperPath(buf: []u8) ![:0]u8 { const path = if (std.c.getenv("PARDES_V9FS_HELPER")) |env| blk: { const override = std.mem.span(env); if (!std.fs.path.isAbsolute(override)) return error.AbsoluteHelperPathRequired; - break :blk try std.fmt.bufPrintZ(buf, "{s}", .{override}); + break :blk try std.fmt.bufPrintSentinel(buf, "{s}", .{override}, 0); } else blk: { var own: [4096]u8 = undefined; const parent = std.fs.path.dirname(try selfPath(&own)) orelse return error.ExecutablePathUnavailable; - break :blk try std.fmt.bufPrintZ(buf, "{s}/{s}", .{ parent, executable }); + break :blk try std.fmt.bufPrintSentinel(buf, "{s}/{s}", .{ parent, executable }, 0); }; if (std.c.access(path.ptr, 1) != 0) return error.V9fsHelperNotFound; return path; diff --git a/src/locations.zig b/src/locations.zig index 745393e5..2828566d 100644 --- a/src/locations.zig +++ b/src/locations.zig @@ -587,12 +587,13 @@ pub const Config = struct { const key = token[0..colon]; const value = token[colon + 1 ..]; var found = false; - inline for (@typeInfo(Config).@"struct".fields) |field| { - if (std.mem.eql(u8, key, field.name)) { - @field(result, field.name) = switch (@typeInfo(field.type)) { + const info = @typeInfo(Config).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + if (std.mem.eql(u8, key, name)) { + @field(result, name) = switch (@typeInfo(T)) { .bool => if (std.mem.eql(u8, value, "on")) true else if (std.mem.eql(u8, value, "off")) false else return error.ExpectedOnOrOff, - .int => std.fmt.parseInt(field.type, value, 10) catch return error.InvalidContext, - .@"enum" => std.meta.stringToEnum(field.type, value) orelse return error.InvalidLayout, + .int => std.fmt.parseInt(T, value, 10) catch return error.InvalidContext, + .@"enum" => std.meta.stringToEnum(T, value) orelse return error.InvalidLayout, else => @compileError("unsupported location setting type"), }; found = true; @@ -604,11 +605,12 @@ pub const Config = struct { } pub fn write(config: Config, writer: *std.Io.Writer) !void { - inline for (@typeInfo(Config).@"struct".fields, 0..) |field, index| { + const info = @typeInfo(Config).@"struct"; + inline for (info.field_names, info.field_types, 0..) |name, T, index| { if (index > 0) try writer.writeByte(' '); - try writer.writeAll(field.name ++ ":"); - const value = @field(config, field.name); - switch (@typeInfo(field.type)) { + try writer.writeAll(name ++ ":"); + const value = @field(config, name); + switch (@typeInfo(T)) { .bool => try writer.writeAll(if (value) "on" else "off"), .int => try writer.print("{d}", .{value}), .@"enum" => try writer.writeAll(@tagName(value)), @@ -809,11 +811,11 @@ test "locations cache bounds memory and entries and evicts least recently used" try std.testing.expectEqual(@as(usize, 2), cache.len); try std.testing.expect(cache.bytes <= 40); try std.testing.expectEqualStrings("b.unknown", cache.entries[0].path); - try std.testing.expectError(error.SourceTooLarge, cache.getBounded(gpa, "large.unknown", "x" ** 41, false, false, 40)); + try std.testing.expectError(error.SourceTooLarge, cache.getBounded(gpa, "large.unknown", &@as([41]u8, @splat('x')), false, false, 40)); try std.testing.expectEqual(@as(usize, 2), cache.len); if (syntax.supportsPath("large.zig")) { const before = cache.analyses; - try std.testing.expectError(error.SourceTooLarge, cache.getBounded(gpa, "large.zig", "x" ** 25, true, true, 40)); + try std.testing.expectError(error.SourceTooLarge, cache.getBounded(gpa, "large.zig", &@as([25]u8, @splat('x')), true, true, 40)); try std.testing.expectEqual(before, cache.analyses); } cache.deinit(gpa); diff --git a/src/look.zig b/src/look.zig index 1065cb02..f9c470cf 100644 --- a/src/look.zig +++ b/src/look.zig @@ -671,7 +671,7 @@ pub fn runSearch(p: *Pardes, id: usize, pat_raw: []const u8, kind: Search, start const cl: usize = @intCast(@max(0, pane.body.cur_row)); const cc: usize = @intCast(@max(0, pane.body.cur_col)); for (lines, 0..) |ln, i| { - const at = std.ascii.indexOfIgnoreCase(ln, pat) orelse continue; + const at = std.ascii.findIgnoreCase(ln, pat) orelse continue; const row = try std.fmt.allocPrint(arena, "{s}:{d}:{d}{c}{d} {s}\n", .{ loc, i + 1, at + 1, config.range_sep, at + pat.len, std.mem.trimEnd(u8, ln, " \t"), }); @@ -1273,7 +1273,7 @@ fn missText(text: []const u8, buf: *[miss_path_cap + "…".len]u8) []const u8 { test "a miss names a long path by its start and its end, its middle given up to …" { var cut: [miss_path_cap + "…".len]u8 = undefined; - const long = "/home/someone/" ++ "deep/" ** 80 ++ "the-file.zig"; + const long = "/home/someone/" ++ std.mem.asBytes(&@as([80][5]u8, @splat("deep/".*))) ++ "the-file.zig"; const said = missText(long, &cut); try std.testing.expect(said.len <= miss_path_cap); try std.testing.expect(std.mem.startsWith(u8, said, "/home/someone/")); @@ -2185,7 +2185,7 @@ test "Look ignores missing and out of bounds pane addresses" { test "a pointer resting where a look-hover found nothing does not wake the core every frame" { const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 }); defer p.deinit(); - _ = try p.setTestFile(" \n" ** 30); + _ = try p.setTestFile(std.mem.asBytes(&@as([30][6]u8, @splat(" \n".*)))); p.sync(); const r = p.rects[p.active]; // Resting on blanks in the body: a wait, then nothing to open. diff --git a/src/lsp/lsp.zig b/src/lsp/lsp.zig index 96d42bbd..4a70efe5 100644 --- a/src/lsp/lsp.zig +++ b/src/lsp/lsp.zig @@ -92,7 +92,7 @@ else pub const backend_name = "lsp-client"; pub const supports: std.EnumSet(Kind) = blk: { - var s: std.EnumSet(Kind) = .initEmpty(); + var s: std.EnumSet(Kind) = .empty; for (0..backends.len) |i| s.setUnion(backends[i].supports); break :blk s; }; diff --git a/src/lsp/lsp_client.zig b/src/lsp/lsp_client.zig index 54bbaa79..b396879b 100644 --- a/src/lsp/lsp_client.zig +++ b/src/lsp/lsp_client.zig @@ -159,7 +159,7 @@ pub const specs = [_]Spec{ /// answered per connection; a kind its server never advertised simply returns /// no rows, which the harness reports as CLAIMED-EMPTY per language — honest, /// since the claim here is about the protocol, not about every server. -pub const supports: std.EnumSet(lsp.Kind) = .initFull(); +pub const supports: std.EnumSet(lsp.Kind) = .full; /// Routing: an extension in the table whose spec is not disabled by its env /// var. Deliberately does NOT probe for the binary — this runs on the Tab diff --git a/src/macos.zig b/src/macos.zig index 20463481..37db0abd 100644 --- a/src/macos.zig +++ b/src/macos.zig @@ -724,7 +724,7 @@ fn initCore(runtime: ?*const Runtime, cols_arg: u16, rows_arg: u16) !void { // in Debug, libc's malloc otherwise. libc's measured at least as fast as // std.heap.smp_allocator everywhere and faster on MuPDF's page-sized // rasters, so this shell no longer differs. - const gpa = if (builtin.mode == .Debug) debug_gpa.allocator() else std.heap.c_allocator; + const gpa = if (builtin.mode == .debug) debug_gpa.allocator() else std.heap.c_allocator; const allocs = pardes.memory.init(gpa); errdefer pardes.memory.deinit(); @@ -858,7 +858,7 @@ export fn pardes_deinit() void { st.gpa.destroy(st.threaded); pardes.memory.deinit(); // Leaks are logged and do not fail, as std.start treats the others'. - if (builtin.mode == .Debug) { + if (builtin.mode == .debug) { _ = debug_gpa.deinit(); debug_gpa = .init; } @@ -2871,22 +2871,22 @@ test "pardes.h matches the Zig boundary" { try expectEqual(@offsetOf(c.pardes_cell_s, "len"), @offsetOf(Cell, "len")); try expectEqual(@offsetOf(c.pardes_cell_s, "flags"), @offsetOf(Cell, "flags")); try expectEqual(@sizeOf(c.pardes_scene_s), @sizeOf(Scene)); - inline for (@typeInfo(Scene).@"struct".fields) |field| - try expectEqual(@offsetOf(c.pardes_scene_s, field.name), @offsetOf(Scene, field.name)); + inline for (@typeInfo(Scene).@"struct".field_names) |name| + try expectEqual(@offsetOf(c.pardes_scene_s, name), @offsetOf(Scene, name)); try expectEqual(@sizeOf(c.pardes_panel_box_s), @sizeOf(PanelBox)); - inline for (@typeInfo(PanelBox).@"struct".fields) |field| - try expectEqual(@offsetOf(c.pardes_panel_box_s, field.name), @offsetOf(PanelBox, field.name)); + inline for (@typeInfo(PanelBox).@"struct".field_names) |name| + try expectEqual(@offsetOf(c.pardes_panel_box_s, name), @offsetOf(PanelBox, name)); try expectEqual(@sizeOf(c.pardes_panel_track_s), @sizeOf(PanelTrack)); - inline for (@typeInfo(PanelTrack).@"struct".fields) |field| { - const c_name = comptime if (std.mem.eql(u8, field.name, "motion")) + inline for (@typeInfo(PanelTrack).@"struct".field_names) |name| { + const c_name = comptime if (std.mem.eql(u8, name, "motion")) "reserved0" else - field.name; - try expectEqual(@offsetOf(c.pardes_panel_track_s, c_name), @offsetOf(PanelTrack, field.name)); + name; + try expectEqual(@offsetOf(c.pardes_panel_track_s, c_name), @offsetOf(PanelTrack, name)); } try expectEqual(@sizeOf(c.pardes_image_s), @sizeOf(Image)); - inline for (@typeInfo(Image).@"struct".fields) |field| - try expectEqual(@offsetOf(c.pardes_image_s, field.name), @offsetOf(Image, field.name)); + inline for (@typeInfo(Image).@"struct".field_names) |name| + try expectEqual(@offsetOf(c.pardes_image_s, name), @offsetOf(Image, name)); try expectEqual(@sizeOf(c.pardes_runtime_s), @sizeOf(Runtime)); try expectEqual(@as(u32, c.PARDES_COLOR_DEFAULT), color_default); @@ -3177,7 +3177,7 @@ test "mac tag layer ABI preserves logical capacity and physical grip" { }); try std.testing.expectEqual(@as(u32, 11), pardes_tag_layer_value(0, 8)); try std.testing.expectEqual(@as(u8, 'Z'), pardes_tag_layer_cells(0).?[11].text[0]); - var canonical: [24]Cell = @splat(encodeCell(.{ .text = .{'G'} ++ .{0} ** 6, .len = 1, .default = false })); + var canonical: [24]Cell = @splat(encodeCell(.{ .text = .{ 'G', 0, 0, 0, 0, 0, 0 }, .len = 1, .default = false })); var source: [24]pardes.Cell = @splat(.{}); blankTagCells(&canonical, 8, 3, &source, &core.surface.tag_layers); try std.testing.expectEqual(@as(u8, 'G'), canonical[9].text[0]); diff --git a/src/main.zig b/src/main.zig index 26259b43..e3bae75f 100644 --- a/src/main.zig +++ b/src/main.zig @@ -464,6 +464,12 @@ fn nativeMain(init: std.process.Init) !void { } opts.tty_only = explicit_tty or session_only; opts.mounts = mounts[0..mounts_len]; + // `zig build run-isolated` with nothing named: something to look at on + // arrival, read out of the binary itself. + if (pardes.isolated and positional == null) { + session_only = false; + positional = "src/pardes.zig"; + } if (detach != null and attach != null) badArgs(init.io, "--detach and --attach are opposites: one runs the session, the other joins one", .{}); // --wait waits on the pane a FILE opens: with none there is nothing to diff --git a/src/memory.zig b/src/memory.zig index abfd40f6..48403c55 100644 --- a/src/memory.zig +++ b/src/memory.zig @@ -38,7 +38,7 @@ pub const limits = struct { }; const Allocator = std.mem.Allocator; -const debug_enabled = builtin.mode == .Debug; +const debug_enabled = builtin.mode == .debug; pub const Allocators = struct { pardes: Allocator, diff --git a/src/modal.zig b/src/modal.zig index 50e0ddf4..82f1a3a0 100644 --- a/src/modal.zig +++ b/src/modal.zig @@ -163,7 +163,7 @@ pub const Normal = struct { }; pub const Input = struct { - roles: std.EnumSet(Role) = .initEmpty(), + roles: std.EnumSet(Role) = .empty, cp: u21, ctrl: bool = false, alt: bool = false, diff --git a/src/ninep/addr.zig b/src/ninep/addr.zig index b78c46e7..3feda5a2 100644 --- a/src/ninep/addr.zig +++ b/src/ninep/addr.zig @@ -646,7 +646,7 @@ test "the address language, form by form" { try testing.expectEqualStrings(c[1], th.wr(p, addr, c[0]).reply.ename); } - const nested = "," ** 4096; + const nested = &@as([4096]u8, @splat(',')); _ = th.wr(p, addr, "#0"); try testing.expectEqual(E.INVAL, th.wr(p, addr, nested).errno()); } diff --git a/src/ninep/cols.zig b/src/ninep/cols.zig index e3b456ba..59f6ae42 100644 --- a/src/ninep/cols.zig +++ b/src/ninep/cols.zig @@ -288,18 +288,18 @@ test "exactly 4096 bytes written with echo's newline after a truncation fit ever const p = try th.withFile(testing.allocator, "x\n"); defer p.deinit(); const serial = th.serialOf(p); - const text = "w" ** 4096 ++ "\n"; + const text = &@as([4096]u8, @splat('w')) ++ "\n"; for ([_]u64{ tree.Node.of(serial, .tag), tree.Node.ofCol(layout.columnSerial(p, 0), .tag), @intFromEnum(tree.TopFile.tag) }) |node| { _ = th.call(p, .{ .tag = 1, .op = .setattr, .node = node, .truncate = true }); const h = th.call(p, .{ .tag = 2, .op = .open, .node = node, .omode = 1 }).reply.handle; const r = th.call(p, .{ .tag = 3, .op = .write, .node = node, .handle = h, .data = text }); try testing.expectEqual(tree.Status.ok, r.reply.status); _ = th.call(p, .{ .tag = 4, .op = .release, .node = node, .handle = h, .opened = true }); - try testing.expect(std.mem.endsWith(u8, th.rd(p, node, 0, 1 << 16).bytes, "w" ** 4096)); + try testing.expect(std.mem.endsWith(u8, th.rd(p, node, 0, 1 << 16).bytes, &@as([4096]u8, @splat('w')))); // One more byte is over. _ = th.call(p, .{ .tag = 5, .op = .setattr, .node = node, .truncate = true }); const h2 = th.call(p, .{ .tag = 6, .op = .open, .node = node, .omode = 1 }).reply.handle; - try testing.expectEqual(E.NOSPC, th.call(p, .{ .tag = 7, .op = .write, .node = node, .handle = h2, .data = "w" ** 4097 ++ "\n" }).errno()); + try testing.expectEqual(E.NOSPC, th.call(p, .{ .tag = 7, .op = .write, .node = node, .handle = h2, .data = &@as([4097]u8, @splat('w')) ++ "\n" }).errno()); _ = th.call(p, .{ .tag = 8, .op = .release, .node = node, .handle = h2, .opened = true }); } } @@ -316,7 +316,7 @@ test "a Newcol refused because the tags would not fit logs its err alone and spe for (p.col_panes[col][0..p.col_n[col]]) |k| { const each = p.panes[k].?; if (each.tag.own) |old| p.gpa.free(old); - each.tag.own = try p.gpa.dupe(u8, "word " ** 60); + each.tag.own = try p.gpa.dupe(u8, std.mem.asBytes(&@as([60][5]u8, @splat("word ".*)))); } try testing.expect(p.col_n[col] >= 2); p.sync(); @@ -588,7 +588,7 @@ test "a refused write after a truncation leaves every kind of tag as it was, and defer p.deinit(); const serial = th.serialOf(p); const col = layout.columnSerial(p, 0); - const big = "w" ** (limits.max_tag_tail + 1); + const big = &@as([limits.max_tag_tail + 1]u8, @splat('w')); // Each tag: a truncating open, then a write too long: nothing changes. for ([_]u64{ Node.of(serial, .tag), Node.ofCol(col, .tag), @intFromEnum(tree.TopFile.tag) }) |node| { _ = th.wr(p, node, " Mine"); diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig index f6457b83..6b4bbafb 100644 --- a/src/ninep/ctl.zig +++ b/src/ninep/ctl.zig @@ -1682,9 +1682,9 @@ test "a look's miss repeats the path whole up to 256 bytes, then gives up its mi var line: [512]u8 = undefined; _ = wr(p, root, try std.fmt.bufPrint(&line, "{s}\n", .{long})); try testing.expect(th.logHas(p, try std.fmt.bufPrint(&line, "look: no match for \"{s}\"\n", .{long}))); - const huge = "é" ** 150; // 300 bytes: its middle cut to fit 256, between characters + const huge = std.mem.asBytes(&@as([150][2]u8, @splat("é".*))); // 300 bytes: its middle cut to fit 256, between characters _ = wr(p, root, huge ++ "\n"); - try testing.expect(th.logHas(p, "look: no match for \"" ++ "é" ** 63 ++ "…" ++ "é" ** 63 ++ "\"\n")); + try testing.expect(th.logHas(p, "look: no match for \"" ++ std.mem.asBytes(&@as([63][2]u8, @splat("é".*))) ++ "…" ++ std.mem.asBytes(&@as([63][2]u8, @splat("é".*))) ++ "\"\n")); } test "exec runs a builtin at the pane and records the pane it acted on" { @@ -2041,7 +2041,7 @@ test "Zerox twins dump their text once and come back on one buffer from a Restor defer p.deinit(); const first = serialOf(p); _ = wr(p, Node.of(first, .name), "/tmp/pardes-zerox-dump.txt\n"); - _ = wr(p, Node.of(first, .body), "unsaved " ** 64 ++ "\n"); + _ = wr(p, Node.of(first, .body), std.mem.asBytes(&@as([64][8]u8, @splat("unsaved ".*))) ++ "\n"); try testing.expect(p.executeBuiltinLine(0, "Zerox")); try testing.expect(p.executeBuiltinLine(0, "Zerox")); try pardes.dump.dumpState(p); @@ -2888,7 +2888,7 @@ test "a builtin that fails a ctl write logs only its err, so the same failure ag test "an exec line over the command limit fails the write and says the limit; a builtin's may be longer" { const p = try withFile(testing.allocator, "x\n"); defer p.deinit(); - const long = "echo " ++ "y" ** pardes.exec.command_max ++ "\n"; + const long = "echo " ++ &@as([pardes.exec.command_max]u8, @splat('y')) ++ "\n"; const refused = wr(p, root_exec, long); try testing.expectEqual(E.INVAL, refused.errno()); try testing.expectEqualStrings(e_too_long, refused.reply.ename); @@ -2896,7 +2896,7 @@ test "an exec line over the command limit fails the write and says the limit; a try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err {d} exec: invalid command line: a command line is at most 1024 bytes", .{serialOf(p)}))); try testing.expectEqualStrings(e_control, wr(p, root_exec, "echo a\x01b\n").reply.ename); try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err {d} exec: invalid command line: it holds", .{serialOf(p)}))); - try testing.expectEqual(Status.ok, wr(p, root_exec, "Msg " ++ "z" ** 1100 ++ "\n").reply.status); + try testing.expectEqual(Status.ok, wr(p, root_exec, "Msg " ++ &@as([1100]u8, @splat('z')) ++ "\n").reply.status); } test "Edit's p and = never fail for want of room for +Errors: the text is logged instead" { @@ -4012,8 +4012,8 @@ test "Back and Forward written to exec keep to the focused file, and JumpScope a defer p.deinit(); var tmp = testing.tmpDir(.{}); defer tmp.cleanup(); - try tmp.dir.writeFile(testing.io, .{ .sub_path = "a.txt", .data = "row\n" ** 100 }); - try tmp.dir.writeFile(testing.io, .{ .sub_path = "b.txt", .data = "row\n" ** 100 }); + try tmp.dir.writeFile(testing.io, .{ .sub_path = "a.txt", .data = std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*))) }); + try tmp.dir.writeFile(testing.io, .{ .sub_path = "b.txt", .data = std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*))) }); var dir_buf: [4096]u8 = undefined; const dir = dir_buf[0..try tmp.dir.realPath(testing.io, &dir_buf)]; var line: [4200]u8 = undefined; diff --git a/src/ninep/events.zig b/src/ninep/events.zig index 3910ac05..7b73dc0e 100644 --- a/src/ninep/events.zig +++ b/src/ninep/events.zig @@ -938,7 +938,7 @@ test "event records are acme's bytes, one per read, and .again when empty" { try testing.expectEqualStrings("ML0 ", rd(p, event, 0, 4).bytes); try testing.expectEqualStrings("3 4 3 one\n", rd(p, event, 0, 4096).bytes); - const big = "z" ** max_record_text; + const big = &@as([max_record_text]u8, @splat('z')); _ = noteAction(p, 0, .body_exec, 0, max_record_text, 0, big); try testing.expectEqualStrings("MX0 256 0 0 \n", rd(p, event, 0, 4096).bytes); @@ -1388,7 +1388,7 @@ test "opens of the log share the open records, and a closed one frees its record test "a click in the body reports the offsets of the word it takes, so the record can be written back" { const config = @import("../config.zig"); const gpa = testing.allocator; - const text = "alpha qty beta\n qty\n\tqty\ndef f(qty): return qty.x\n" ++ "w" ** 100 ++ " qty\n"; + const text = "alpha qty beta\n qty\n\tqty\ndef f(qty): return qty.x\n" ++ &@as([100]u8, @splat('w')) ++ " qty\n"; const p = try withFile(gpa, text); defer p.deinit(); // A scratch made over 9P, clicked while another pane has the keyboard. @@ -1459,7 +1459,7 @@ test "follow new skips what the log held and waits for what comes after" { test "a long msg record is cut between words at its cap, with an ellipsis" { const p = try withFile(testing.allocator, "x\n"); defer p.deinit(); - const long = "word " ** 60; // 300 bytes + const long = std.mem.asBytes(&@as([60][5]u8, @splat("word ".*))); // 300 bytes _ = wr(p, Node.of(serialOf(p), .ctl), "Msg " ++ long ++ "\n"); const log = @intFromEnum(tree.TopFile.log); const h = call(p, .{ .tag = 1, .op = .open, .node = log }).reply.handle; @@ -1485,7 +1485,7 @@ test "a record is one line of UTF-8: DEL and C1 are spaces, bytes not UTF-8 are test "a long err record keeps its end, its middle given up to an ellipsis" { const p = try withFile(testing.allocator, "x\n"); defer p.deinit(); - _ = wr(p, @intFromEnum(tree.TopFile.ctl), "Bogus" ++ "abcdefgh" ** 40 ++ "\n"); + _ = wr(p, @intFromEnum(tree.TopFile.ctl), "Bogus" ++ std.mem.asBytes(&@as([40][8]u8, @splat("abcdefgh".*))) ++ "\n"); const log = @intFromEnum(tree.TopFile.log); const h = call(p, .{ .tag = 1, .op = .open, .node = log }).reply.handle; const text = call(p, .{ .tag = 2, .op = .read, .node = log, .handle = h, .size = 1 << 16 }).bytes; @@ -1500,7 +1500,7 @@ test "a long err record keeps its end, its middle given up to an ellipsis" { test "two failures that agree only in what their records cut are two records, not one counted" { const p = try th.withFile(testing.allocator, "x\n"); defer p.deinit(); - const long = "why " ** 80; + const long = std.mem.asBytes(&@as([80][4]u8, @splat("why ".*))); p.setMessage(0, long ++ "first"); p.setMessage(0, long ++ "second"); try testing.expect(!th.logHas(p, "(x2)")); diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig index 3b70d62f..8605cab8 100644 --- a/src/ninep/pane.zig +++ b/src/ninep/pane.zig @@ -1427,7 +1427,7 @@ test "a tag write past the limit is refused whole, naming the limit" { const tag = Node.of(serialOf(p), .tag); const before = try testing.allocator.dupe(u8, rd(p, tag, 0, 1 << 16).bytes); defer testing.allocator.free(before); - const big = "w" ** (limits.max_tag_tail + 10); + const big = &@as([limits.max_tag_tail + 10]u8, @splat('w')); const r = wr(p, tag, big); try testing.expectEqual(E.NOSPC, r.errno()); // `no space` is what 9ns maps to ENOSPC, so a shell through a mount @@ -1549,20 +1549,21 @@ test "a name with a component over 255 bytes is refused, and a long path's faile const p = try withFile(testing.allocator, "x\n"); defer p.deinit(); const serial = serialOf(p); - const refused = wr(p, Node.of(serial, .name), "/tmp/" ++ "c" ** 256 ++ "/f.txt\n"); + const refused = wr(p, Node.of(serial, .name), "/tmp/" ++ &@as([256]u8, @splat('c')) ++ "/f.txt\n"); try testing.expectEqual(E.INVAL, refused.errno()); try testing.expectEqualStrings("invalid file name: a component over 255 bytes", refused.reply.ename); - try testing.expectEqual(Status.ok, wr(p, Node.of(serial, .name), "/tmp/" ++ "c" ** 255 ++ "\n").reply.status); + try testing.expectEqual(Status.ok, wr(p, Node.of(serial, .name), "/tmp/" ++ &@as([255]u8, @splat('c')) ++ "\n").reply.status); // Held with no newline, it is refused by that write, not at the close. const held = call(p, .{ .tag = 1, .op = .open, .node = Node.of(serial, .name), .omode = 1 }).reply.handle; - try testing.expectEqual(E.INVAL, call(p, .{ .tag = 2, .op = .write, .node = Node.of(serial, .name), .handle = held, .data = "/tmp/" ++ "e" ** 256 }).errno()); + try testing.expectEqual(E.INVAL, call(p, .{ .tag = 2, .op = .write, .node = Node.of(serial, .name), .handle = held, .data = "/tmp/" ++ &@as([256]u8, @splat('e')) }).errno()); _ = call(p, .{ .tag = 3, .op = .release, .node = Node.of(serial, .name), .handle = held, .opened = true }); try testing.expectEqual(@as(usize, 0), p.fs.closed_lines.items.len); // A Save of a 3000-byte path the host refuses: the waiting write's // reason is at the end, the path giving up its middle. // (Under /tmp: under / a user's Save is refused permission, not // missing.) - const long = "/tmp/nonexistent-pardes-root/" ++ ("d" ** 200 ++ "/") ** 15 ++ "f.txt"; + const segment = &@as([200]u8, @splat('d')) ++ "/"; + const long = "/tmp/nonexistent-pardes-root/" ++ std.mem.asBytes(&@as([15][201]u8, @splat(segment.*))) ++ "f.txt"; const id = p.paneBySerial(serial).?; try nameBuffer(p, id, long, false); p.fs.late_failure_len = 0; diff --git a/src/ninep/pty.zig b/src/ninep/pty.zig index c58cf676..aeb57a00 100644 --- a/src/ninep/pty.zig +++ b/src/ninep/pty.zig @@ -1044,12 +1044,12 @@ test "a run's answer says cut when its output's start is gone, and reads a bound const q = try withTerm(gpa); defer q.deinit(); const kept = q.panes[0].?; - kept.terminal.?.vt.screens.get(.primary).?.pages.explicit_max_size = 1; + kept.terminal.?.vt.screens.get(.primary).?.pages.limits.set(.bytes, 1); const run = Node.of(serialOf(q), .pty_run); sh.put(q, prompt); h = sh.send(q, run); sh.put(q, c); - const lines = "pruned\r\n" ** 64; + const lines = std.mem.asBytes(&@as([64][8]u8, @splat("pruned\r\n".*))); var fed: usize = 0; while (!kept.terminal.?.stream.handler.out_start.?.garbage) : (fed += 1) { if (fed == 1000) return error.TestUnexpectedResult; @@ -1146,7 +1146,7 @@ test "a run's answer longer than its room is cut, its newline kept" { var slot: Run = .{}; const p = try th.withTerm(testing.allocator); defer p.deinit(); - answer(p, &slot, "busy: {s} is running", .{"x" ** 200}); + answer(p, &slot, "busy: {s} is running", .{&@as([200]u8, @splat('x'))}); try testing.expectEqual(slot.answer.len, slot.len); try testing.expectEqual(@as(u8, '\n'), slot.answer[slot.len - 1]); } diff --git a/src/ninep/screen.zig b/src/ninep/screen.zig index b991c3e4..8d4707e0 100644 --- a/src/ninep/screen.zig +++ b/src/ninep/screen.zig @@ -333,7 +333,7 @@ test "a terminal's body is its logical lines: a row the terminal wrapped is join const p = try th.withTerm(testing.allocator); defer p.deinit(); const pane = p.panes[0].?; - const long = "w" ** 50 ++ "x" ** 150; // wider than the pane: it wraps + const long = &@as([50]u8, @splat('w')) ++ &@as([150]u8, @splat('x')); // wider than the pane: it wraps try testing.expect(long.len > pane.cols); p.update(.{ .output = .{ .pane = 0, .bytes = long ++ "\r\nnext" } }); while (p.nextEffect()) |_| {} diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig index eedab43b..5678832b 100644 --- a/src/ninep/tree.zig +++ b/src/ninep/tree.zig @@ -509,7 +509,7 @@ pub fn fitErr(text: []const u8, out: []u8) []const u8 { test "a reason past 128 bytes keeps its end: the path in it gives up its middle" { var out: [128]u8 = undefined; - const long = "Save /home/someone/projects/" ++ "deep/" ** 30 ++ "file.txt: no such directory"; + const long = "Save /home/someone/projects/" ++ std.mem.asBytes(&@as([30][5]u8, @splat("deep/".*))) ++ "file.txt: no such directory"; const fit = fitErr(long, &out); try testing.expect(fit.len <= 128); try testing.expect(std.mem.startsWith(u8, fit, "Save /home/someone/")); @@ -517,7 +517,7 @@ test "a reason past 128 bytes keeps its end: the path in it gives up its middle" try testing.expect(std.mem.indexOf(u8, fit, "…") != null); try testing.expect(std.unicode.utf8ValidateSlice(fit)); // No path: the whole text's middle goes, the end stays. - const words = "why " ** 40 ++ "the reason"; + const words = std.mem.asBytes(&@as([40][4]u8, @splat("why ".*))) ++ "the reason"; try testing.expect(std.mem.endsWith(u8, fitErr(words, &out), "the reason")); try testing.expectEqualStrings("short", fitErr("short", &out)); // Through the tree: a look at a long ./ name not there, a miss, says @@ -525,7 +525,7 @@ test "a reason past 128 bytes keeps its end: the path in it gives up its middle" const p = try th.withFile(testing.allocator, "x\n"); defer p.deinit(); var line: [512]u8 = undefined; - const r = th.wr(p, Node.of(serialOf(p), .look), try std.fmt.bufPrint(&line, "./{s}x.txt\n", .{"no-such-dir/" ** 20})); + const r = th.wr(p, Node.of(serialOf(p), .look), try std.fmt.bufPrint(&line, "./{s}x.txt\n", .{std.mem.asBytes(&@as([20][12]u8, @splat("no-such-dir/".*)))})); try testing.expectEqual(Status.ok, r.reply.status); try testing.expect(th.logHas(p, "x.txt: no such file")); } @@ -1492,17 +1492,17 @@ test "README names every file the tree serves" { return false; } }; - inline for (@typeInfo(TopFile).@"enum".fields) |f| { - const t: TopFile = @enumFromInt(f.value); + inline for (@typeInfo(TopFile).@"enum".field_values) |value| { + const t: TopFile = @enumFromInt(value); if (t != .root and !words.has(t.fileName())) { std.debug.print("README does not mention /{s}\n", .{t.fileName()}); return error.Undocumented; } } - inline for (@typeInfo(PaneFile).@"enum".fields) |f| { - const t: PaneFile = @enumFromInt(f.value); + inline for (@typeInfo(PaneFile).@"enum".field_values) |value| { + const t: PaneFile = @enumFromInt(value); const ok = if (t == .dir) true else if (t.inPty() and t != .pty) - std.mem.indexOf(u8, fs.help, "pty/" ++ comptime @as(PaneFile, @enumFromInt(f.value)).fileName()) != null + std.mem.indexOf(u8, fs.help, "pty/" ++ comptime @as(PaneFile, @enumFromInt(value)).fileName()) != null else words.has(t.fileName()); if (!ok) { diff --git a/src/normal.zig b/src/normal.zig index 77feb7cf..8de23d1c 100644 --- a/src/normal.zig +++ b/src/normal.zig @@ -1015,7 +1015,7 @@ test "gj/gk step the wrapped rows a body draws while j/k keep the file's lines" const p = try Pardes.init(gpa, .{ .tty_only = true }); defer p.deinit(); while (p.nextEffect()) |_| {} - const long = "a" ** 400; + const long = &@as([400]u8, @splat('a')); const pane = try p.setTestFile(long ++ "\nsecond\n"); p.settings.wrap = true; const width = panes.File.wrapWidth(pane, true); diff --git a/src/pager.zig b/src/pager.zig index 30418623..feabd194 100644 --- a/src/pager.zig +++ b/src/pager.zig @@ -38,7 +38,7 @@ pub fn parse(gpa: std.mem.Allocator, raw: []const u8, colour: bool) !Page { errdefer h.text.deinit(gpa); errdefer h.spans.deinit(gpa); try h.text.ensureTotalCapacity(gpa, raw.len); - var stream: ghostty_vt.Stream(*Handler) = .init(&h); + var stream: ghostty_vt.Stream(*Handler) = .init(.{ .handler = &h }); defer stream.deinit(); stream.nextSlice(raw); if (h.failed) return error.OutOfMemory; diff --git a/src/panes.zig b/src/panes.zig index ba1dedb5..07d5ccb1 100644 --- a/src/panes.zig +++ b/src/panes.zig @@ -318,7 +318,7 @@ pub const Pane = struct { /// `older` is an earlier message line still on screen; `index` says /// which (`Pane.msg_older`). pub const Kind = enum { older, message, leader, prompt }; - pub const max = @typeInfo(Kind).@"enum".fields.len - 1 + message_stack; + pub const max = @typeInfo(Kind).@"enum".field_names.len - 1 + message_stack; kinds: [max]Kind = undefined, index: [max]u8 = @splat(0), diff --git a/src/pardes.zig b/src/pardes.zig index 5f330712..8da0922d 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -807,7 +807,7 @@ test "TreeContext tag style preserves message rows and its opt-out survives rest if (comptime !syntax.enabled) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 60, .rows = 16 }); defer p.deinit(); - const pane = try p.setTestFile("pub const Box = struct {\n pub fn run() void {\n" ++ (" // body\n" ** 30) ++ " }\n};\n"); + const pane = try p.setTestFile("pub const Box = struct {\n pub fn run() void {\n" ++ (std.mem.asBytes(&@as([30][16]u8, @splat(" // body\n".*)))) ++ " }\n};\n"); p.gpa.free(pane.file.?.path); pane.file.?.path = try p.gpa.dupe(u8, "/test.zig"); if (!panes.File.supportsContext(pane)) return error.SkipZigTest; @@ -1247,7 +1247,9 @@ test "Def and Refs are a speaking file's tag words; gd, gr and a 2-1 chord all r const r = p.rects[0]; const x0 = r.x + config.GUTTER + panes.File.gutterWidth(pane); const use_y = p.bodyTop(pane, r) + 1; - const tag = try tagline.tagText(p, p.scratch.allocator(), pane); + // Copied out of the scratch arena, which each p.update resets. + const tag = try std.testing.allocator.dupe(u8, try tagline.tagText(p, p.scratch.allocator(), pane)); + defer std.testing.allocator.free(tag); for ([_]struct { word: []const u8, kind: lsp.Kind }{ .{ .word = " Def ", .kind = .definition }, .{ .word = " Refs", .kind = .references } }) |w| { // B1 sweeps the use of `alpha` on the second line (bytes 30..35), // leaving the cursor at its far end. @@ -1348,7 +1350,7 @@ test "acme placement: under a pane's text when it has many blank rows, else halv try std.testing.expectEqual(text_end, p.rects[second].y); // Fill both with text: no blank space is big, so the biggest pane is // halved. - const full = "x\n" ** 80; + const full = std.mem.asBytes(&@as([80][2]u8, @splat("x\n".*))); for ([_]usize{ top, second }) |id| panes.File.setContent(p, &p.panes[id].?.file.?, try p.gpa.dupe(u8, full)); p.sync(); const big = if (p.rects[second].h >= p.rects[top].h) second else top; @@ -2006,7 +2008,7 @@ test "a command pane shows how its command ended, and the next command there run try std.testing.expectEqual(@as(usize, 0), Count.signals); p.host = host_before; // A command line longer than a command pane takes is refused. - const long = "x" ** (exec.command_max + 1); + const long = &@as([exec.command_max + 1]u8, @splat('x')); try std.testing.expectEqual(@as(?usize, null), exec.execute(p, 1, long)); } @@ -2970,9 +2972,9 @@ test "restored terminals keep monotonic nonzero pane identities" { fn chordName(comptime c: config.Chord) []const u8 { comptime { const mods = (if (c.ctrl) "C-" else "") ++ (if (c.alt) "A-" else "") ++ (if (c.shift) "S-" else ""); - for (@typeInfo(Key).@"struct".decls) |d| { - if (@TypeOf(@field(Key, d.name)) != u21) continue; - if (@field(Key, d.name) == c.cp) return mods ++ d.name; + for (@typeInfo(Key).@"struct".decl_names) |d| { + if (@TypeOf(@field(Key, d)) != u21) continue; + if (@field(Key, d) == c.cp) return mods ++ d; } if (c.cp < 0x20 or c.cp > 0x7e) @compileError("chord has no name for the index"); return mods ++ &[_]u8{@as(u8, @intCast(c.cp))}; @@ -3088,11 +3090,11 @@ pub const builtin_rows: [std.enums.values(Builtin).len]Row = blk: { for (std.enums.values(Builtin), 0..) |b, i| { const keys = if (config.leader_path.get(b)) |path| leaderKeys(path) else ""; const rest = shortcuts(b); - const named = @tagName(b) ++ (if (rest.len == 0) "" else (" " ** (namew - @tagName(b).len)) ++ " " ++ rest); + const named = @tagName(b) ++ (if (rest.len == 0) "" else (&@as([namew - @tagName(b).len]u8, @splat(' '))) ++ " " ++ rest); rows[i] = .{ .path = config.leader_path.get(b), .cmd = b, - .line = keys ++ (" " ** (4 + keyw - keys.len)) ++ " " ++ named, + .line = keys ++ (&@as([4 + keyw - keys.len]u8, @splat(' '))) ++ " " ++ named, }; } const last = "\x7f"; @@ -3111,8 +3113,8 @@ comptime { @setEvalBranchQuota(20000); // one branch per string byte, behind the decl walk that folds Builtin var it = std.mem.tokenizeScalar(u8, config.topbar_str, ' '); words: while (it.next()) |w| { - for (@typeInfo(Builtin).@"enum".fields) |f| - if (std.mem.eql(u8, f.name, w)) continue :words; + for (@typeInfo(Builtin).@"enum".field_names) |name| + if (std.mem.eql(u8, name, w)) continue :words; @compileError("topbar word is not a builtin: " ++ w); } } @@ -4499,7 +4501,7 @@ pub const Pardes = struct { /// Panes made this step that found no room in their column /// (exec.placeNew): closed at the step's end, once whatever made them /// is done with them. - unplaced: std.StaticBitSet(MAX_PANES) = .initEmpty(), + unplaced: std.StaticBitSet(MAX_PANES) = .empty, /// A look's word search is running (look.lookUnresolved): from a /// terminal its rows refill the directory's one +Search (Output). word_look: bool = false, @@ -5018,7 +5020,7 @@ pub const Pardes = struct { if (p.dump_out) |d| gpa.free(d); p.fallback.deinit(); if (p.last_dump) |d| gpa.free(d); - if (p.custom_theme) |theme_value| std.zon.parse.free(gpa, theme_value); + if (p.custom_theme) |theme_value| gpa.free(theme_value.name); if (p.chord_arg) |a| gpa.free(a); for (p.spawn_dirs) |d| if (d) |dir| gpa.free(dir); p.pipe.deinit(gpa); @@ -8508,7 +8510,7 @@ test "raw tty Ctrl-B switches to editor mode without sending child input" { test "the jump list never holds two entries in a row the same, when the one between them goes" { const p = try Pardes.init(std.testing.allocator, .{ .cols = 60, .rows = 40 }); defer p.deinit(); - const pane = try p.setTestFile("a\n" ** 200); + const pane = try p.setTestFile(std.mem.asBytes(&@as([200][2]u8, @splat("a\n".*)))); const at: Loc = .{ .pane = 0, .serial = pane.serial, .line = 1, .col = 1 }; // A, a pane long closed with no file to keep it, A again, then far on. p.jumps[0] = at; @@ -9054,7 +9056,7 @@ const JumpsTest = struct { fn init(order: []const u8) !JumpsTest { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 80 }); errdefer p.deinit(); - const text = "row\n" ** 100; + const text = std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*))); _ = try p.setTestFile(text); var t: JumpsTest = .{ .p = p }; for ([_][]const u8{ "/b.txt", "/test.txt", "" }, 1..) |path, n| { diff --git a/src/pdf.zig b/src/pdf.zig index d98d5ff2..5adc62d1 100644 --- a/src/pdf.zig +++ b/src/pdf.zig @@ -4,9 +4,7 @@ const std = @import("std"); const c_heap = @import("c_heap"); -const c = @cImport({ - @cInclude("pdf_bridge.h"); -}); +const c = @import("pdf_c"); // src/pdf_bridge.h, translated by build.zig /// What MuPDF allocates from, itself and the libraries it bundles (they all /// allocate through its context): `start`'s allocator, through the shared C @@ -1130,7 +1128,7 @@ pub const Document = struct { const page_number = try document.checkedPage(page); if (std.mem.indexOfScalar(u8, needle, 0) != null) return error.InvalidNeedle; - const needle_z = try gpa.dupeZ(u8, needle); + const needle_z = try gpa.dupeSentinel(u8, needle, 0); defer gpa.free(needle_z); var found: c.pardes_pdf_search_result = @@ -2067,7 +2065,7 @@ test "MuPDF search returns normalized oriented quads and word selection text" { const projected = try document.pageText(std.testing.allocator, 0); defer std.testing.allocator.free(projected); - try std.testing.expect(std.ascii.indexOfIgnoreCase(projected, "Pardes") != null); + try std.testing.expect(std.ascii.findIgnoreCase(projected, "Pardes") != null); // Exercise transactional cache replacement before searching page zero // again; a failed ownership handoff here tends to surface as a double drop. if (document.pages > 1) { @@ -2093,7 +2091,7 @@ test "MuPDF search returns normalized oriented quads and word selection text" { const text = try document.copySelection(std.testing.allocator, 0, selected.start, selected.end); defer std.testing.allocator.free(text); - try std.testing.expect(std.ascii.indexOfIgnoreCase(text, "Pardes") != null); + try std.testing.expect(std.ascii.findIgnoreCase(text, "Pardes") != null); } test "highlighted render changes pixels while plain render stays stable" { diff --git a/src/regexp.zig b/src/regexp.zig index 86132f60..4cbca57e 100644 --- a/src/regexp.zig +++ b/src/regexp.zig @@ -58,7 +58,7 @@ pub const Regex = struct { /// Timed on this machine's ReleaseSafe build: 10M steps of the worst /// patterns take 45-80 ms, and a Debug build is ten times slower. - pub const budget: u64 = if (builtin.mode == .Debug) 4_000_000 else 32_000_000; + pub const budget: u64 = if (builtin.mode == .debug) 4_000_000 else 32_000_000; pub const e_long = std.fmt.comptimePrint("bad regular expression: longer than mvzr's {d} operations (about {d} pattern characters)", .{ max_ops, max_ops }); pub const e_anchor = "bad regular expression: in a pattern with \\n, ^ can only come first and $ only just before a \\n"; @@ -503,10 +503,10 @@ test "a class with non-ASCII runes matches those runes: [éa-z], a range of them } test "a pattern past 64 characters compiles, and one past the limit says so" { - var long = try Regex.compile("a" ** 200); - const text = "x" ++ "a" ** 200 ++ "\n"; + var long = try Regex.compile(&@as([200]u8, @splat('a'))); + const text = "x" ++ &@as([200]u8, @splat('a')) ++ "\n"; try std.testing.expectEqual(@as(usize, 1), (try long.find(text, 0, text.len, text.len)).?.start); - try std.testing.expectError(error.TooLong, Regex.compile("a" ** (max_ops + 8))); + try std.testing.expectError(error.TooLong, Regex.compile(&@as([max_ops + 8]u8, @splat('a')))); try std.testing.expectError(error.Bad, Regex.compile("a[b")); } @@ -546,13 +546,13 @@ test "a search that would backtrack without end runs out of budget, promptly" { // As long a chain as mvzr compiles, over runs one `a` short of it: 2^20 // steps from every start. for (0..line.len / 20) |i| line[i * 20 + 19] = 'b'; - var chain = try Regex.compile("a?" ** 20 ++ "a" ** 20); + var chain = try Regex.compile(std.mem.asBytes(&@as([20][2]u8, @splat("a?".*))) ++ &@as([20]u8, @splat('a'))); try std.testing.expectError(error.TooSlow, chain.find(&line, 0, line.len, line.len)); } test "the match is the leftmost, however long the line" { // A window cut into the identifier would find `x... =` from its middle. - const text = "let " ++ "x" ** 100 ++ " = 1"; + const text = "let " ++ &@as([100]u8, @splat('x')) ++ " = 1"; var assign = try Regex.compile("\\s*(\\w+)\\s*="); const m = (try assign.find(text, 0, text.len, text.len)).?; try std.testing.expectEqual(@as(usize, 3), m.start); diff --git a/src/sam_edit.zig b/src/sam_edit.zig index d0c51bdb..f6253c89 100644 --- a/src/sam_edit.zig +++ b/src/sam_edit.zig @@ -1102,7 +1102,7 @@ fn expectEdit(text: []const u8, command: []const u8, want: []const u8) !void { test "an x over 100k lines is 100k searches, each with its own step budget" { const th = @import("ninep/testing.zig"); - const line = "x" ** 80 ++ "\n"; + const line = &@as([80]u8, @splat('x')) ++ "\n"; const text = try std.testing.allocator.alloc(u8, line.len * 100_000); defer std.testing.allocator.free(text); for (0..100_000) |k| @memcpy(text[line.len * k ..][0..line.len], line); diff --git a/src/syntax.zig b/src/syntax.zig index b2f5ea99..fa212ca7 100644 --- a/src/syntax.zig +++ b/src/syntax.zig @@ -1859,7 +1859,7 @@ test "syntax declaration locations clear snapshots without muting ordinary conte defer stop(); const header = "pub fn run() void {"; const content = "| \t" ++ header ++ "\n| \t const value = 42;\nfile.zig:3\t}\n"; - const snapshots = [_]u8{0xff} ** header.len; + const snapshots = @as([header.len]u8, @splat(0xff)); const Row = struct { path: []const u8 = "file.zig", code_start: usize, diff --git a/src/terminal.zig b/src/terminal.zig index 3190c6e3..a8e7931c 100644 --- a/src/terminal.zig +++ b/src/terminal.zig @@ -207,7 +207,7 @@ const LivePalette = struct { var seed = GColor.default; for (base, 0..) |rgb, i| seed[i] = rgb; - self.colors = GColor.generate256Color(seed, .initEmpty(), bg, fg, false); + self.colors = GColor.generate256Color(seed, .empty, bg, fg, false); self.key = key; return &self.colors; } @@ -609,10 +609,10 @@ pub fn create(gpa: std.mem.Allocator, cols: u16, rows: u16) !*Pane { state.vt = try ghostty_vt.Terminal.init(terminalIo(), gpa, .{ .cols = cols, .rows = rows, - .max_scrollback = 16 * 1024 * 1024, + .max_scrollback_bytes = 16 * 1024 * 1024, .kitty_image_storage_limit = if (images_enabled) TerminalImages.storage_limit else 0, }); - state.stream = .initAlloc(gpa, .{ .inner = state.vt.vtHandler() }); + state.stream = .init(.{ .handler = .{ .inner = state.vt.vtHandler() }, .allocator = gpa }); state.replay.head = 0; state.replay.len = 0; state.reply_len = 0; @@ -1055,7 +1055,11 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void { } }; } else failed = true; + // Whether the program cleared the screen (ED 2, a switch of screens); + // pardes reads the flag nowhere else. + pane.terminal.?.vt.flags.dirty.clear = false; ingest(pane, bytes); + const cleared = pane.terminal.?.vt.flags.dirty.clear; // RIS can destroy the alternate screen and every pin it owned. const alive = if (screens.generation(key) == generation) pages else null; var moved = false; @@ -1065,7 +1069,15 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void { if (pin.garbage) pointer_rows_lost = true; }; }; + // The program cleared the screen, or the rows the live copy stood on are + // gone (pruned, a reset): the copy goes with them, as what the program + // drew next. Kept, ghostty would move its rows to the top of what is + // left, over the program's new text. + var copy_lost = cleared or alive == null; for (spans[0..nspans]) |span| { + if (span.overlay == overlay) if (span.start.pin) |pin| if (alive != null and pin.garbage) { + copy_lost = true; + }; const start = pinnedRow(alive, span.start); const rows = @max(1, pinnedRow(alive, span.end) -| start +| 1); moved = moved or start != span.overlay.row or rows != span.overlay.rows; @@ -1096,6 +1108,11 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void { pane.clearPointerSelection(button); pane.sel[button].state = .none; }; + if (copy_lost) if (pane.ovl) |copy| { + pane.gpa.free(copy.text); + pane.ovl = null; + moved = true; + }; if (moved) pane.nsel_snap = 0; // Saved regex-preview offsets name the old flat text. if (failed) { const message = "terminal edit position reset: out of memory"; @@ -1211,7 +1228,7 @@ pub fn commandOutput(pane: *Pane, gpa: std.mem.Allocator, max_rows: usize) !Comm .whole = whole, }; } else true; - return .{ .text = try gpa.dupeZ(u8, ""), .whole = whole }; + return .{ .text = try gpa.dupeSentinel(u8, "", 0), .whole = whole }; } /// At a prompt with nothing typed on its line: no input left of the @@ -2813,7 +2830,7 @@ pub fn redo(p: *Pardes, pane: *Pane) void { pane.ensureCursorVisible(); } -pub fn ptyReport(handler: *ghostty_vt.TerminalStream.Handler, data: [:0]const u8) void { +pub fn ptyReport(handler: *ghostty_vt.TerminalStream.Handler, data: []const u8) void { const state: *State = @alignCast(@fieldParentPtr("vt", handler.terminal)); const room = state.reply.len - state.reply_len; const n = @min(room, data.len); @@ -2968,7 +2985,8 @@ test "a program that asked for focus reports hears CSI I and CSI O as its pane t /// over two cells). inline fn kittyTransmit(comptime extra: []const u8) []const u8 { return comptime blk: { - const pixels = [_]u8{ 255, 0, 0, 255, 0, 0, 0, 0, 255, 0, 0, 255 } ** 2; + const row = [_]u8{ 255, 0, 0, 255, 0, 0, 0, 0, 255, 0, 0, 255 }; + const pixels = row ++ row; var buf: [std.base64.standard.Encoder.calcSize(pixels.len)]u8 = undefined; const b64 = std.base64.standard.Encoder.encode(&buf, &pixels)[0..buf.len].*; break :blk "\x1b_Ga=T,f=24,s=4,v=2,i=7," ++ extra ++ ";" ++ b64 ++ "\x1b\\"; diff --git a/src/tty/tty.zig b/src/tty/tty.zig index ca2cb939..82cb40bd 100644 --- a/src/tty/tty.zig +++ b/src/tty/tty.zig @@ -129,7 +129,7 @@ fn readInput(loop: *Loop, tty: anytype, cache: *vaxis.GraphemeCache) !void { var parser: vaxis.Parser = .{}; var buf: [1024]u8 = undefined; var carried: usize = 0; - while (!loop.should_quit) { + while (true) { // stopInput cancels the task; the read then fails with Canceled if (carried == buf.len) return error.InputSequenceTooLong; const received = try tty.read(buf[carried..]); if (received == 0) return; @@ -295,7 +295,7 @@ test "terminal input preserves fragmented keys queries paste and text after EOF" fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), _: u32) bool { + pub fn inputFollows(self: *@This(), _: u32) bool { return self.next < self.parts.len; } fn read(self: *@This(), buf: []u8) !usize { @@ -380,7 +380,7 @@ test "terminal replies and malformed sequences never become typed text" { fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), _: u32) bool { + pub fn inputFollows(self: *@This(), _: u32) bool { return self.next < self.parts.len; } fn read(self: *@This(), buf: []u8) !usize { @@ -465,7 +465,7 @@ test "terminal input split at every byte with a gap reads as it does whole" { fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), ms: u32) bool { + pub fn inputFollows(self: *@This(), ms: u32) bool { return self.next < self.parts.len and self.gap_ms <= ms; } fn read(self: *@This(), buf: []u8) !usize { @@ -561,7 +561,7 @@ test "an ESC read by itself is the Escape key at once" { fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), _: u32) bool { + pub fn inputFollows(self: *@This(), _: u32) bool { self.asked = true; return self.next < self.parts.len; } @@ -609,7 +609,7 @@ test "a frame's answer is taken wherever the reads cut it, and never typed" { fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), _: u32) bool { + pub fn inputFollows(self: *@This(), _: u32) bool { return self.next < self.parts.len; } fn read(self: *@This(), buf: []u8) !usize { @@ -701,7 +701,7 @@ test "terminal input cancellation joins blocked reads and queued EOF" { fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(_: *@This(), _: u32) bool { + pub fn inputFollows(_: *@This(), _: u32) bool { return false; } fn read(self: *@This(), buf: []u8) !usize { @@ -2332,7 +2332,7 @@ test "a terminal pane gets function keys as their sequences and lone modifiers n fn getWinsize(_: *@This()) !vaxis.Winsize { return .{ .rows = 24, .cols = 80, .x_pixel = 0, .y_pixel = 0 }; } - fn inputFollows(self: *@This(), _: u32) bool { + pub fn inputFollows(self: *@This(), _: u32) bool { return self.next < self.parts.len; } fn read(self: *@This(), buf: []u8) !usize { @@ -3033,7 +3033,7 @@ test "a jump leaves a trail of a few cells behind the cursor that fades in 120 m const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 24 }); defer core.deinit(); - _ = try core.setTestFile("some text on a line\n" ** 20); + _ = try core.setTestFile(std.mem.asBytes(&@as([20][20]u8, @splat("some text on a line\n".*)))); try std.testing.expect(core.executeBuiltinLine(0, "Theme forge")); core.settings.jump_trail = true; for (0..40) |_| core.update(.tick); @@ -3078,7 +3078,7 @@ test "a notice chip casts a cell's shadow right and down, inside its body, off t const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 24 }); defer core.deinit(); - _ = try core.setTestFile("some text on a line\n" ** 20); + _ = try core.setTestFile(std.mem.asBytes(&@as([20][20]u8, @splat("some text on a line\n".*)))); try std.testing.expect(core.executeBuiltinLine(0, "Theme forge")); core.settings.chip_shadow = true; try std.testing.expect(core.executeBuiltinLine(0, "Msg a notice")); @@ -3114,7 +3114,7 @@ test "a scrolled pane's thumb brightens and fades back in 250 ms" { const gpa = std.testing.allocator; const core = try pardes.Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 24 }); defer core.deinit(); - const pane = try core.setTestFile("some text on a line\n" ** 200); + const pane = try core.setTestFile(std.mem.asBytes(&@as([200][20]u8, @splat("some text on a line\n".*)))); try std.testing.expect(core.executeBuiltinLine(0, "Theme forge")); core.settings.thumb_flash = true; for (0..40) |_| core.update(.tick); diff --git a/test/deck/replay.zig b/test/deck/replay.zig index 475f7476..49614b46 100644 --- a/test/deck/replay.zig +++ b/test/deck/replay.zig @@ -20,8 +20,9 @@ const Tally = struct { fn replay(src: [:0]const u8) !Tally { const gpa = std.testing.allocator; - const rec = try schema.parse(gpa, src); - defer schema.free(gpa, rec); + var arena: std.heap.ArenaAllocator = .init(gpa); + defer arena.deinit(); + const rec = try schema.parse(gpa, arena.allocator(), src); var d: deck.Deck = .{}; var tally: Tally = .{}; for (rec.events) |ev| { diff --git a/test/deck/schema.zig b/test/deck/schema.zig index 782c829a..401e15e8 100644 --- a/test/deck/schema.zig +++ b/test/deck/schema.zig @@ -61,10 +61,8 @@ pub const Event = struct { }; }; -pub fn parse(gpa: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording { - return std.zon.parse.fromSliceAlloc(Recording, gpa, src, null, .{}); -} - -pub fn free(gpa: std.mem.Allocator, rec: Recording) void { - std.zon.parse.free(gpa, rec); +/// The recording's slices live in `arena`. +pub fn parse(gpa: std.mem.Allocator, arena: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording { + var diagnostics: std.zon.parse.Diagnostics = undefined; + return std.zon.parse.fromSlice(Recording, .{ .gpa = gpa, .arena = arena, .source = src, .diagnostics = &diagnostics }); } diff --git a/test/e2e_harness.zig b/test/e2e_harness.zig index 9e67c49f..a2010c19 100644 --- a/test/e2e_harness.zig +++ b/test/e2e_harness.zig @@ -104,7 +104,7 @@ pub const Harness = struct { term.* = try ghostty_vt.Terminal.init(std.Io.Threaded.global_single_threaded.io(), gpa, .{ .cols = cols, .rows = rows, - .max_scrollback = 1024 * 1024, + .max_scrollback_bytes = 1024 * 1024, }); errdefer term.deinit(gpa); // vtStream() captures a pointer to `term`; term is heap-allocated so the diff --git a/test/fs_bench.zig b/test/fs_bench.zig index 746fe737..4764049f 100644 --- a/test/fs_bench.zig +++ b/test/fs_bench.zig @@ -272,7 +272,7 @@ pub fn main(init: std.process.Init) !void { .tag = 9, .op = .write, .node = s.node(.body), - .data = "x" ** 1024, + .data = &@as([1024]u8, @splat('x')), .size = 1024, }, "append: whole-body swap + undo snapshot"); @@ -327,7 +327,7 @@ pub fn main(init: std.process.Init) !void { try w.writeAll("]}\n"); } else { try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "request", "ns/op", "allocs", "note" }); - try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "-" ** 26, "-" ** 9, "-" ** 8, "-" ** 20 }); + try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ &@as([26]u8, @splat('-')), &@as([9]u8, @splat('-')), &@as([8]u8, @splat('-')), &@as([20]u8, @splat('-')) }); for (rows.items) |r| try w.print("{s:<26} {d:>9} {d:>8} {s}\n", .{ r.name, r.ns, r.allocs, r.note }); } diff --git a/test/history.zig b/test/history.zig index 5ce45239..d399f7aa 100644 --- a/test/history.zig +++ b/test/history.zig @@ -432,24 +432,24 @@ test "history benchmark cases are nonempty unique and matched by name" { try std.testing.expectError(error.MissingField, readBenchmarks(arena, "{\"case\":\"first\"}")); const before = try readBenchmarks(arena, benchmark_fixture); const missing = try readBenchmarks(arena, "{\"case\":\"first\",\"bytes\":10,\"median_ns\":100,\"cold_ns\":100,\"allocations\":10,\"allocated_bytes\":1000}"); - try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{missing} ** 4, null, &report.writer)); + try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(missing), null, &report.writer)); const renamed = \\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000} \\{"case":"renamed","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000} ; const different = try readBenchmarks(arena, renamed); - try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{different} ** 4, null, &report.writer)); + try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(different), null, &report.writer)); const reordered = \\{"case":"last","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000} \\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000} ; const same = try readBenchmarks(arena, reordered); - try std.testing.expect(!try compareBenchmarks(.{before} ** 4, .{same} ** 4, 1, &report.writer)); + try std.testing.expect(!try compareBenchmarks(@splat(before), @splat(same), 1, &report.writer)); var samples = [4][]Benchmark{ before, before, before, different }; - try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, samples, null, &report.writer)); + try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), samples, null, &report.writer)); samples[3] = try arena.dupe(Benchmark, before); samples[3][0].bytes += 1; - try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(.{before} ** 4, samples, null, &report.writer)); + try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(@splat(before), samples, null, &report.writer)); } test "history benchmark gate uses repeated process captures rather than the first process alone" { diff --git a/test/hxdiff.zig b/test/hxdiff.zig index 48c7ab93..b12bcd8e 100644 --- a/test/hxdiff.zig +++ b/test/hxdiff.zig @@ -39,7 +39,7 @@ pub fn main(init: std.process.Init) !void { var pane_override: ?[]const u8 = null; var goldens_path: ?[]const u8 = null; var waivers_path: ?[]const u8 = null; - const paths = try arena.alloc([]const u8, args.len - 1); + const paths = try arena.alloc([]const u8, @max(args.len - 1, 3)); // room for the defaults below var n_paths: usize = 0; var want_waivers = false; for (args[1..]) |a| { @@ -67,6 +67,18 @@ pub fn main(init: std.process.Init) !void { n_paths += 1; } } + // Named nothing (`zig build hxdiff` or `hxparity` bare): the checked-in + // suite, run from the repository root. + if (n_paths == 0 and !want_waivers) { + strict = true; + const defaults: []const []const u8 = if (parity) + &.{ "test/hxcases/cases.jsonl", "test/hxcases/parity.jsonl" } + else + &.{ "test/hxcases/cases.jsonl", "test/hxcases/goldens.jsonl", "test/hxcases/waivers.jsonl" }; + if (parity) waivers_path = waivers_path orelse "test/hxcases/parity-waivers.jsonl"; + @memcpy(paths[0..defaults.len], defaults); + n_paths = defaults.len; + } if (n_paths == 0 or want_waivers) fatal("usage: pardes-hxdiff [--parity] ... [goldens.jsonl [waivers.jsonl]]", .{}); const case_paths = paths[0..if (parity) n_paths else 1]; diff --git a/test/image_harness.zig b/test/image_harness.zig index 474ec48b..b45851cc 100644 --- a/test/image_harness.zig +++ b/test/image_harness.zig @@ -38,7 +38,7 @@ pub fn main(init: std.process.Init) !void { const args = try init.minimal.args.toSlice(arena); if (args.len != 3 and args.len != 4) return error.BadArgs; - const exe = try arena.dupeZ(u8, args[1]); + const exe = try arena.dupeSentinel(u8, args[1], 0); const backend = args[2]; const pdf_mode = args.len == 4 and std.mem.eql(u8, args[3], "pdf"); if (args.len == 4 and !pdf_mode) return error.BadArgs; diff --git a/test/lspbench.zig b/test/lspbench.zig index 02138d24..d0e25aee 100644 --- a/test/lspbench.zig +++ b/test/lspbench.zig @@ -216,7 +216,7 @@ fn reportText(rs: []const Result, rss: u64) void { const o = std.debug.print; o("backend: {s}\n\n", .{lsp.backend_name}); o("{s:<24} {s:>9} {s:>7} {s:>10} {s:>10} {s}\n", .{ "kind", "supports", "rows", "cold(us)", "warm(us)", "verdict" }); - o("{s}\n", .{"-" ** 78}); + o("{s}\n", .{&@as([78]u8, @splat('-'))}); var claimed: usize = 0; var working: usize = 0; var lies: usize = 0; diff --git a/test/monkey.zig b/test/monkey.zig index 83869ce4..dcea0b43 100644 --- a/test/monkey.zig +++ b/test/monkey.zig @@ -44,7 +44,7 @@ fn generate(gpa: std.mem.Allocator, seed: u64, steps: usize) ![]u8 { var s: Script = .{ .gpa = gpa }; try s.line("# pardes-monkey seed {d}, {d} steps", .{ seed, steps }); try s.line("file bad.txt hello \\xff\\xfe world\\nlatin-1 caf\\xe9 tail\\ntruncated \\xe6\\x97 here\\nend\\n", .{}); - try s.line("file wide.txt {s}tail\\nsecond line\\n", .{"\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e " ** 8}); + try s.line("file wide.txt {s}tail\\nsecond line\\n", .{std.mem.asBytes(&@as([8][37]u8, @splat("\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e ".*)))}); try s.line("lines long.txt 400 some words after the number, long enough to wrap in a narrow pane", .{}); try s.line("start 24 80 bad.txt", .{}); try s.line("wait 8000 Newcol Joincol", .{}); diff --git a/test/panes.zig b/test/panes.zig index 86e52838..54100f91 100644 --- a/test/panes.zig +++ b/test/panes.zig @@ -42,7 +42,7 @@ const TagLayerTests = struct { p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 5, .tagline_h = 10 }; p.gpa.free(pane.file.?.path); pane.file.?.path = try p.gpa.dupe(u8, "/x"); - try setTag(pane, " " ++ "a" ** 38 ++ "\t界 END"); + try setTag(pane, " " ++ &@as([38]u8, @splat('a')) ++ "\t界 END"); var frame = std.heap.ArenaAllocator.init(p.gpa); defer frame.deinit(); _ = try p.render(frame.allocator()); @@ -135,7 +135,7 @@ const TagLayerTests = struct { try std.testing.expectEqual(@as(i32, 0), p.panes[second].?.input.cur_col); p.update(.{ .key = .{ .cp = Key.escape } }); const left = p.panes[0].?; - try setTag(left, " " ++ "a" ** 110); + try setTag(left, " " ++ &@as([110]u8, @splat('a'))); _ = try p.render(frame.allocator()); const left_layer = try findLayer(p, .pane, 0); const left_text = try pardes.tagline.tagText(p, frame.allocator(), left); @@ -149,7 +149,7 @@ const TagLayerTests = struct { try std.testing.expectEqual(panes.File.rawAtDisplay(left_text, end_col), @as(usize, @intCast(left.tag.cur_col))); try std.testing.expect(left.sel[0].state == .done and left.sel[0].r0 == 0); p.update(.{ .key = .{ .cp = Key.escape } }); - const long = "a" ** 60 ++ "界END"; + const long = &@as([60]u8, @splat('a')) ++ "界END"; p.global_tag.own = try p.gpa.dupe(u8, long); for (p.col_tags[0..p.ncol]) |*tag| tag.own = try p.gpa.dupe(u8, long); _ = try p.render(frame.allocator()); @@ -581,7 +581,7 @@ const BodyHitTests = struct { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 }); defer p.deinit(); p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 }; - const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n"); + const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n"); try std.testing.expect(p.executeBuiltinLine(0, "TreeContext")); pane.scrollBy(10); var frame = std.heap.ArenaAllocator.init(p.gpa); @@ -629,7 +629,7 @@ const LineNumberLookTests = struct { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 }); defer p.deinit(); p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 }; - const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n"); + const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n"); try std.testing.expect(p.executeBuiltinLine(0, "TreeContext")); pane.scrollBy(30); var frame = std.heap.ArenaAllocator.init(p.gpa); @@ -686,7 +686,7 @@ const TreeContextTests = struct { if (!syntax.enabled) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 }); defer p.deinit(); - const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 30 ++ " }\n};\n"); + const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([30][16]u8, @splat(" // body\n".*))) ++ " }\n};\n"); p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 }; try std.testing.expect(p.executeBuiltinLine(0, "TreeContext")); pane.scrollBy(10); @@ -717,7 +717,7 @@ const TreeContextTests = struct { if (context and !syntax.enabled) continue; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 }); defer p.deinit(); - const pane = try setZigFile(p, "pub fn work() void {\n" ++ " // body\n" ** 100 ++ "}\n"); + const pane = try setZigFile(p, "pub fn work() void {\n" ++ std.mem.asBytes(&@as([100][12]u8, @splat(" // body\n".*))) ++ "}\n"); if (context) try std.testing.expect(p.executeBuiltinLine(0, "TreeContext")); var frame = std.heap.ArenaAllocator.init(p.gpa); defer frame.deinit(); @@ -792,7 +792,7 @@ const TreeContextTests = struct { if (!syntax.enabled) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 48, .rows = 14 }); defer p.deinit(); - const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ " _ = value;\n" ** 12 ++ "}\n"); + const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ std.mem.asBytes(&@as([12][15]u8, @splat(" _ = value;\n".*))) ++ "}\n"); pane.tag_expanded = false; // a one-row tag keeps this small screen's rows p.sync(); p.settings.wrap = false; @@ -820,7 +820,7 @@ const TreeContextTests = struct { // Read the body top again: the click cleared the announcement band the // builtin above put up, so the body moved with it. try std.testing.expectEqual(p.bodyTop(pane, p.rects[0]), cursor.y); - panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, "// no enclosing declaration\n" ** 18)); + panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, std.mem.asBytes(&@as([18][28]u8, @splat("// no enclosing declaration\n".*))))); _ = try p.render(frame.allocator()); try std.testing.expectEqual(@as(u16, 0), pane.context_rows); try std.testing.expectEqual(pane.scroll(), pane.wrapAt(0).line); @@ -942,7 +942,7 @@ const TtySelectionTests = struct { try noChildInput(p); _ = try p.render(frame.allocator()); try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?); - p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ "\r\nnew output" ** 30 } }); + p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ std.mem.asBytes(&@as([30][12]u8, @splat("\r\nnew output".*))) } }); _ = try p.render(frame.allocator()); try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode); try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?); @@ -1266,7 +1266,7 @@ const ClickCursorTests = struct { test "click operands and hover follow the scrolled source selection" { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 40, .rows = 14 }); defer p.deinit(); - const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ "tail\n" ** 20); + const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ std.mem.asBytes(&@as([20][5]u8, @splat("tail\n".*)))); p.presentation.enabled = false; p.settings.wrap = false; var frame = std.heap.ArenaAllocator.init(p.gpa); @@ -1323,7 +1323,7 @@ const JumpSelectionTests = struct { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 34, .rows = 10 }); defer p.deinit(); p.settings.wrap = wrap; - const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, "unrelated destination text\n" ** 80 }); + const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, std.mem.asBytes(&@as([80][27]u8, @splat("unrelated destination text\n".*))) }); defer p.gpa.free(text); const pane = try p.setTestFile(text); var frame = std.heap.ArenaAllocator.init(p.gpa); @@ -1813,7 +1813,7 @@ test "a word the tag's wrapping breaks across rows is still one word to a click" var pad: usize = 1; const shown = while (pad < 80) : (pad += 1) { p.gpa.free(pane.file.?.path); - const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{("a" ** 80)[0..pad]}); + const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{(&@as([80]u8, @splat('a')))[0..pad]}); pane.file.?.path = try p.gpa.dupe(u8, path); p.sync(); const s = try pardes.tagline.shownTag(p, arena.allocator(), pane); @@ -1866,7 +1866,7 @@ test "terminal output keeps following new rows after scrollback eviction" { pane.body.mode = .tty; pane.tty_filter = false; const pages = &pane.terminal.?.vt.screens.active.pages; - pages.explicit_max_size = 64 * 1024; + pages.limits.set(.bytes, 64 * 1024); var frame = std.heap.ArenaAllocator.init(gpa); defer frame.deinit(); var evictions: usize = 0; @@ -1885,7 +1885,7 @@ test "terminal output keeps following new rows after scrollback eviction" { if (pages.scrollbar().total < previous) evictions += 1; } try std.testing.expect(evictions > phase); - try std.testing.expect(pages.page_size <= pages.maxSize()); + try std.testing.expect(pages.page_size <= pages.limits.max(.bytes)); const sb = pages.scrollbar(); try std.testing.expectEqual(sb.total - pane.rows, sb.offset); const full = try panes.terminal.screenTextAlloc(pane, gpa); @@ -1926,7 +1926,7 @@ test "terminal edit stays on its surviving row when old scrollback is evicted" { const pane = p.panes[0].?; pane.body.mode = .tty; const pages = &pane.terminal.?.vt.screens.active.pages; - pages.explicit_max_size = 64 * 1024; + pages.limits.set(.bytes, 64 * 1024); var next: usize = 0; while (next < 3000) { var buf: [32]u8 = undefined; @@ -1977,9 +1977,9 @@ test "terminal edits and undo survive partial history clearing and whole-screen pane.body.mode = .tty; if (action == .reset_alternate) p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?1049h" } }); - p.update(.{ .output = .{ .pane = 0, .bytes = "old row\r\n" ** 40 } }); + p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([40][9]u8, @splat("old row\r\n".*))) } }); const pages = &pane.terminal.?.vt.screens.active.pages; - pages.explicit_max_size = 64 * 1024; + pages.limits.set(.bytes, 64 * 1024); const row: i32 = @as(i32, @intCast(pages.total_rows - pane.rows)) + @as(i32, if (action == .partial_clear_history) -1 else 2); pane.body.mode = .normal; @@ -2005,7 +2005,7 @@ test "terminal edits and undo survive partial history clearing and whole-screen const bytes = switch (action) { .clear_history, .partial_clear_history => "\x1b[3J", .reset_primary, .reset_alternate => "\x1bc", - .evict_all, .hidden_undo => "new row\r\n" ** 4000, + .evict_all, .hidden_undo => std.mem.asBytes(&@as([4000][9]u8, @splat("new row\r\n".*))), }; p.update(.{ .output = .{ .pane = 0, .bytes = bytes } }); const expected: i32 = if (action == .clear_history) 2 else 0; @@ -2045,7 +2045,7 @@ test "terminal lower scroll regions do not move edits above them" { var setup: [64]u8 = undefined; const bytes = try std.fmt.bufPrint(&setup, "\x1b[4;{d}r\x1b[{d};1H", .{ pane.rows, pane.rows }); p.update(.{ .output = .{ .pane = 0, .bytes = bytes } }); - p.update(.{ .output = .{ .pane = 0, .bytes = "tail\r\n" ** 50 } }); + p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([50][6]u8, @splat("tail\r\n".*))) } }); try std.testing.expectEqual(total, panes.terminal.scrollbar(pane).total); try std.testing.expectEqual(@as(i32, 1), pane.ovl.?.row); try std.testing.expectEqual(@as(i32, 1), pane.body.cur_row); @@ -2064,7 +2064,7 @@ test "terminal eviction and lower-region scrolling in one read preserve a surviv const pane = p.panes[0].?; pane.body.mode = .tty; const pages = &pane.terminal.?.vt.screens.active.pages; - pages.explicit_max_size = 64 * 1024; + pages.limits.set(.bytes, 64 * 1024); var next: usize = 0; while (next < 3000) { var buf: [32]u8 = undefined; @@ -2229,7 +2229,7 @@ test "prompt cancellation restores the selection before regex previews" { } test "a prompt that cannot be opened leaves the open one as it was" { - const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?; + const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?; for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| { var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{}); const p = try Pardes.init(failing.allocator(), .{ .tty_only = true }); @@ -2268,7 +2268,7 @@ test "Save's prompt starts from the pane's directory" { } test "a prompt opens with one allocation" { - const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?; + const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?; for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| { var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{}); const p = try Pardes.init(failing.allocator(), .{ .tty_only = true }); @@ -3441,7 +3441,7 @@ const PdfTests = struct { defer probe.deinit(std.testing.allocator); try std.testing.expectEqual(@as(usize, 0), probe.page); try std.testing.expect(probe.quads.len > 0); - try std.testing.expect(std.ascii.indexOfIgnoreCase(probe.text, "Pardes") != null); + try std.testing.expect(std.ascii.findIgnoreCase(probe.text, "Pardes") != null); } test "PDF point mapping restores band origin and fractional placement" { @@ -4812,7 +4812,7 @@ test "growing a file pane colors every newly visible Zig keyword" { const gpa = std.testing.allocator; const p = try Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 8 }); defer p.deinit(); - const pane = try p.setTestFile("pub fn f() void { if (true) {} }\n" ** 100); + const pane = try p.setTestFile(std.mem.asBytes(&@as([100][33]u8, @splat("pub fn f() void { if (true) {} }\n".*)))); const file = &pane.file.?; gpa.free(file.path); file.path = try gpa.dupe(u8, "/resize.zig"); diff --git a/test/pdf.zig b/test/pdf.zig index a0eb8154..a51fd1a9 100644 --- a/test/pdf.zig +++ b/test/pdf.zig @@ -2080,14 +2080,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { @as(i32, r.y + r.h - 1), )); if (!panes.Pdf.beginSelection(p, pane, col, row)) continue; - if (std.ascii.indexOfIgnoreCase(pv.selection_text, "Pardes") != null) { + if (std.ascii.findIgnoreCase(pv.selection_text, "Pardes") != null) { selected_col = col; selected_row = row; break :find_word; } }; const word_col = selected_col orelse return error.PdfMouseMappingMissedWord; - try std.testing.expect(std.ascii.indexOfIgnoreCase( + try std.testing.expect(std.ascii.findIgnoreCase( pardes.test_api.heldSelection(p, 0).?, "Pardes", ) != null); @@ -2142,7 +2142,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { const hover = p.pdf_hover_preview orelse return error.MissingPdfHoverPreview; try std.testing.expectEqual(@as(usize, 0), hover.probe.page); try std.testing.expect(hover.probe.quads.len > 0); - try std.testing.expect(std.ascii.indexOfIgnoreCase(hover.probe.text, "Pardes") != null); + try std.testing.expect(std.ascii.findIgnoreCase(hover.probe.text, "Pardes") != null); try std.testing.expect(p.look_hover_preview == null); try std.testing.expect(p.look_hover_wait == null); @@ -2188,7 +2188,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { // search highlights without carrying an old selection into the result. p.update(.{ .mouse = .{ .button = config.look_button, .kind = .press, .col = word_col, .row = selected_row } }); p.update(.{ .mouse = .{ .button = config.look_button, .kind = .release, .col = word_col, .row = selected_row } }); - try std.testing.expect(std.ascii.indexOfIgnoreCase(pv.search_query, "Pardes") != null); + try std.testing.expect(std.ascii.findIgnoreCase(pv.search_query, "Pardes") != null); pv.resolveSearch(p.pdf_gpa); const highlights = (try panes.Pdf.buildHighlights( pv, diff --git a/test/pdf_scroll_bench.zig b/test/pdf_scroll_bench.zig index 166fa809..fdc42660 100644 --- a/test/pdf_scroll_bench.zig +++ b/test/pdf_scroll_bench.zig @@ -597,7 +597,7 @@ fn reportText(config: Config, travel: Travel, results: []const Result) void { "total_us", "rasters", "kept", "peak_kib", "visual", "transport", }); - std.debug.print("{s}\n", .{"-" ** 160}); + std.debug.print("{s}\n", .{&@as([160]u8, @splat('-'))}); for (results) |result| std.debug.print( "{s:<16} {d:>6} {d:>7} {d:>10} {d:>10} {d:>10} {d:>10} {d:>10} {d:>11} {d:>7} {d:>5} {d:>9} {x:0>16} {x:0>16}\n", .{ diff --git a/test/pdf_sections_bench.zig b/test/pdf_sections_bench.zig index 92c9ef7c..ee26e83d 100644 --- a/test/pdf_sections_bench.zig +++ b/test/pdf_sections_bench.zig @@ -454,7 +454,7 @@ fn reportText(config: Config, results: []const Result) void { std.debug.print("{s:<42} {s:>10} {s:>10} {s:>10} {s:>10} {s:>8} {s:>8} {s}\n", .{ "scenario", "min", "median", "p90", "max", "items", "bytes", "checksum", }); - std.debug.print("{s}\n", .{"-" ** 124}); + std.debug.print("{s}\n", .{&@as([124]u8, @splat('-'))}); for (results) |result| std.debug.print( "{s:<42} {d:>10} {d:>10} {d:>10} {d:>10} {d:>8} {d:>8} {x:0>16}\n", .{ diff --git a/test/perf-baseline-gui-Debug.json b/test/perf-baseline-gui-Debug.json deleted file mode 100644 index 39f5913c..00000000 --- a/test/perf-baseline-gui-Debug.json +++ /dev/null @@ -1 +0,0 @@ -{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1818,"med_us":2104,"p90_us":2287,"max_us":2293},{"op":"render","fixture":"medium","min_us":78,"med_us":82,"p90_us":87,"max_us":87},{"op":"key-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":89,"max_us":109},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":89},{"op":"page-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":84,"max_us":87},{"op":"wheel","fixture":"medium","min_us":77,"med_us":78,"p90_us":82,"max_us":82},{"op":"edit-char","fixture":"medium","min_us":1019,"med_us":1349,"p90_us":1597,"max_us":1632},{"op":"edit-twin","fixture":"medium","min_us":2029,"med_us":2353,"p90_us":2455,"max_us":2676},{"op":"body-2m","fixture":"medium","min_us":5978,"med_us":9708,"p90_us":11361,"max_us":11666},{"op":"body-appends","fixture":"medium","min_us":117933,"med_us":211247,"p90_us":268014,"max_us":275006},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":75,"p90_us":80,"max_us":84}]} diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json new file mode 100644 index 00000000..4b60520b --- /dev/null +++ b/test/perf-baseline-gui-debug.json @@ -0,0 +1 @@ +{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1732,"med_us":1881,"p90_us":2035,"max_us":2072},{"op":"render","fixture":"medium","min_us":89,"med_us":92,"p90_us":101,"max_us":102},{"op":"key-down","fixture":"medium","min_us":92,"med_us":94,"p90_us":100,"max_us":100},{"op":"key-right","fixture":"medium","min_us":91,"med_us":93,"p90_us":105,"max_us":109},{"op":"page-down","fixture":"medium","min_us":91,"med_us":95,"p90_us":99,"max_us":106},{"op":"wheel","fixture":"medium","min_us":90,"med_us":95,"p90_us":101,"max_us":101},{"op":"edit-char","fixture":"medium","min_us":1226,"med_us":1678,"p90_us":2093,"max_us":2323},{"op":"edit-twin","fixture":"medium","min_us":2275,"med_us":2697,"p90_us":2868,"max_us":2920},{"op":"body-2m","fixture":"medium","min_us":5213,"med_us":11333,"p90_us":18974,"max_us":18999},{"op":"body-appends","fixture":"medium","min_us":175012,"med_us":260087,"p90_us":317184,"max_us":317469},{"op":"deep-sel","fixture":"medium","min_us":83,"med_us":85,"p90_us":86,"max_us":98}]} diff --git a/test/perf-baseline-tty-Debug.json b/test/perf-baseline-tty-Debug.json deleted file mode 100644 index 9110398c..00000000 --- a/test/perf-baseline-tty-Debug.json +++ /dev/null @@ -1 +0,0 @@ -{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1881,"med_us":2148,"p90_us":2324,"max_us":2644},{"op":"render","fixture":"medium","min_us":79,"med_us":87,"p90_us":90,"max_us":93},{"op":"key-down","fixture":"medium","min_us":81,"med_us":84,"p90_us":86,"max_us":90},{"op":"key-right","fixture":"medium","min_us":80,"med_us":85,"p90_us":89,"max_us":102},{"op":"page-down","fixture":"medium","min_us":85,"med_us":86,"p90_us":88,"max_us":88},{"op":"wheel","fixture":"medium","min_us":79,"med_us":85,"p90_us":90,"max_us":91},{"op":"edit-char","fixture":"medium","min_us":1037,"med_us":1300,"p90_us":1639,"max_us":1647},{"op":"edit-twin","fixture":"medium","min_us":2046,"med_us":2378,"p90_us":2529,"max_us":2585},{"op":"body-2m","fixture":"medium","min_us":5790,"med_us":9510,"p90_us":12226,"max_us":12462},{"op":"body-appends","fixture":"medium","min_us":132421,"med_us":224849,"p90_us":257368,"max_us":274890},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":80,"p90_us":84,"max_us":86}]} diff --git a/test/perf-baseline-tty-ReleaseFast.json b/test/perf-baseline-tty-ReleaseFast.json deleted file mode 100644 index 4cbc8b95..00000000 --- a/test/perf-baseline-tty-ReleaseFast.json +++ /dev/null @@ -1 +0,0 @@ -{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"ReleaseFast","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseFast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1775,"med_us":1995,"p90_us":2092,"max_us":2094},{"op":"render","fixture":"medium","min_us":80,"med_us":86,"p90_us":89,"max_us":95},{"op":"key-down","fixture":"medium","min_us":81,"med_us":83,"p90_us":95,"max_us":101},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":98},{"op":"page-down","fixture":"medium","min_us":80,"med_us":82,"p90_us":96,"max_us":97},{"op":"wheel","fixture":"medium","min_us":78,"med_us":80,"p90_us":87,"max_us":88},{"op":"edit-char","fixture":"medium","min_us":1036,"med_us":1377,"p90_us":1602,"max_us":1621},{"op":"edit-twin","fixture":"medium","min_us":2266,"med_us":2715,"p90_us":3695,"max_us":3927},{"op":"body-2m","fixture":"medium","min_us":4739,"med_us":8675,"p90_us":11518,"max_us":13657},{"op":"body-appends","fixture":"medium","min_us":111613,"med_us":214959,"p90_us":264859,"max_us":283506},{"op":"deep-sel","fixture":"medium","min_us":74,"med_us":76,"p90_us":89,"max_us":96}]} diff --git a/test/perf-baseline-tty-debug.json b/test/perf-baseline-tty-debug.json new file mode 100644 index 00000000..a01335bd --- /dev/null +++ b/test/perf-baseline-tty-debug.json @@ -0,0 +1 @@ +{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2169,"med_us":2697,"p90_us":3126,"max_us":3207},{"op":"render","fixture":"medium","min_us":89,"med_us":96,"p90_us":101,"max_us":115},{"op":"key-down","fixture":"medium","min_us":93,"med_us":98,"p90_us":104,"max_us":115},{"op":"key-right","fixture":"medium","min_us":96,"med_us":97,"p90_us":102,"max_us":108},{"op":"page-down","fixture":"medium","min_us":96,"med_us":98,"p90_us":102,"max_us":103},{"op":"wheel","fixture":"medium","min_us":89,"med_us":100,"p90_us":128,"max_us":168},{"op":"edit-char","fixture":"medium","min_us":1821,"med_us":2274,"p90_us":2404,"max_us":2610},{"op":"edit-twin","fixture":"medium","min_us":2710,"med_us":3180,"p90_us":3413,"max_us":3636},{"op":"body-2m","fixture":"medium","min_us":9090,"med_us":14438,"p90_us":18158,"max_us":22063},{"op":"body-appends","fixture":"medium","min_us":241367,"med_us":375874,"p90_us":470623,"max_us":528094},{"op":"deep-sel","fixture":"medium","min_us":88,"med_us":89,"p90_us":90,"max_us":90}]} diff --git a/test/perf-baseline-tty-fast.json b/test/perf-baseline-tty-fast.json new file mode 100644 index 00000000..04fc88d3 --- /dev/null +++ b/test/perf-baseline-tty-fast.json @@ -0,0 +1 @@ +{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1695,"med_us":2024,"p90_us":2180,"max_us":2292},{"op":"render","fixture":"medium","min_us":79,"med_us":82,"p90_us":92,"max_us":94},{"op":"key-down","fixture":"medium","min_us":81,"med_us":82,"p90_us":83,"max_us":84},{"op":"key-right","fixture":"medium","min_us":80,"med_us":82,"p90_us":91,"max_us":91},{"op":"page-down","fixture":"medium","min_us":81,"med_us":84,"p90_us":90,"max_us":171},{"op":"wheel","fixture":"medium","min_us":79,"med_us":80,"p90_us":90,"max_us":101},{"op":"edit-char","fixture":"medium","min_us":1332,"med_us":1691,"p90_us":1967,"max_us":1987},{"op":"edit-twin","fixture":"medium","min_us":2160,"med_us":2457,"p90_us":2718,"max_us":2757},{"op":"body-2m","fixture":"medium","min_us":5047,"med_us":13525,"p90_us":16257,"max_us":20323},{"op":"body-appends","fixture":"medium","min_us":155834,"med_us":261597,"p90_us":329936,"max_us":333538},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":76,"p90_us":84,"max_us":96}]} diff --git a/test/perf.zig b/test/perf.zig index c9235954..d01d1bb5 100644 --- a/test/perf.zig +++ b/test/perf.zig @@ -1054,7 +1054,7 @@ fn measureTerminalSession(io: std.Io, mib: usize, reps: usize, json: bool) !void .undo_output = undo_output, .history_rows = state.vt.screens.active.pages.scrollbar().total, .history_bytes = state.vt.screens.active.pages.page_size, - .history_limit_bytes = state.vt.screens.active.pages.maxSize(), + .history_limit_bytes = state.vt.screens.active.pages.limits.max(.bytes), .row_count_decreases = row_count_decreases, .allocator_calls = counter.calls, .allocator_live_after_output = live_after_output, @@ -1385,7 +1385,7 @@ fn reportText( for (fixtures) |fx| { if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name}); } - o("\n{s}\n", .{if (base != null) "-" ** (12 + fixtures.len * 20) else "-" ** (12 + fixtures.len * 13)}); + o("\n{s}\n", .{if (base != null) &@as([12 + fixtures.len * 20]u8, @splat('-')) else &@as([12 + fixtures.len * 13]u8, @splat('-'))}); var worst_jitter: f64 = 0; for (std.enums.values(Op), 0..) |op, oi| { o("{s:<12}", .{op.label()}); @@ -1412,7 +1412,7 @@ fn reportText( for (term_fixtures) |fx| { if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name}); } - o("\n{s}\n", .{if (base != null) "-" ** (12 + term_fixtures.len * 20) else "-" ** (12 + term_fixtures.len * 13)}); + o("\n{s}\n", .{if (base != null) &@as([12 + term_fixtures.len * 20]u8, @splat('-')) else &@as([12 + term_fixtures.len * 13]u8, @splat('-'))}); for (std.enums.values(TermOp), 0..) |op, oi| { o("{s:<12}", .{op.label()}); for (0..term_fixtures.len) |fi| { @@ -1524,10 +1524,11 @@ fn parseBase(src: []const u8, opts: Options, bytes: *const [fixtures.len]usize) defer parsed.deinit(); const report = parsed.value; if (!std.mem.eql(u8, report.harness, harness_id)) return error.BaselineHarnessMismatch; - inline for (std.meta.fields(BuildIdentity)) |field| { - const before = @field(report.build, field.name); - const after = @field(build_identity, field.name); - const same = if (field.type == []const u8) std.mem.eql(u8, before, after) else before == after; + const info = @typeInfo(BuildIdentity).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + const before = @field(report.build, name); + const after = @field(build_identity, name); + const same = if (T == []const u8) std.mem.eql(u8, before, after) else before == after; if (!same) return error.BaselineBuildMismatch; } if (report.cols != opts.cols or report.rows != opts.rows or report.reps != opts.reps or diff --git a/test/snapshot.zig b/test/snapshot.zig index 5522fbb9..2d8a8664 100644 --- a/test/snapshot.zig +++ b/test/snapshot.zig @@ -157,8 +157,8 @@ pub fn main(init: std.process.Init) !void { script_i += 1; } if (exe == null) fatal("usage: pardes-snap [scripts...] [--update] [--jobs=N]", .{}); - const exe_z = try arena.dupeZ(u8, exe.?); - lspmock_bin = if (lspmock) |p| try arena.dupeZ(u8, p) else null; + const exe_z = try arena.dupeSentinel(u8, exe.?, 0); + lspmock_bin = if (lspmock) |p| try arena.dupeSentinel(u8, p, 0) else null; if (scripts.len == 0) { scripts = try listSnaps(arena, try absPath(arena, orig_cwd, "test/snapshots")); @@ -443,7 +443,7 @@ fn runBatch( fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8, update: bool) u8 { if (careful) beCareful(); const stem = std.fs.path.stem(script_path); - const report_z = arena.dupeZ(u8, reportPath(arena, script_path) catch return 1) catch return 1; + const report_z = arena.dupeSentinel(u8, reportPath(arena, script_path) catch return 1, 0) catch return 1; const fd = libc.open(report_z, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644)); if (fd >= 0) { _ = libc.dup2(fd, 1); @@ -457,7 +457,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8 // dirty to every manual `cmp` audit. Unlink only this script's exact path // before it starts; a new mismatch below writes it back. const actual_path = std.fmt.allocPrint(arena, "{s}.actual", .{base_path}) catch return 1; - const actual_path_z = arena.dupeZ(u8, actual_path) catch return 1; + const actual_path_z = arena.dupeSentinel(u8, actual_path, 0) catch return 1; if (record_dir == null) _ = libc.unlink(actual_path_z); const golden: ?[]u8 = if (record_dir == null) readFileAlloc(arena, golden_path) catch null else null; const started = eh.nowMs(); @@ -473,7 +473,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8 return 0; } if (update) { - eh.writeFile(arena.dupeZ(u8, golden_path) catch return 1, out) catch return 1; + eh.writeFile(arena.dupeSentinel(u8, golden_path, 0) catch return 1, out) catch return 1; std.debug.print("UPDATED {s} ({d} bytes)\n", .{ stem, out.len }); return 0; } @@ -485,7 +485,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8 std.debug.print("PASS {s} ({d}ms)\n", .{ stem, took }); return 0; } - eh.writeFile(arena.dupeZ(u8, actual_path) catch return 1, out) catch |err| { + eh.writeFile(arena.dupeSentinel(u8, actual_path, 0) catch return 1, out) catch |err| { std.debug.print("FAIL {s}: differs from golden; cannot write {s}: {s} ({d}ms)\n", .{ stem, actual_path, @errorName(err), took }); printFirstDiff(golden.?, out); return 1; @@ -557,7 +557,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const try mkdir(arena, work, false); // deterministic shell: fixed prompt, no history, no user rc leakage try eh.writeFile(try std.fmt.allocPrintSentinel(arena, "{s}/.bashrc", .{home}, 0), "PS1='$ '\nHISTFILE=\n"); - _ = setenv("HOME", try arena.dupeZ(u8, home), 1); + _ = setenv("HOME", try arena.dupeSentinel(u8, home, 0), 1); // Keep startup configuration hermetic even when the developer exports an // XDG directory that points outside this per-snapshot fake home. const config_home = try std.fmt.allocPrintSentinel(arena, "{s}/.config", .{home}, 0); @@ -602,8 +602,8 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const // take turns — which cost more wall clock than the other 51 scripts put // together. Scripts name it `$DUMP`. const dump_path = try std.fmt.allocPrint(arena, "{s}/dump.zon", .{base}); - _ = setenv("PARDES_DUMP", try arena.dupeZ(u8, dump_path), 1); - if (chdirRc(try arena.dupeZ(u8, work)) < 0) return error.ChdirFailed; + _ = setenv("PARDES_DUMP", try arena.dupeSentinel(u8, dump_path, 0), 1); + if (chdirRc(try arena.dupeSentinel(u8, work, 0)) < 0) return error.ChdirFailed; const chunks = try arena.alloc([]const u8, countCaptures(src)); var chunk_len: usize = 0; @@ -636,7 +636,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const try eh.appendFile(try std.fmt.allocPrintSentinel(arena, "{s}/pardes/init", .{config_home}, 0), setting); } else if (std.mem.eql(u8, cmd, "file")) { const name = tok.next() orelse return error.BadScript; - try eh.writeFile(try arena.dupeZ(u8, name), try unescape(arena, tok.rest())); + try eh.writeFile(try arena.dupeSentinel(u8, name, 0), try unescape(arena, tok.rest())); } else if (std.mem.eql(u8, cmd, "lines")) { const name = tok.next() orelse return error.BadScript; const n = try std.fmt.parseInt(usize, tok.next() orelse return error.BadScript, 10); @@ -646,7 +646,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const // scroll test needs and `file` can only give as one huge script line const tail = tok.rest(); const buf = try numberedLines(arena, n, tail); - try eh.writeFile(try arena.dupeZ(u8, name), buf); + try eh.writeFile(try arena.dupeSentinel(u8, name, 0), buf); } else if (std.mem.eql(u8, cmd, "ppmdiag")) { // The diagonal-split test PPM from the old e2e (white over blue), // grown to 512x512 with the white half filled by a fixed LCG @@ -658,7 +658,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const // down to flat color and a block always wins). const name = tok.next() orelse return error.BadScript; const ppm = try ppmDiag(arena); - try eh.writeFile(try arena.dupeZ(u8, name), ppm); + try eh.writeFile(try arena.dupeSentinel(u8, name, 0), ppm); } else if (std.mem.eql(u8, cmd, "dirmk")) { try mkdir(arena, tok.next() orelse return error.BadScript, false); } else if (std.mem.eql(u8, cmd, "run")) { @@ -668,7 +668,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const // different inotify event. This runs in the script's cwd, as a // child of the RUNNER, so nothing it does reaches the app's ptys: // whatever the app then shows, it woke up for by itself. - if (system(try arena.dupeZ(u8, tok.rest())) != 0) return error.RunFailed; + if (system(try arena.dupeSentinel(u8, tok.rest(), 0)) != 0) return error.RunFailed; } else if (std.mem.eql(u8, cmd, "start")) { const rows = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10); const cols = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10); @@ -676,7 +676,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const var nextra: usize = 0; while (tok.next()) |a| : (nextra += 1) { if (nextra >= extra.len) return error.BadScript; - extra[nextra] = (try arena.dupeZ(u8, a)).ptr; + extra[nextra] = (try arena.dupeSentinel(u8, a, 0)).ptr; } if (h) |*hp| hp.deinit(); // scripts may restart (e.g. dump then -l) // a new process is a new screen: capture it whole, or its first @@ -963,13 +963,13 @@ fn treeAsleep(root: libc.pid_t) bool { while (n > 0) { n -= 1; const pid = stack[n]; - const dir_path = std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task", .{pid}) catch continue; + const dir_path = std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task", .{pid}, 0) catch continue; const dir = libc.opendir(dir_path) orelse continue; // exited between steps defer _ = libc.closedir(dir); while (libc.readdir(dir)) |d| { const tid = std.mem.sliceTo(@as([*:0]const u8, @ptrCast(&d.name)), 0); if (tid[0] == '.') continue; - const stat = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }) catch continue) orelse continue; + const stat = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }, 0) catch continue) orelse continue; // "pid (comm) S ..." — comm can hold spaces and parens, so the // state is the char two past the LAST ')' const close = std.mem.lastIndexOfScalar(u8, stat, ')') orelse continue; @@ -983,7 +983,7 @@ fn treeAsleep(root: libc.pid_t) bool { 'R', 'D', 'Z' => return false, else => {}, } - const kids = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }) catch continue) orelse continue; + const kids = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }, 0) catch continue) orelse continue; var it = std.mem.tokenizeAny(u8, kids, " \n"); while (it.next()) |k| { if (n >= stack.len) return false; // deeper than we can walk: assume busy @@ -1554,7 +1554,7 @@ fn absPath(arena: std.mem.Allocator, cwd: []const u8, p: []const u8) ![]const u8 } fn listSnaps(arena: std.mem.Allocator, dir_path: []const u8) ![][]const u8 { - const dir_z = try arena.dupeZ(u8, dir_path); + const dir_z = try arena.dupeSentinel(u8, dir_path, 0); const count = countSnapEntries(dir_z, dir_path); const scripts = try arena.alloc([]const u8, count); const dir = libc.opendir(dir_z) orelse fatal("no snapshots/ dir at {s}", .{dir_path}); @@ -1583,7 +1583,7 @@ fn countSnapEntries(dir_z: [:0]const u8, dir_path: []const u8) usize { } fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 { - const path_z = try arena.dupeZ(u8, path); + const path_z = try arena.dupeSentinel(u8, path, 0); const fd = libc.open(path_z, .{ .ACCMODE = .RDONLY }); if (fd < 0) return error.OpenFailed; defer _ = libc.close(fd); @@ -1611,7 +1611,7 @@ fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 { } fn mkdir(arena: std.mem.Allocator, path: []const u8, exist_ok: bool) !void { - const path_z = try arena.dupeZ(u8, path); + const path_z = try arena.dupeSentinel(u8, path, 0); const rc = libc.mkdir(path_z, 0o755); if (rc != 0) { if (exist_ok and libc.errno(rc) == .EXIST) return; diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index df49336c..30473c9e 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -22,15 +22,17 @@ == snap kept grid=140x31 cursor=6,3 |3: ZZARG ls |4: ./c.sh e.txt +|8: |9: == snap chord grid=140x31 cursor=6,3 |3: ZZARG Exec ls -|9: CHORDARG:ZZARG +|5: ./c.sh ZZARG +|6: CHORDARG:ZZARG == snap deleted grid=140x31 cursor=4,5 |3: ls ls |4: e.txt e.txt -|8: -|9: +|5: +|6: |17: |18: |19: diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden deleted file mode 100644 index 787a9d8f..00000000 --- a/test/snapshots/tinywin.golden +++ /dev/null @@ -1,83 +0,0 @@ -== snap stacked grid=100x31 cursor=14,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Tty Find Grep Joincol Delcol -|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del -| $ :^[n^[n^[n -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del -| 1 -== snap shrunk grid=60x4 cursor=59,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes -| New Tty Find Grep Joincol Delcol -|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Col -| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del -== snap columns grid=100x31 cursor=23,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Tty Find Grep Joincol Delcol -|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del -| $ :^[n^[n^[n cn cn cn -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del -| 1 -== snap narrow grid=4x31 cursor=2,20 -| Ne -| Ne -|$ /t -| mp -| /p -| ar -| de -| s- -| sn -| ap -| $ -| ^[ -| n^ -| [n -| ^[ -| n -| cn -| c -| n -| cn -| -| /t -| mp -| /p -| ar -| de -| s- -| sn -| ap diff --git a/test/snapshots/tinywin.snap b/test/snapshots/tinywin.snap deleted file mode 100644 index 3d22d583..00000000 --- a/test/snapshots/tinywin.snap +++ /dev/null @@ -1,31 +0,0 @@ -# Shrinking the window past "one row per pane" used to panic: computeGeom gave -# every pane in a column at least one row, so `y` walked off the bottom and -# renderPane got a rect outside the surface (assert). Panes that no longer fit -# now get h = 0 and simply do not render until the window grows back. -start 31 100 -wait 8000 $ -key a-n -stable 400 8000 -key a-n -stable 400 8000 -key a-n -stable 400 8000 -key a-n -stable 700 15000 -snap stacked -resize 4 60 -stable 700 10000 -snap shrunk -# ...and the same sideways: more columns than the window is wide -resize 31 100 -stable 700 10000 -key space c n -stable 600 8000 -key space c n -stable 600 8000 -key space c n -stable 700 15000 -snap columns -resize 31 4 -stable 700 10000 -snap narrow diff --git a/test/unit_profile_test.zig b/test/unit_profile_test.zig index 721f1212..a4cdd09e 100644 --- a/test/unit_profile_test.zig +++ b/test/unit_profile_test.zig @@ -149,11 +149,8 @@ fn fixture(init: std.process.Init) !void { var write_buffer: [1024]u8 = undefined; var reader = std.Io.File.stdin().readerStreaming(io, &read_buffer); var writer = std.Io.File.stdout().writerStreaming(io, &write_buffer); - var server = try std.zig.Server.init(.{ - .in = &reader.interface, - .out = &writer.interface, - .zig_version = if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string, - }); + var server: std.zig.Server = .{ .in = &reader.interface, .out = &writer.interface }; + try server.serveStringMessage(.zig_version, if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string); while (true) { const request = try server.receiveMessage(); switch (request.tag) { diff --git a/tools/gen_themes.zig b/tools/gen_themes.zig index 65e85d1c..be5fde2f 100644 --- a/tools/gen_themes.zig +++ b/tools/gen_themes.zig @@ -152,13 +152,14 @@ fn byName(_: void, a: Theme, b: Theme) bool { fn emit(w: *std.Io.Writer, t: Theme) !void { try w.writeAll("// Generated by tools/gen_themes.zig. Do not edit.\npub const theme = .{\n"); try w.print(" .name = \"{s}\",\n", .{t.name}); - inline for (@typeInfo(Theme).@"struct".fields) |f| { - if (comptime std.mem.eql(u8, f.name, "name")) continue; - if (comptime std.mem.eql(u8, f.name, "palette")) continue; - try w.print(" .{s} = ", .{f.name}); - if (comptime @typeInfo(f.type) == .optional) { - if (@field(t, f.name)) |c| try rgb(w, c) else try w.writeAll("null"); - } else try rgb(w, @field(t, f.name)); + const info = @typeInfo(Theme).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + if (comptime std.mem.eql(u8, name, "name")) continue; + if (comptime std.mem.eql(u8, name, "palette")) continue; + try w.print(" .{s} = ", .{name}); + if (comptime @typeInfo(T) == .optional) { + if (@field(t, name)) |c| try rgb(w, c) else try w.writeAll("null"); + } else try rgb(w, @field(t, name)); try w.writeAll(",\n"); } if (t.palette) |p| { -- cgit v1.3 From a53a1aafb9804e943bdcd720c2bb688ecb90a888 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Fri, 23 Oct 2026 11:12:56 -0300 Subject: Audit (colours, drawing): one Surface.tint, shared colour maths, the helix copies of hand-ported themes removed The 22 _helix themes that duplicate a hand-written port are gone; monokai, ayu_dark and nord stay, since others inherit from them. Co-Authored-By: Claude Opus 5.5 --- docs/typ/themes.typ | 5 +- src/File.zig | 23 +--- src/Messages.zig | 10 -- src/Presentation.zig | 72 +++++------ src/animation.zig | 16 +-- src/body_layer.zig | 64 +++------- src/colors.zig | 123 +++++-------------- src/draw.zig | 25 +--- src/gui/gui.zig | 38 ++---- src/surface.zig | 193 ++++++++++++------------------ test/snapshots/themesel.golden | 28 ++--- tools/gen_themes.zig | 14 ++- vendor/themes/ayu_dark.toml | 92 -------------- vendor/themes/ayu_dark_helix.toml | 92 ++++++++++++++ vendor/themes/ayu_evolve.toml | 2 +- vendor/themes/ayu_light.toml | 94 --------------- vendor/themes/ayu_mirage.toml | 92 -------------- vendor/themes/catppuccin_frappe.toml | 35 ------ vendor/themes/catppuccin_latte.toml | 35 ------ vendor/themes/catppuccin_macchiato.toml | 35 ------ vendor/themes/catppuccin_mocha.toml | 168 -------------------------- vendor/themes/dark_plus.toml | 138 --------------------- vendor/themes/doom-one.LICENSE | 23 ---- vendor/themes/doom-one.toml | 127 -------------------- vendor/themes/dracula.toml | 159 ------------------------ vendor/themes/molokai.toml | 2 +- vendor/themes/monokai.toml | 121 ------------------- vendor/themes/monokai_aqua.toml | 2 +- vendor/themes/monokai_helix.toml | 121 +++++++++++++++++++ vendor/themes/monokai_pro.toml | 134 --------------------- vendor/themes/monokai_pro_machine.toml | 131 -------------------- vendor/themes/monokai_pro_octagon.toml | 134 --------------------- vendor/themes/monokai_pro_ristretto.toml | 131 -------------------- vendor/themes/monokai_pro_spectrum.toml | 131 -------------------- vendor/themes/nord-night.toml | 2 +- vendor/themes/nord.toml | 199 ------------------------------- vendor/themes/nord_helix.toml | 199 +++++++++++++++++++++++++++++++ vendor/themes/rose_pine.toml | 197 ------------------------------ vendor/themes/rose_pine_dawn.toml | 30 ----- vendor/themes/rose_pine_moon.toml | 30 ----- vendor/themes/solarized_dark.toml | 135 --------------------- vendor/themes/solarized_light.toml | 155 ------------------------ vendor/themes/tokyonight_day.toml | 41 ------- vendor/themes/tokyonight_moon.toml | 41 ------- vendor/themes/tokyonight_storm.toml | 12 -- 45 files changed, 614 insertions(+), 3037 deletions(-) delete mode 100644 vendor/themes/ayu_dark.toml create mode 100644 vendor/themes/ayu_dark_helix.toml delete mode 100644 vendor/themes/ayu_light.toml delete mode 100644 vendor/themes/ayu_mirage.toml delete mode 100644 vendor/themes/catppuccin_frappe.toml delete mode 100644 vendor/themes/catppuccin_latte.toml delete mode 100644 vendor/themes/catppuccin_macchiato.toml delete mode 100644 vendor/themes/catppuccin_mocha.toml delete mode 100644 vendor/themes/dark_plus.toml delete mode 100644 vendor/themes/doom-one.LICENSE delete mode 100644 vendor/themes/doom-one.toml delete mode 100644 vendor/themes/dracula.toml delete mode 100644 vendor/themes/monokai.toml create mode 100644 vendor/themes/monokai_helix.toml delete mode 100644 vendor/themes/monokai_pro.toml delete mode 100644 vendor/themes/monokai_pro_machine.toml delete mode 100644 vendor/themes/monokai_pro_octagon.toml delete mode 100644 vendor/themes/monokai_pro_ristretto.toml delete mode 100644 vendor/themes/monokai_pro_spectrum.toml delete mode 100644 vendor/themes/nord.toml create mode 100644 vendor/themes/nord_helix.toml delete mode 100644 vendor/themes/rose_pine.toml delete mode 100644 vendor/themes/rose_pine_dawn.toml delete mode 100644 vendor/themes/rose_pine_moon.toml delete mode 100644 vendor/themes/solarized_dark.toml delete mode 100644 vendor/themes/solarized_light.toml delete mode 100644 vendor/themes/tokyonight_day.toml delete mode 100644 vendor/themes/tokyonight_moon.toml delete mode 100644 vendor/themes/tokyonight_storm.toml (limited to 'tools') diff --git a/docs/typ/themes.typ b/docs/typ/themes.typ index da4354e2..edfaa7ad 100644 --- a/docs/typ/themes.typ +++ b/docs/typ/themes.typ @@ -67,8 +67,9 @@ tab. Where a chrome colour misses one of pardes's floors (rules 1.5:1 off the page, the focused tag 1.5:1 off the unfocused one on a dark page and 1.25:1 on a light one, tag text 4.5:1), only that colour moves, just far enough, and the file's header says so; text, syntax and ANSI never move. -An imported theme whose name a port now holds is kept with `_helix` added -(`dracula_helix`). +helix's own copy of a theme ported here is not imported, except the +three other helix themes build on: `monokai_helix`, `ayu_dark_helix` and +`nord_helix`. #pairs( [Visual Studio Code], [`dark_plus`], diff --git a/src/File.zig b/src/File.zig index 7e05ac9f..e92efaba 100644 --- a/src/File.zig +++ b/src/File.zig @@ -1929,16 +1929,6 @@ pub const DiffTints = struct { } }; -/// A diff row's tint: its ground from `x` to the pane's edge. -fn tintRow(s: *Surface, x: u16, y: u16, end: u16, bg: [3]u8) void { - var col = x; - while (col < end) : (col += 1) { - const cell = s.at(col, y); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - } -} - fn synStyle(p: *Pardes, sy: syntax.Syn) ?SynStyle { return switch (sy) { .none => null, @@ -2010,7 +2000,7 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes. if (tint) |t| if (prefix_width < tw) { // A +Diff line added or removed whole: faintly (hunks.zig). const whole = highlights[base - highlight_start] & syntax.diff_whole != 0; - if (row_tint or whole) tintRow(s, tx + @as(u16, @intCast(prefix_width)), body_y + vr, tx + tw, if (row_tint) t.bg else t.line_bg); + if (row_tint or whole) s.tint(tx + @as(u16, @intCast(prefix_width)), body_y + vr, tw -| @as(u16, @intCast(prefix_width)), if (row_tint) t.bg else t.line_bg, null); }; // A +Pager's own colours (pager.zig) on every row but one the diff // look tints: an added or removed line is drawn as pardes draws a @@ -2228,7 +2218,7 @@ pub fn recolorDiffOutput(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, t const view = maybe orelse continue; const base = @intFromPtr(rows[view.row].ptr) - flat_start - lo; const tint = if (base < styles.len) tints.forStyle(styles[base]) else null; - if (tint) |t| tintRow(s, tx, body_y + @as(u16, @intCast(vr)), tx + tw, t.bg); + if (tint) |t| s.tint(tx, body_y + @as(u16, @intCast(vr)), tw, t.bg, null); var c: usize = 0; var screen_c: usize = 0; while (c < line.len and screen_c < tw) { @@ -2310,12 +2300,9 @@ pub fn paintWordSelection( if (hi <= lo) continue; const c0 = @as(i32, prefix_width) + here.pad + displayOffset(pane, row, here.at, lo); const c1 = @as(i32, prefix_width) + here.pad + displayEndOffset(pane, row, here.at, hi - 1); - var col = @max(@as(i32, prefix_width), c0); - while (col <= c1 and col < @as(i32, tw)) : (col += 1) { - const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr))); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - } + const col = @max(@as(i32, prefix_width), c0); + const end = @min(c1 + 1, @as(i32, tw)); + if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)), @intCast(end - col), bg, null); } } diff --git a/src/Messages.zig b/src/Messages.zig index 6d064c93..6785bd8a 100644 --- a/src/Messages.zig +++ b/src/Messages.zig @@ -398,16 +398,6 @@ pub fn noticeLife(pane: *const Pane, i: usize) ?Pane.MessageLife { }; } -pub fn blendRgb(from: [3]u8, to: [3]u8, amount: f32) [3]u8 { - var out: [3]u8 = undefined; - for (&out, from, to) |*o, a, b| { - const af: f32 = @floatFromInt(a); - const bf: f32 = @floatFromInt(b); - o.* = @intFromFloat(@round(bf + (af - bf) * std.math.clamp(amount, 0, 1))); - } - return out; -} - fn logMessage(p: *Pardes, id: usize, text: []const u8) void { if (text.len == 0) return; const serial: u32 = if (p.fs.session_write) 0 else if (id < MAX_PANES) if (p.panes[id]) |pane| pane.serial else 0 else 0; diff --git a/src/Presentation.zig b/src/Presentation.zig index 2a75b66d..3fc9be44 100644 --- a/src/Presentation.zig +++ b/src/Presentation.zig @@ -347,52 +347,36 @@ pub fn acknowledge(self: *Presentation, p: *Pardes, tracks: []const Track) void pub fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *const pardes.Surface) void { self.diff_state = .none; const cells = surface.cells; - if (cells.len == 0) { - self.previous_valid = false; - self.previous_layout = @splat(null); - return; - } - if (self.previous_cells.len != cells.len) { - const next = gpa.alloc(pardes.Cell, cells.len) catch { - self.previous_valid = false; - self.previous_layout = @splat(null); - return; - }; - if (self.previous_cells.len > 0) gpa.free(self.previous_cells); - self.previous_cells = next; - } - for (&self.previous_body_layers, surface.bodyLayers()) |*old, *current| { - const count = if (current.rows > 0) current.cells.len else 0; - const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch { - self.previous_valid = false; - self.previous_layout = @splat(null); - return; - }; - if (count > 0) @memcpy(storage, current.cells); - old.* = current.*; - old.cells = storage; - } - for (&self.previous_tag_layers, surface.tagLayers()) |*old, *current| { - const count = if (current.rows > 0) current.cells.len else 0; - const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch { - self.previous_valid = false; - self.previous_layout = @splat(null); - return; + copy: { + if (cells.len == 0) break :copy; + if (self.previous_cells.len != cells.len) { + const next = gpa.alloc(pardes.Cell, cells.len) catch break :copy; + if (self.previous_cells.len > 0) gpa.free(self.previous_cells); + self.previous_cells = next; + } + const olds = [_][]pardes.Layer{ &self.previous_body_layers, &self.previous_tag_layers }; + const currents = [_][]const pardes.Layer{ surface.bodyLayers(), surface.tagLayers() }; + for (olds, currents) |old_layers, current_layers| for (old_layers, current_layers) |*old, *current| { + const count = if (current.rows > 0) current.cells.len else 0; + const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch break :copy; + if (count > 0) @memcpy(storage, current.cells); + old.* = current.*; + old.cells = storage; }; - if (count > 0) @memcpy(storage, current.cells); - old.* = current.*; - old.cells = storage; + @memcpy(self.previous_cells, cells); + @memcpy(self.previous_regions[0..surface.nregions], surface.regionList()); + self.previous_nregions = surface.nregions; + self.previous_cols = surface.cols; + self.previous_rows = surface.rows; + self.previous_valid = true; + self.previous_layout = if (self.submitted_ready) + self.submitted + else + @splat(null); + return; } - @memcpy(self.previous_cells, cells); - @memcpy(self.previous_regions[0..surface.nregions], surface.regionList()); - self.previous_nregions = surface.nregions; - self.previous_cols = surface.cols; - self.previous_rows = surface.rows; - self.previous_valid = true; - self.previous_layout = if (self.submitted_ready) - self.submitted - else - @splat(null); + self.previous_valid = false; + self.previous_layout = @splat(null); } pub fn cellDiff(self: *const Presentation, cols: u16, rows: u16, col: u16, row: u16) pardes.PanelCellDiff { diff --git a/src/animation.zig b/src/animation.zig index 547b9201..a4887148 100644 --- a/src/animation.zig +++ b/src/animation.zig @@ -1226,22 +1226,14 @@ pub fn Immediate(comptime Value: type) type { }; } -pub fn interpolateRgb(from: [3]u8, to: [3]u8, step: u16, steps: u16) [3]u8 { - if (step == 0) return from; - if (step >= steps) return to; - var out: [3]u8 = undefined; - for (&out, from, to) |*dst, a, b| { - const numerator = @as(u32, a) * (steps - step) + @as(u32, b) * step; - dst.* = @intCast((numerator + steps / 2) / steps); - } - return out; -} - +/// A Fade's value for its tests: a colour stepped channel by channel. const TestColor = struct { rgb: [3]u8, pub fn interpolate(from: TestColor, to: TestColor, step: u16, steps: u16) TestColor { - return .{ .rgb = interpolateRgb(from.rgb, to.rgb, step, steps) }; + var out = from; + for (&out.rgb, to.rgb) |*c, b| c.* = @intCast((@as(u32, c.*) * (steps - step) + @as(u32, b) * step + steps / 2) / steps); + return out; } }; diff --git a/src/body_layer.zig b/src/body_layer.zig index 2aa8e5f8..0ddda41d 100644 --- a/src/body_layer.zig +++ b/src/body_layer.zig @@ -6,7 +6,6 @@ const pardes = @import("pardes.zig"); const normal = @import("normal.zig"); const edit = @import("edit.zig"); const config = @import("config.zig"); -const limits = @import("memory.zig").limits; const layout = @import("layout.zig"); const modal = @import("modal.zig"); const tracy = @import("tracy.zig"); @@ -23,19 +22,7 @@ const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET; const Rect = layout.Rect; const Pardes = pardes.Pardes; const tagline = @import("tagline.zig"); -const Messages = @import("Messages.zig"); const Text = panes.Text; -const MAX_PANES = pardes.MAX_PANES; -const TagKind = @import("Layer.zig").Kind; -const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS; -const NOTICE_LAYER_BASE = pardes.NOTICE_LAYER_BASE; -const TAG_LINE_LAYER_BASE = pardes.TAG_LINE_LAYER_BASE; -const HEADER_LINE_LAYER_BASE = pardes.HEADER_LINE_LAYER_BASE; -const MAX_COLS = pardes.MAX_COLS; -const TOPBAR_H = pardes.TOPBAR_H; -const COLBAR_H = pardes.COLBAR_H; -const TAG_GAP = pardes.TAG_GAP; -const wordBoundsAtCol = pardes.wordBoundsAtCol; const Layer = @import("Layer.zig"); @@ -71,14 +58,9 @@ fn paintTerminalSelection(p: *Pardes, s: *Surface, pane: *Pane, r: Rect, rows: [ lo = modal.graphemeStart(line, @min(lo, line.len)); hi = @min(hi, line.len); if (lo >= hi) continue; - var col = panes.File.rawDisplayCol(line, lo); - const end = if (row.to_edge and hi == line.len) width else panes.File.rawDisplayCol(line, hi); - while (col < end and col < width) : (col += 1) { - const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible))); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - if (fg) |ink| cell.style.fg = .{ .rgb = ink }; - } + const col = panes.File.rawDisplayCol(line, lo); + const end = @min(width, if (row.to_edge and hi == line.len) width else panes.File.rawDisplayCol(line, hi)); + if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)), @intCast(end - col), bg, fg); } } } @@ -113,14 +95,9 @@ fn paintSourceSelection(p: *Pardes, s: *Surface, pane: *Pane, r: Rect, rows: []c const lo = @max(start, row.lo); const hi = @min(end, row.hi); if (lo >= hi) continue; - var col = prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start))); - const last = if (row.to_edge and hi == end) @as(i32, width) else prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start))); - while (col < last and col < width) : (col += 1) { - const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible))); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - if (fg) |ink| cell.style.fg = .{ .rgb = ink }; - } + const col = prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start))); + const last = @min(width, if (row.to_edge and hi == end) @as(i32, width) else prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start)))); + if (col < last) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)), @intCast(last - col), bg, fg); } } } @@ -151,15 +128,11 @@ pub fn paintPointerSelection( // File line numbers occupy a gutter only in the body. The tag is // row zero in Sel space and starts at its real first text cell. const scroll: i32 = if (row < pane.tag_rows) pane.tag_scroll else 0; - var col: i32 = if (pane.file != null and row >= pane.tag_rows) @max(c0, @as(i32, panes.File.gutterWidth(pane))) else @max(0, c0 - scroll); + const col: i32 = if (pane.file != null and row >= pane.tag_rows) @max(c0, @as(i32, panes.File.gutterWidth(pane))) else @max(0, c0 - scroll); const row_x = if (row < pane.tag_rows) r.x + @min(TAG_TEXT_INSET, r.w) else tx; const row_width = if (row < pane.tag_rows) r.w -| TAG_TEXT_INSET else tw; - while (col <= c1 - scroll and col < row_width) : (col += 1) { - const cell = s.at(row_x + @as(u16, @intCast(col)), sy); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - if (fg) |ink| cell.style.fg = .{ .rgb = ink }; - } + const end = @min(c1 - scroll + 1, row_width); + if (col < end) s.tint(row_x + @as(u16, @intCast(col)), sy, @intCast(end - col), bg, fg); } } @@ -345,13 +318,8 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane while (row < body_bottom) : (row += 1) { const ar = pane.wrapAt(@as(i32, row) - @as(i32, pane.tag_rows)).line; if (ar < lo or ar > hi) continue; - var col: u16 = if (pane.file != null) panes.File.gutterWidth(pane) else 0; - while (col < tw) : (col += 1) { - const cell = s.at(tx + col, body_y + row - pane.tag_rows); - cell.default = false; - cell.style.bg = .{ .rgb = modal_bg }; - if (!hover_only) cell.style.fg = .{ .rgb = th.sel_fg }; - } + const col: u16 = if (pane.file != null) panes.File.gutterWidth(pane) else 0; + if (col < tw) s.tint(tx + col, body_y + row - pane.tag_rows, tw - col, modal_bg, if (hover_only) null else th.sel_fg); } } const preview = normal.selRegexArmed(pane) != null; @@ -409,13 +377,9 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane panes.File.lineDisplayEndOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.hi_col)))) + vpfx + w.pad else @as(i32, tw) - 1; - var col: i32 = @max(cstart, vpfx); - while (col <= cend and col < tw) : (col += 1) { - const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr))); - cell.default = false; - cell.style.bg = .{ .rgb = bg }; - if (!hover_only) cell.style.fg = .{ .rgb = th.sel_fg }; - } + const col: i32 = @max(cstart, vpfx); + const end = @min(cend + 1, tw); + if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)), @intCast(end - col), bg, if (hover_only) null else th.sel_fg); } if (primary and !preview and !hover_only) continue; // the hardware cursor IS the primary's if (hover_only) continue; // quiet preview preserves the source ink diff --git a/src/colors.zig b/src/colors.zig index 28136975..c016434b 100644 --- a/src/colors.zig +++ b/src/colors.zig @@ -4,12 +4,10 @@ const pardes = @import("pardes.zig"); const tagline = @import("tagline.zig"); const panes = @import("panes.zig"); const std = @import("std"); -const layout = @import("layout.zig"); const animation = @import("animation.zig"); const Color = @import("surface.zig").Color; const FontRole = @import("surface.zig").FontRole; const config = @import("config.zig"); -const limits = @import("memory.zig").limits; const pdf_enabled = panes.Pdf.enabled; const platform = pardes.platform; const theme_animation = @import("pardes_config").theme_animation; @@ -34,7 +32,7 @@ pub fn contrast(a: [3]u8, b: [3]u8) f32 { return (@max(x, y) + 0.05) / (@min(x, y) + 0.05); } -fn lerp(a: [3]u8, b: [3]u8, t: f32) [3]u8 { +pub fn lerp(a: [3]u8, b: [3]u8, t: f32) [3]u8 { var out: [3]u8 = undefined; for (&out, a, b) |*o, x, y| o.* = @intFromFloat(std.math.clamp(@round(@as(f32, @floatFromInt(x)) + (@as(f32, @floatFromInt(y)) - @as(f32, @floatFromInt(x))) * t), 0, 255)); return out; @@ -498,22 +496,7 @@ fn fold(comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme { } } -/// The imported themes (tools/gen_themes.zig), less any name one of ours -/// takes: a faithful port (`dracula`) keeps the plain name, and helix's -/// looser copy of it is still there as `dracula_helix` (the zed ones already -/// carry `_zed`). -fn foldImports(comptime ours: anytype, comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme { - comptime { - @setEvalBranchQuota(400000); - var out = fold(C); - for (&out) |*g| for (ours) |c| if (std.mem.eql(u8, c.name, g.name)) { - g.name = g.name ++ "_helix"; - }; - return out; - } -} - -pub const themes = fold(curated) ++ foldImports(fold(curated), @import("generated_themes")); +pub const themes = fold(curated) ++ fold(@import("generated_themes")); /// The first `native_count` of `themes` are pardes's own; the rest imported. pub const native_count = @typeInfo(curated).@"struct".decl_names.len; @@ -589,18 +572,6 @@ test "lapis_plain is lapis on flat grounds, framed and shadowed as lapis" { /// Original and classic-inspired Pardes palettes precede retained imports. pub const native_theme_count = 15; -fn themeContrast(a: [3]u8, b: [3]u8) f64 { - var luminance: [2]f64 = .{ 0, 0 }; - for ([2][3]u8{ a, b }, 0..) |rgb, i| { - for (rgb, [3]f64{ 0.2126, 0.7152, 0.0722 }) |channel, weight| { - const srgb = @as(f64, @floatFromInt(channel)) / 255; - const linear = if (srgb <= 0.04045) srgb / 12.92 else std.math.pow(f64, (srgb + 0.055) / 1.055, 2.4); - luminance[i] += weight * linear; - } - } - return (@max(luminance[0], luminance[1]) + 0.05) / (@min(luminance[0], luminance[1]) + 0.05); -} - comptime { if (themes.len > std.math.maxInt(u16) + 1) @compileError("runtime config theme index no longer fits u16"); @@ -714,21 +685,11 @@ pub fn requestThemeFile(p: *Pardes, id: usize, argument: []const u8) void { var joined: [4095]u8 = undefined; const resolved = if (absolute) input else path: { const dir = p.opts.config_dir.?; - const separator = std.Io.Dir.path.sep; - const needs_separator = dir.len > 0 and dir[dir.len - 1] != separator; - const len = dir.len + @intFromBool(needs_separator) + input.len; - if (len > joined.len) { + const separator = if (dir.len > 0 and dir[dir.len - 1] != std.Io.Dir.path.sep) std.Io.Dir.path.sep_str else ""; + break :path std.fmt.bufPrint(&joined, "{s}{s}{s}", .{ dir, separator, input }) catch { p.reportError(id, "theme file", error.PathTooLong); return; - } - @memcpy(joined[0..dir.len], dir); - var at = dir.len; - if (needs_separator) { - joined[at] = separator; - at += 1; - } - @memcpy(joined[at..][0..input.len], input); - break :path joined[0..len]; + }; }; if (!p.theme_file_path.set(resolved)) { p.reportError(id, "theme file", error.PathTooLong); @@ -787,9 +748,7 @@ fn themeFileFailure(p: *Pardes, request: ThemeFileRequest, why: []const u8) void fn revertThemeFile(p: *Pardes) void { const loaded = p.theme_file_loaded.get(); if (std.mem.eql(u8, loaded, p.theme_file_path.get())) return; - var keep: [limits.host_path_cap]u8 = undefined; - @memcpy(keep[0..loaded.len], loaded); - if (loaded.len == 0) p.theme_file_path.clear() else _ = p.theme_file_path.set(keep[0..loaded.len]); + if (loaded.len == 0) p.theme_file_path.clear() else _ = p.theme_file_path.set(loaded); const generation = nextThemeFileGeneration(p); p.emit(.{ .theme_file = .{ .generation = generation, .on = loaded.len > 0 } }); } @@ -836,9 +795,7 @@ pub fn loadThemeFile(p: *Pardes, generation: u32, bytes: []const u8, animate: bo const old = p.custom_theme; p.custom_theme = parsed; if (old) |theme_value| p.gpa.free(theme_value.name); - var settled: [limits.host_path_cap]u8 = undefined; - @memcpy(settled[0..request.path.len], request.path); - _ = p.theme_file_loaded.set(settled[0..request.path.len]); + _ = p.theme_file_loaded.set(request.path); invalidateThemeDependentRasters(p); _ = p.scratch.reset(.{ .retain_with_limit = pardes.memory.limits.scratch_kept }); p.sync(); @@ -1115,58 +1072,38 @@ test "native themes keep text and UI roles readable on their own surfaces" { for (themes[0..names.len], names) |th, name| { try std.testing.expectEqualStrings(name, th.name); const chrome = ChromeTheme.fromTheme(&th); - const minimum: f64 = if (std.mem.eql(u8, name, "ink") or std.mem.eql(u8, name, "daybreak")) 7 else 4.5; + const minimum: f32 = if (std.mem.eql(u8, name, "ink") or std.mem.eql(u8, name, "daybreak")) 7 else 4.5; const text_colors = [_][3]u8{ th.fg.?, th.kw, th.str, th.num, th.comment, chrome.diagnostic_error, chrome.diagnostic_warning, chrome.diagnostic_info, chrome.diagnostic_hint, }; - for (text_colors) |fg| try std.testing.expect(themeContrast(fg, th.bg.?) >= minimum); + for (text_colors) |fg| try std.testing.expect(contrast(fg, th.bg.?) >= minimum); // Gutters are orientation aids, not source text: stay visible without // competing with comments or pulling attention away from the body. - try std.testing.expect(themeContrast(th.lineno, th.bg.?) >= 2.5); - try std.testing.expect(themeContrast(th.lineno, th.bg.?) <= 4); - try std.testing.expect(themeContrast(th.lineno_active.?, th.bg.?) >= themeContrast(th.lineno, th.bg.?)); - try std.testing.expect(themeContrast(th.lineno_active.?, th.bg.?) <= 4.5); - try std.testing.expect(themeContrast(th.comment, th.bg.?) >= 5); - try std.testing.expect(themeContrast(th.comment, th.bg.?) >= themeContrast(th.lineno, th.bg.?) + 2); - try std.testing.expect(themeContrast(th.tag_fg, th.tag_bg) >= minimum); - try std.testing.expect(themeContrast(chrome.tag_active_fg, chrome.tag_active_bg) >= minimum); + try std.testing.expect(contrast(th.lineno, th.bg.?) >= 2.5); + try std.testing.expect(contrast(th.lineno, th.bg.?) <= 4); + try std.testing.expect(contrast(th.lineno_active.?, th.bg.?) >= contrast(th.lineno, th.bg.?)); + try std.testing.expect(contrast(th.lineno_active.?, th.bg.?) <= 4.5); + try std.testing.expect(contrast(th.comment, th.bg.?) >= 5); + try std.testing.expect(contrast(th.comment, th.bg.?) >= contrast(th.lineno, th.bg.?) + 2); + try std.testing.expect(contrast(th.tag_fg, th.tag_bg) >= minimum); + try std.testing.expect(contrast(chrome.tag_active_fg, chrome.tag_active_bg) >= minimum); try std.testing.expect(th.tag_name_fg != null); - try std.testing.expect(themeContrast(chrome.tag_name_fg, th.tag_bg) >= minimum); - try std.testing.expect(themeContrast(chrome.tag_active_name_fg, chrome.tag_active_bg) >= minimum); + try std.testing.expect(contrast(chrome.tag_name_fg, th.tag_bg) >= minimum); + try std.testing.expect(contrast(chrome.tag_active_name_fg, chrome.tag_active_bg) >= minimum); // Focus stays on the same tonal surface, rather than inverting a // whole command strip. Text remains readable in both states. - try std.testing.expect(themeContrast(chrome.tag_active_bg, th.tag_bg) <= 1.6); - try std.testing.expect(themeContrast(chrome.tag_active_fg, th.tag_fg) <= 1.6); - try std.testing.expect(themeContrast(th.sel_fg, th.sel_bg) >= minimum); - try std.testing.expect(themeContrast(chrome.search_fg, chrome.search_bg) >= minimum); + try std.testing.expect(contrast(chrome.tag_active_bg, th.tag_bg) <= 1.6); + try std.testing.expect(contrast(chrome.tag_active_fg, th.tag_fg) <= 1.6); + try std.testing.expect(contrast(th.sel_fg, th.sel_bg) >= minimum); + try std.testing.expect(contrast(chrome.search_fg, chrome.search_bg) >= minimum); // ANSI black can intentionally match the page (for backgrounds). All // other ANSI foregrounds, including bright black, remain legible. - for (th.palette.?[1..]) |fg| try std.testing.expect(themeContrast(fg, th.bg.?) >= minimum); + for (th.palette.?[1..]) |fg| try std.testing.expect(contrast(fg, th.bg.?) >= minimum); } } test "native filename tints change hue without changing perceived lightness" { - const Perceptual = struct { - fn lab(rgb: [3]u8) [3]f64 { - var linear: [3]f64 = undefined; - for (rgb, 0..) |channel, i| { - const value = @as(f64, @floatFromInt(channel)) / 255; - linear[i] = if (value <= 0.04045) value / 12.92 else std.math.pow(f64, (value + 0.055) / 1.055, 2.4); - } - const r = linear[0]; - const g = linear[1]; - const b = linear[2]; - const l = std.math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b); - const m = std.math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b); - const n = std.math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b); - return .{ - 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * n, - 1.9779984951 * l - 2.4285922050 * m + 0.4505937099 * n, - 0.0259040371 * l + 0.7827717662 * m - 0.8086757660 * n, - }; - } - }; for (themes[0..native_theme_count]) |th| { try std.testing.expect(th.tag_name_fg != null and th.tag_active_name_fg != null); const chrome = ChromeTheme.fromTheme(&th); @@ -1175,8 +1112,8 @@ test "native filename tints change hue without changing perceived lightness" { .{ chrome.tag_active_fg, chrome.tag_active_name_fg }, }; for (pairs) |pair| { - const base = Perceptual.lab(pair[0]); - const name = Perceptual.lab(pair[1]); + const base = toOklab(pair[0]); + const name = toOklab(pair[1]); // Half a lightness point allows 8-bit quantization without a // basename becoming visibly brighter or darker than its tag. try std.testing.expectApproxEqAbs(base[0], name[0], 0.005); @@ -1193,15 +1130,15 @@ test "native filename tints change hue without changing perceived lightness" { test "native dark palettes choose near-black or deliberately soft contrast" { for (themes[0..native_theme_count]) |th| { - if (themeContrast(th.bg.?, .{ 0, 0, 0 }) > 10) continue; // light paper + if (contrast(th.bg.?, .{ 0, 0, 0 }) > 10) continue; // light paper const soft = std.mem.eql(u8, th.name, "dusk") or std.mem.eql(u8, th.name, "lagoon") or std.mem.eql(u8, th.name, "solarium") or std.mem.eql(u8, th.name, "forge_soft"); if (soft) { - try std.testing.expect(themeContrast(th.fg.?, th.bg.?) >= 4.5); - try std.testing.expect(themeContrast(th.fg.?, th.bg.?) <= 7); + try std.testing.expect(contrast(th.fg.?, th.bg.?) >= 4.5); + try std.testing.expect(contrast(th.fg.?, th.bg.?) <= 7); } else { for (th.bg.?) |channel| try std.testing.expect(channel <= 0x14); - try std.testing.expect(themeContrast(th.fg.?, th.bg.?) >= 14); + try std.testing.expect(contrast(th.fg.?, th.bg.?) >= 14); } } const forge = curated.forge.theme; diff --git a/src/draw.zig b/src/draw.zig index 3d0d4d3c..93a78090 100644 --- a/src/draw.zig +++ b/src/draw.zig @@ -35,8 +35,6 @@ const wordBoundsAtCol = pardes.wordBoundsAtCol; const BOX_H = pardes.BOX_H; const TAG_GAP = pardes.TAG_GAP; const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET; -const TOPBAR_H = pardes.TOPBAR_H; -const COLBAR_H = pardes.COLBAR_H; const MAX_PANES = pardes.MAX_PANES; const MAX_COLS = pardes.MAX_COLS; const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS; @@ -1213,12 +1211,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r // Window mode (layout.windowKey): the outlined pane's tag in the // selection's colours. if (p.window_pick == id) { - const th = p.theme(); - for (storage) |*cell| { - cell.style.bg = .{ .rgb = th.sel_bg }; - cell.style.fg = .{ .rgb = th.sel_fg }; - cell.default = false; - } + for (0..rows) |row| temporary.tint(0, @intCast(row), temporary.cols, p.theme().sel_bg, p.theme().sel_fg); } const tag_fg: Color = .{ .rgb = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg }; // One layer, a row to each line the tag shows. @@ -1268,11 +1261,11 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region) // cannot move it by less than a row, a pixel shell slides it too. const motion: Messages.MessageMotion = if (Messages.noticeLife(pane, i)) |life| Messages.messageMotion(p, life) else .{}; const page = th.bg orelse chrome.tag_bg; - const bg = Messages.blendRgb(chrome.tag_bg, page, motion.alpha); + const bg = colors.lerp(page, chrome.tag_bg, motion.alpha); // Where an exec was sent to a REPL reads in the tag's name tint, set // apart from what the editor says. const ink = if (kind == .message and pane.msg_sent) chrome.tag_name_fg else chrome.tag_fg; - const fg = Messages.blendRgb(ink, page, motion.alpha); + const fg = colors.lerp(page, ink, motion.alpha); // Nothing to say, or too narrow for a layer: a blank chip on the grid. if (text.len == 0 or r.w <= TAG_TEXT_INSET) { s.fill(region.rect.x, region.rect.y, chip, 1, .{ .bg = .{ .rgb = bg }, .font_role = .tagline }); @@ -1428,15 +1421,9 @@ pub fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pa const line = lines[row - top]; const from = if (row == first.row) first.col else 0; const to = @min(line.len, if (row == last.row) last.col else line.len); - var col = panes.File.rawDisplayCol(line, from) -| pane.tag_scroll; - const end = panes.File.rawDisplayCol(line, to); - const y = tag_y + @as(u16, @intCast(row - top)); - while (col + pane.tag_scroll < end and col < tw) : (col += 1) { - const cell = s.at(tx + @as(u16, @intCast(col)), y); - cell.default = false; - cell.style.bg = .{ .rgb = th.tag_sel_bg orelse th.sel_bg }; - cell.style.fg = .{ .rgb = th.sel_fg }; - } + const col = panes.File.rawDisplayCol(line, from) -| pane.tag_scroll; + const end = @min(panes.File.rawDisplayCol(line, to) -| pane.tag_scroll, tw); + if (col < end) s.tint(tx + @as(u16, @intCast(col)), tag_y + @as(u16, @intCast(row - top)), @intCast(end - col), th.tag_sel_bg orelse th.sel_bg, th.sel_fg); } } } diff --git a/src/gui/gui.zig b/src/gui/gui.zig index d3734fac..2d01db33 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -8794,37 +8794,25 @@ fn clipToBodies(g: *Gui, gpa: std.mem.Allocator, first: usize, bodies: []const [ /// the decor pipeline blends a colour that is not black): the largest `a` /// that keeps text and page apart by min(their contrast, 4.5). fn lightenCeiling(fg: [3]u8, bg: [3]u8, rgb: [3]u8) f32 { - const contrast = struct { - fn of(a: [3]u8, b: [3]u8) f32 { - const la = luminance(a); - const lb = luminance(b); - return (@max(la, lb) + 0.05) / (@min(la, lb) + 0.05); - } - fn blend(under: [3]u8, over: [3]u8, a: f32) [3]u8 { + const contrast = pardes.colors.contrast; + const blend = struct { + fn of(under: [3]u8, over: [3]u8, a: f32) [3]u8 { var out: [3]u8 = undefined; for (&out, under, over) |*o, x, y| o.* = @intFromFloat(@round(@as(f32, @floatFromInt(x)) * (1 - a) + @as(f32, @floatFromInt(y)) * a)); return out; } - }; - const target = @min(contrast.of(fg, bg), 4.5); + }.of; + const target = @min(contrast(fg, bg), 4.5); var lo: f32 = 0; var hi: f32 = 1; for (0..24) |_| { const mid = (lo + hi) / 2; - if (contrast.of(contrast.blend(fg, rgb, mid), contrast.blend(bg, rgb, mid)) >= target - 1e-3) lo = mid else hi = mid; + if (contrast(blend(fg, rgb, mid), blend(bg, rgb, mid)) >= target - 1e-3) lo = mid else hi = mid; } return lo; } -/// sRGB's relative luminance (WCAG). -fn luminance(rgb: [3]u8) f32 { - var sum: f32 = 0; - for (rgb, [3]f32{ 0.2126, 0.7152, 0.0722 }) |channel, weight| { - const v = @as(f32, @floatFromInt(channel)) / 255; - sum += weight * (if (v <= 0.04045) v / 12.92 else std.math.pow(f32, (v + 0.055) / 1.055, 2.4)); - } - return sum; -} +const luminance = pardes.colors.relativeLuminance; /// How dark a shadow may make the page and its text, both together, before /// the pair drops below its own contrast or 4.5, whichever is lower (§8.2): @@ -8853,11 +8841,7 @@ test "a rim never lightens a native theme's text below its contrast or 4.5" { return out; } }.of; - const ratio = struct { - fn of(x: [3]u8, y: [3]u8) f32 { - return (@max(luminance(x), luminance(y)) + 0.05) / (@min(luminance(x), luminance(y)) + 0.05); - } - }.of; + const ratio = pardes.colors.contrast; try std.testing.expect(ratio(blend(fg, light, a), blend(bg, light, a)) >= @min(ratio(fg, bg), 4.5) - 2e-3); } } @@ -9206,11 +9190,7 @@ fn paneDecor(g: *Gui, gpa: std.mem.Allocator, regions: []const pardes.Region, gr } /// Halfway between two colours. -fn mixRgb(a: [3]u8, b: [3]u8) [3]u8 { - var out: [3]u8 = undefined; - for (&out, a, b) |*o, x, y| o.* = @intCast((@as(u16, x) + y) / 2); - return out; -} +const mixRgb = pardes.colors.mix; /// A rule's width: the theme's own, or one pixel. fn rulePx(chrome: *const pardes.Chrome) f32 { diff --git a/src/surface.zig b/src/surface.zig index d6ec016d..839e8f33 100644 --- a/src/surface.zig +++ b/src/surface.zig @@ -221,10 +221,6 @@ pub const ImageCacheKey = if (pdf_enabled) struct { } }; -const PdfFitMode = panes.Pdf.FitMode; - -const PdfTintMode = panes.Pdf.TintMode; - /// Dynamic placement exists only for native PDF pages. Static image panes need /// only their pane identity, so feature-off builds carry a zero-bit payload. pub const NativePlacement = if (pdf_enabled) struct { @@ -562,67 +558,73 @@ pub const Surface = struct { continue; } } - if (col >= end) break; - // n == 0: not a start byte at all. A short tail or a bad - // continuation decodes to null the same way — one U+FFFD, one byte. - const n = std.unicode.utf8ByteSequenceLength(text[i]) catch 0; - const decoded: ?u21 = if (n > 0 and i + n <= text.len) - (std.unicode.utf8Decode(text[i .. i + n]) catch null) - else - null; - var cp_slice: []const u8 = "\u{FFFD}"; - var consumed: usize = 1; - if (decoded != null) { - var git = uucode.grapheme.utf8Iterator(text[i..]); - if (git.nextGrapheme()) |g| { - const candidate = text[i .. i + g.end]; - if (std.unicode.utf8ValidateSlice(candidate)) { - cp_slice = candidate; - consumed = candidate.len; - } else { - cp_slice = text[i .. i + n]; - consumed = n; - } - } - } - i += consumed; - var cp = decoded orelse 0xFFFD; - if (cp == '\r') continue; - if (cp == '\t') { - const spaces = @min(config.tab_now, end - col); - s.fill(col, y, spaces, 1, style); - col += spaces; - continue; - } - // No other C0/C1 control or DEL reaches a font fallback either. - if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) { - cp = 0xFFFD; - cp_slice = "\u{FFFD}"; - } - const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1)) - 1 - else - @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode)); - if (width == 2 and col + 1 >= end) break; - var shown = cp_slice; - if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) { - const cap = @typeInfo(@FieldType(Cell, "text")).array.len; - var prefix: usize = 0; - while (prefix < shown.len) { - const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break; - if (prefix + cp_len > cap) break; - prefix += cp_len; + col = s.printGeneral(col, end, y, text, &i, style) orelse break; + } + return col; + } + + /// `print`'s general arm: the grapheme at `i.*`, painted at `col`. + /// Advances `i.*` past it and returns the column after it, or null + /// when a wide glyph does not fit before `end`. + fn printGeneral(s: *Surface, col: u16, end: u16, y: u16, text: []const u8, i: *usize, style: CellStyle) ?u16 { + const start = i.*; + // n == 0: not a start byte at all. A short tail or a bad + // continuation decodes to null the same way — one U+FFFD, one byte. + const n = std.unicode.utf8ByteSequenceLength(text[start]) catch 0; + const decoded: ?u21 = if (n > 0 and start + n <= text.len) + (std.unicode.utf8Decode(text[start .. start + n]) catch null) + else + null; + var cp_slice: []const u8 = "\u{FFFD}"; + var consumed: usize = 1; + if (decoded != null) { + var git = uucode.grapheme.utf8Iterator(text[start..]); + if (git.nextGrapheme()) |g| { + const candidate = text[start .. start + g.end]; + if (std.unicode.utf8ValidateSlice(candidate)) { + cp_slice = candidate; + consumed = candidate.len; + } else { + cp_slice = text[start .. start + n]; + consumed = n; } - shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}"; } - s.set(col, y, shown, style); - if (width == 2 and col + 1 < end) { - // spacer: empty cell under the wide glyph's tail - s.set(col + 1, y, "", style); + } + i.* += consumed; + var cp = decoded orelse 0xFFFD; + if (cp == '\r') return col; + if (cp == '\t') { + const spaces = @min(config.tab_now, end - col); + s.fill(col, y, spaces, 1, style); + return col + spaces; + } + // No other C0/C1 control or DEL reaches a font fallback either. + if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) { + cp = 0xFFFD; + cp_slice = "\u{FFFD}"; + } + const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1)) + 1 + else + @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode)); + if (width == 2 and col + 1 >= end) return null; + var shown = cp_slice; + if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) { + const cap = @typeInfo(@FieldType(Cell, "text")).array.len; + var prefix: usize = 0; + while (prefix < shown.len) { + const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break; + if (prefix + cp_len > cap) break; + prefix += cp_len; } - col += width; + shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}"; } - return col; + s.set(col, y, shown, style); + if (width == 2 and col + 1 < end) { + // spacer: empty cell under the wide glyph's tail + s.set(col + 1, y, "", style); + } + return col + width; } pub fn fill(s: *Surface, x: u16, y: u16, w: u16, h: u16, style: CellStyle) void { @@ -633,6 +635,17 @@ pub const Surface = struct { } } + /// Recolour `n` cells from (x, y), keeping their glyphs: a selection's + /// ground, and its ink when `fg` is given. + pub fn tint(s: *Surface, x: u16, y: u16, n: u16, bg: [3]u8, fg: ?[3]u8) void { + for (x..x + n) |col| { + const cell = s.at(@intCast(col), y); + cell.default = false; + cell.style.bg = .{ .rgb = bg }; + if (fg) |ink| cell.style.fg = .{ .rgb = ink }; + } + } + pub fn clearRect(s: *Surface, x: u16, y: u16, w: u16, h: u16) void { var yy = y; while (yy < y + h) : (yy += 1) { @@ -683,66 +696,12 @@ test "surface print keeps combining and wide graphemes in their display cells" { } test "the ASCII fast path in surface print paints what the general arm paints" { + // The general arm alone, every grapheme through it. const ref = struct { fn print(s: *Surface, x: u16, y: u16, w: u16, text: []const u8, style: CellStyle) u16 { var col = x; - const end = x + w; var i: usize = 0; - while (i < text.len) { - if (col >= end) break; - const n = std.unicode.utf8ByteSequenceLength(text[i]) catch 0; - const decoded: ?u21 = if (n > 0 and i + n <= text.len) - (std.unicode.utf8Decode(text[i .. i + n]) catch null) - else - null; - var cp_slice: []const u8 = "\u{FFFD}"; - var consumed: usize = 1; - if (decoded != null) { - var git = uucode.grapheme.utf8Iterator(text[i..]); - if (git.nextGrapheme()) |g| { - const candidate = text[i .. i + g.end]; - if (std.unicode.utf8ValidateSlice(candidate)) { - cp_slice = candidate; - consumed = candidate.len; - } else { - cp_slice = text[i .. i + n]; - consumed = n; - } - } - } - i += consumed; - var cp = decoded orelse 0xFFFD; - if (cp == '\r') continue; - if (cp == '\t') { - const spaces = @min(config.tab_now, end - col); - s.fill(col, y, spaces, 1, style); - col += spaces; - continue; - } - if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) { - cp = 0xFFFD; - cp_slice = "\u{FFFD}"; - } - const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1)) - 1 - else - @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode)); - if (width == 2 and col + 1 >= end) break; - var shown = cp_slice; - if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) { - const cap = @typeInfo(@FieldType(Cell, "text")).array.len; - var prefix: usize = 0; - while (prefix < shown.len) { - const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break; - if (prefix + cp_len > cap) break; - prefix += cp_len; - } - shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}"; - } - s.set(col, y, shown, style); - if (width == 2 and col + 1 < end) s.set(col + 1, y, "", style); - col += width; - } + while (i < text.len and col < x + w) col = s.printGeneral(col, x + w, y, text, &i, style) orelse break; return col; } }.print; diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index b8e6bb61..346bb898 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -756,20 +756,20 @@ |29: 0-3 d,#1e1e1e, 4-99 #858585,#1e1e1e, |30: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e, == snap tail grid=100x31 cursor=7,29 -|17: 327 Theme wolf_alabaster_dark -|18: 328 Theme wolf_alabaster_dark_bg -|19: 329 Theme wolf_alabaster_dark_mono -|20: 330 Theme wolf_alabaster_light -|21: 331 Theme wolf_alabaster_light_bg -|22: 332 Theme wolf_alabaster_light_mono -|23: 333 Theme yellowed -|24: 334 Theme yo -|25: 335 Theme yo_berry -|26: 336 Theme yo_light -|27: 337 Theme zed_onedark -|28: 338 Theme zed_onelight -|29: 339 Theme zenburn -|30: 340 +|17: 305 Theme wolf_alabaster_dark +|18: 306 Theme wolf_alabaster_dark_bg +|19: 307 Theme wolf_alabaster_dark_mono +|20: 308 Theme wolf_alabaster_light +|21: 309 Theme wolf_alabaster_light_bg +|22: 310 Theme wolf_alabaster_light_mono +|23: 311 Theme yellowed +|24: 312 Theme yo +|25: 313 Theme yo_berry +|26: 314 Theme yo_light +|27: 315 Theme zed_onedark +|28: 316 Theme zed_onelight +|29: 317 Theme zenburn +|30: 318 == snap picked grid=100x31 cursor=7,3 |16: 14 line 14 |17: 15 line 15 diff --git a/tools/gen_themes.zig b/tools/gen_themes.zig index be5fde2f..30808dfe 100644 --- a/tools/gen_themes.zig +++ b/tools/gen_themes.zig @@ -11,9 +11,10 @@ //! //! Why vendored and not read out of ~/05-genizah: `zig build` must work on a //! fresh clone with no network and no helix checkout. It is the WHOLE of what -//! both projects ship — helix's 214 runtime themes and zed's three families, -//! 1.5MB of text — because "which ones are worth having" is not a question a -//! build tool gets to answer on the user's behalf. +//! both projects ship — helix's runtime themes and zed's three families — +//! because "which ones are worth having" is not a question a build tool gets +//! to answer on the user's behalf. The one exception is helix's copy of a +//! theme pardes ports by hand (src/themes/: dracula, nord, ...): not vendored. //! //! NAMES. A helix theme is its file stem; a zed variant is its `name` slugged //! with `_zed` on the end. Both projects ship gruvbox, ayu and one, so the @@ -21,7 +22,10 @@ //! variant is one rule instead of eight exceptions — it also keeps a name from //! moving when the other source gains or loses a file. helix's own `acme.toml` //! is vendored as `acme_helix.toml` for the same reason, since pardes ships an -//! acme of its own; the file is otherwise untouched. Two themes answering to +//! acme of its own; the file is otherwise untouched. So are `monokai`, +//! `ayu_dark` and `nord` as `_helix.toml`, kept (unlike helix's other +//! copies of themes ported here) because helix themes inherit them; those +//! `inherits` lines name the renamed file. Two themes answering to //! one name is a bug (`Theme ` would silently pick one), so src/colors.zig //! asserts the ring's names are distinct at comptime. //! @@ -29,7 +33,7 @@ //! helix-editor/helix runtime/themes, each file keeping its author's header); //! *.json are zed's (zed-industries/zed assets/themes). The licences sit beside //! them as `.LICENSE` — `helix.LICENSE` covering the runtime set, one per -//! zed family, plus the twenty-two helix keeps in `runtime/themes/licenses/` +//! zed family, plus the twenty-one helix keeps in `runtime/themes/licenses/` //! for the themes it took from somewhere else (their names group by SOURCE, not //! by file: `everforest.LICENSE` covers both everforest themes). build.zig's //! directory read skips anything that is not a .toml or a .json, which is what diff --git a/vendor/themes/ayu_dark.toml b/vendor/themes/ayu_dark.toml deleted file mode 100644 index a2fbc316..00000000 --- a/vendor/themes/ayu_dark.toml +++ /dev/null @@ -1,92 +0,0 @@ -# Author: André Sá -# Based on the AYU theme colors from https://github.com/dempfi/ayu - -# Syntax highlighting -"type" = "blue" -"type.builtin" = "blue" -"constructor" = "green" -"constant" = "magenta" -"string" = "green" -"string.regexp" = "orange" -"string.special" = "yellow" -"comment" = { fg = "gray", modifiers = ["italic"] } -"variable" = "foreground" -"label" = "orange" -"punctuation" = "foreground" -"keyword" = "orange" -"keyword.control" = "yellow" -"keyword.directive" = "yellow" -"operator" = "orange" -"function" = "yellow" -"tag" = "blue" -"namespace" = "blue" -"markup.heading" = "orange" -"markup.list" = "yellow" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.raw.block" = "orange" -"markup.link.url" = "blue" -"markup.link.text" = "yellow" -"markup.link.label" = "green" -"markup.quote" = "yellow" -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# Interface -"ui.background"= { bg = "background" } -"ui.cursor" = { fg = "dark_gray", bg = "yellow" } -"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" } -"ui.cursor.match" = "orange" -"ui.linenr" = "dark_gray" -"ui.linenr.selected" = "gray" -"ui.statusline" = { fg = "foreground", bg = "black" } -"ui.statusline.normal" = { fg = "black", bg = "blue" } -"ui.statusline.insert" = { fg = "black", bg = "orange" } -"ui.statusline.select" = { fg = "black", bg = "magenta" } -"ui.cursorline" = { bg = "black" } -"ui.popup" = { fg = "#7B91b3", bg = "black" } -"ui.window" = "dark_gray" -"ui.help" = { fg = "#7B91b3", bg = "black" } -"ui.text" = "foreground" -"ui.text.focus" = { bg = "dark_gray", fg = "foreground" } -"ui.text.info" = "foreground" -"ui.virtual.whitespace" = "dark_gray" -"ui.virtual.ruler" = { bg = "black" } -"ui.virtual.inlay-hint" = { fg = "#e6b450", bg = "#302a20" } # original bg #e6b45033 -"ui.menu" = { fg = "foreground", bg = "black" } -"ui.menu.selected" = { bg = "gray", fg = "background" } -"ui.selection" = { bg = "dark_gray" } -"warning" = "yellow" -"error" = { fg = "red", modifiers = ["bold"] } -"info" = { fg = "blue", modifiers = ["bold"] } -"hint" = { fg = "blue", modifiers = ["bold"] } -"diagnostic.hint" = { underline = { color = "blue", style="curl"} } -"diagnostic.info"= { underline = { color = "blue", style="curl"} } -"diagnostic.warning"= { underline = { color = "yellow", style="curl"} } -"diagnostic.error"= { underline = { color = "red", style="curl"} } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } -"ui.bufferline" = { fg = "gray", bg = "background" } -"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" } -"ui.debug" = { fg = "orange", bg = "background" } -"ui.highlight.frameline" = { bg = "#0067a3" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] } - -"special" = "orange" - -[palette] -background = "#0f1419" -foreground = "#bfbdb6" - -black = "#131721" -blue = "#59c2ff" -dark_gray = "#2d3640" -cyan = "#73b8ff" -gray = "#5c6773" -green = "#aad94c" -magenta = "#d2a6ff" -orange = "#ff8f40" -red = "#f07178" -yellow = "#e6b450" diff --git a/vendor/themes/ayu_dark_helix.toml b/vendor/themes/ayu_dark_helix.toml new file mode 100644 index 00000000..a2fbc316 --- /dev/null +++ b/vendor/themes/ayu_dark_helix.toml @@ -0,0 +1,92 @@ +# Author: André Sá +# Based on the AYU theme colors from https://github.com/dempfi/ayu + +# Syntax highlighting +"type" = "blue" +"type.builtin" = "blue" +"constructor" = "green" +"constant" = "magenta" +"string" = "green" +"string.regexp" = "orange" +"string.special" = "yellow" +"comment" = { fg = "gray", modifiers = ["italic"] } +"variable" = "foreground" +"label" = "orange" +"punctuation" = "foreground" +"keyword" = "orange" +"keyword.control" = "yellow" +"keyword.directive" = "yellow" +"operator" = "orange" +"function" = "yellow" +"tag" = "blue" +"namespace" = "blue" +"markup.heading" = "orange" +"markup.list" = "yellow" +"markup.bold" = { fg = "orange", modifiers = ["bold"] } +"markup.italic" = { fg = "orange", modifiers = ["italic"] } +"markup.strikethrough" = { modifiers = ["crossed_out"] } +"markup.raw.block" = "orange" +"markup.link.url" = "blue" +"markup.link.text" = "yellow" +"markup.link.label" = "green" +"markup.quote" = "yellow" +"diff.plus" = "green" +"diff.minus" = "red" +"diff.delta" = "yellow" + +# Interface +"ui.background"= { bg = "background" } +"ui.cursor" = { fg = "dark_gray", bg = "yellow" } +"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" } +"ui.cursor.match" = "orange" +"ui.linenr" = "dark_gray" +"ui.linenr.selected" = "gray" +"ui.statusline" = { fg = "foreground", bg = "black" } +"ui.statusline.normal" = { fg = "black", bg = "blue" } +"ui.statusline.insert" = { fg = "black", bg = "orange" } +"ui.statusline.select" = { fg = "black", bg = "magenta" } +"ui.cursorline" = { bg = "black" } +"ui.popup" = { fg = "#7B91b3", bg = "black" } +"ui.window" = "dark_gray" +"ui.help" = { fg = "#7B91b3", bg = "black" } +"ui.text" = "foreground" +"ui.text.focus" = { bg = "dark_gray", fg = "foreground" } +"ui.text.info" = "foreground" +"ui.virtual.whitespace" = "dark_gray" +"ui.virtual.ruler" = { bg = "black" } +"ui.virtual.inlay-hint" = { fg = "#e6b450", bg = "#302a20" } # original bg #e6b45033 +"ui.menu" = { fg = "foreground", bg = "black" } +"ui.menu.selected" = { bg = "gray", fg = "background" } +"ui.selection" = { bg = "dark_gray" } +"warning" = "yellow" +"error" = { fg = "red", modifiers = ["bold"] } +"info" = { fg = "blue", modifiers = ["bold"] } +"hint" = { fg = "blue", modifiers = ["bold"] } +"diagnostic.hint" = { underline = { color = "blue", style="curl"} } +"diagnostic.info"= { underline = { color = "blue", style="curl"} } +"diagnostic.warning"= { underline = { color = "yellow", style="curl"} } +"diagnostic.error"= { underline = { color = "red", style="curl"} } +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } +"ui.bufferline" = { fg = "gray", bg = "background" } +"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" } +"ui.debug" = { fg = "orange", bg = "background" } +"ui.highlight.frameline" = { bg = "#0067a3" } +"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] } + +"special" = "orange" + +[palette] +background = "#0f1419" +foreground = "#bfbdb6" + +black = "#131721" +blue = "#59c2ff" +dark_gray = "#2d3640" +cyan = "#73b8ff" +gray = "#5c6773" +green = "#aad94c" +magenta = "#d2a6ff" +orange = "#ff8f40" +red = "#f07178" +yellow = "#e6b450" diff --git a/vendor/themes/ayu_evolve.toml b/vendor/themes/ayu_evolve.toml index b9c5d822..7a1b1728 100644 --- a/vendor/themes/ayu_evolve.toml +++ b/vendor/themes/ayu_evolve.toml @@ -1,4 +1,4 @@ -inherits = 'ayu_dark' +inherits = 'ayu_dark_helix' "keyword.control" = "orange" "keyword.storage" = "yellow" diff --git a/vendor/themes/ayu_light.toml b/vendor/themes/ayu_light.toml deleted file mode 100644 index c3ab1d4f..00000000 --- a/vendor/themes/ayu_light.toml +++ /dev/null @@ -1,94 +0,0 @@ -# Author: André Sá -# Based on the AYU theme colors from https://github.com/dempfi/ayu - -# Syntax highlighting -"type" = "blue" -"type.builtin" = "blue" -"constructor" = "green" -"constant" = "magenta" -"string" = "green" -"string.regexp" = "orange" -"string.special" = "yellow" -"comment" = { fg = "gray", modifiers = ["italic"] } -"variable" = "foreground" -"label" = "orange" -"punctuation" = "foreground" -"keyword" = "orange" -"keyword.control" = "yellow" -"keyword.directive" = "yellow" -"operator" = "orange" -"function" = "yellow" -"tag" = "blue" -"namespace" = "blue" -"markup.heading" = "orange" -"markup.list" = "yellow" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.raw.block" = "orange" -"markup.link.url" = { fg = "blue", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.link.label" = "green" -"markup.quote" = "yellow" -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# Interface -"ui.background"= { bg = "background" } -"ui.cursor" = { fg = "dark_gray", bg = "yellow" } -"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" } -"ui.cursor.match" = "orange" -"ui.linenr" = "dark_gray" -"ui.linenr.selected" = "gray" -"ui.statusline" = { fg = "foreground", bg = "black" } -"ui.statusline.normal" = { fg = "black", bg = "blue" } -"ui.statusline.insert" = { fg = "black", bg = "orange" } -"ui.statusline.select" = { fg = "black", bg = "magenta" } -"ui.cursorline" = { bg = "black" } -"ui.popup" = { fg = "#7B91b3", bg = "black" } -"ui.window" = "dark_gray" -"ui.help" = { fg = "#7B91b3", bg = "black" } -"ui.text" = "foreground" -"ui.text.focus" = { bg = "dark_gray", fg = "foreground" } -"ui.text.info" = "foreground" -"ui.virtual.whitespace" = "dark_gray" -"ui.virtual.ruler" = { bg = "black" } -"ui.virtual.inlay-hint" = { fg = "#f4a028", bg = "#fcf2e3" } # bg original #ffaa3333 -"ui.menu" = { fg = "foreground", bg = "black" } -"ui.menu.selected" = { bg = "gray", fg = "background" } -"ui.selection" = { bg = "dark_gray" } -"warning" = "yellow" -"error" = { fg = "red", modifiers = ["bold"] } -"info" = { fg = "blue", modifiers = ["bold"] } -"hint" = { fg = "blue", modifiers = ["bold"] } -"diagnostic.hint"= { underline = { color = "blue", style = "curl" } } -"diagnostic.info"= { underline = { color = "blue", style = "curl" } } -"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } } -"diagnostic.error"= { underline = { color = "red", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } -"ui.bufferline" = { fg = "gray", bg = "background" } -"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" } -"ui.debug" = { fg = "orange", bg = "background" } -"ui.highlight.frameline" = { bg = "#cfe0f2" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] } - -"special" = "orange" - -[palette] -background = "#fafafa" -foreground = "#5c6166" - -black = "#e7eaed" -white = "#fcfcfc" -blue = "#399ee6" -light_blue = "#55b4d4" -cyan = "#478acc" -dark_gray = "#d8d8d7" -gray = "#828c9a" -green = "#86b300" -magenta = "#a37acc" -orange = "#fa8d3e" -red = "#f07171" -yellow = "#ffaa33" diff --git a/vendor/themes/ayu_mirage.toml b/vendor/themes/ayu_mirage.toml deleted file mode 100644 index 0fd53a4b..00000000 --- a/vendor/themes/ayu_mirage.toml +++ /dev/null @@ -1,92 +0,0 @@ -# Author: André Sá -# Based on the AYU theme colors from https://github.com/dempfi/ayu - -# Syntax highlighting -"type" = "blue" -"type.builtin" = "blue" -"constructor" = "green" -"constant" = "magenta" -"string" = "green" -"string.regexp" = "orange" -"string.special" = "yellow" -"comment" = { fg = "gray", modifiers = ["italic"] } -"variable" = "foreground" -"label" = "orange" -"punctuation" = "foreground" -"keyword" = "orange" -"keyword.control" = "yellow" -"keyword.directive" = "yellow" -"operator" = "orange" -"function" = "yellow" -"tag" = "blue" -"namespace" = "blue" -"markup.heading" = "orange" -"markup.list" = "yellow" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.raw.block" = "orange" -"markup.link.url" = "blue" -"markup.link.text" = "yellow" -"markup.link.label" = "green" -"markup.quote" = "yellow" -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# Interface -"ui.background"= { bg = "background" } -"ui.cursor" = { fg = "dark_gray", bg = "yellow" } -"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" } -"ui.cursor.match" = "orange" -"ui.linenr" = "dark_gray" -"ui.linenr.selected" = "gray" -"ui.statusline" = { fg = "foreground", bg = "black" } -"ui.statusline.normal" = { fg = "black", bg = "blue" } -"ui.statusline.insert" = { fg = "black", bg = "orange" } -"ui.statusline.select" = { fg = "black", bg = "magenta" } -"ui.cursorline" = { bg = "black" } -"ui.popup" = { fg = "#7B91b3", bg = "black" } -"ui.window" = "dark_gray" -"ui.help" = { fg = "#7B91b3", bg = "black" } -"ui.text" = "foreground" -"ui.text.focus" = { bg = "dark_gray", fg = "foreground" } -"ui.text.info" = "foreground" -"ui.virtual.whitespace" = "dark_gray" -"ui.virtual.ruler" = { bg = "black" } -"ui.virtual.inlay-hint" = { fg = "#ffcc66", bg = "#47433d" } # original bg #ffcc6633 -"ui.menu" = { fg = "foreground", bg = "black" } -"ui.menu.selected" = { bg = "gray", fg = "background" } -"ui.selection" = { bg = "dark_gray" } -"warning" = "yellow" -"error" = { fg = "red", modifiers = ["bold"] } -"info" = { fg = "blue", modifiers = ["bold"] } -"hint" = { fg = "blue", modifiers = ["bold"] } -"diagnostic.hint"= { underline = { color = "blue", style = "curl" } } -"diagnostic.info"= { underline = { color = "blue", style = "curl" } } -"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } } -"diagnostic.error"= { underline = { color = "red", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } -"ui.bufferline" = { fg = "gray", bg = "background" } -"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" } -"ui.debug" = { fg = "orange", bg = "background" } -"ui.highlight.frameline" = { bg = "#0067a3" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] } - -"special" = "orange" - -[palette] -background = "#1f2430" -foreground = "#cccac2" - -black = "#1a1f29" -blue = "#73d0ff" -dark_gray = "#323843" -cyan = "#444b55" -gray = "#565b66" -green = "#d5ff80" -magenta = "#dfbfff" -orange = "#ffad66" -red = "#f28779" -yellow = "#ffcc77" diff --git a/vendor/themes/catppuccin_frappe.toml b/vendor/themes/catppuccin_frappe.toml deleted file mode 100644 index 232e19c3..00000000 --- a/vendor/themes/catppuccin_frappe.toml +++ /dev/null @@ -1,35 +0,0 @@ -inherits = "catppuccin_mocha" - -[palette] -rosewater = "#f2d5cf" -flamingo = "#eebebe" -pink = "#f4b8e4" -mauve = "#ca9ee6" -red = "#e78284" -maroon = "#ea999c" -peach = "#ef9f76" -yellow = "#e5c890" -green = "#a6d189" -teal = "#81c8be" -sky = "#99d1db" -sapphire = "#85c1dc" -blue = "#8caaee" -lavender = "#babbf1" -text = "#c6d0f5" -subtext1 = "#b5bfe2" -subtext0 = "#a5adce" -overlay2 = "#949cbb" -overlay1 = "#838ba7" -overlay0 = "#737994" -surface2 = "#626880" -surface1 = "#51576d" -surface0 = "#414559" -base = "#303446" -mantle = "#292c3c" -crust = "#232634" - -cursorline = "#3b3f52" -secondary_cursor = "#b8a5a6" -secondary_cursor_select = "#9192be" -secondary_cursor_normal = "#b8a5a6" -secondary_cursor_insert = "#83a275" diff --git a/vendor/themes/catppuccin_latte.toml b/vendor/themes/catppuccin_latte.toml deleted file mode 100644 index be47423d..00000000 --- a/vendor/themes/catppuccin_latte.toml +++ /dev/null @@ -1,35 +0,0 @@ -inherits = "catppuccin_mocha" - -[palette] -rosewater = "#dc8a78" -flamingo = "#dd7878" -pink = "#ea76cb" -mauve = "#8839ef" -red = "#d20f39" -maroon = "#e64553" -peach = "#fe640b" -yellow = "#df8e1d" -green = "#40a02b" -teal = "#179299" -sky = "#04a5e5" -sapphire = "#209fb5" -blue = "#1e66f5" -lavender = "#7287fd" -text = "#4c4f69" -subtext1 = "#5c5f77" -subtext0 = "#6c6f85" -overlay2 = "#7c7f93" -overlay1 = "#8c8fa1" -overlay0 = "#9ca0b0" -surface2 = "#acb0be" -surface1 = "#bcc0cc" -surface0 = "#ccd0da" -base = "#eff1f5" -mantle = "#e6e9ef" -crust = "#dce0e8" - -cursorline = "#e8ecf1" -secondary_cursor = "#e1a99d" -secondary_cursor_select = "#97a7fb" -secondary_cursor_normal = "#e1a99d" -secondary_cursor_insert = "#74b867" diff --git a/vendor/themes/catppuccin_macchiato.toml b/vendor/themes/catppuccin_macchiato.toml deleted file mode 100644 index 4f3f49cf..00000000 --- a/vendor/themes/catppuccin_macchiato.toml +++ /dev/null @@ -1,35 +0,0 @@ -inherits = "catppuccin_mocha" - -[palette] -rosewater = "#f4dbd6" -flamingo = "#f0c6c6" -pink = "#f5bde6" -mauve = "#c6a0f6" -red = "#ed8796" -maroon = "#ee99a0" -peach = "#f5a97f" -yellow = "#eed49f" -green = "#a6da95" -teal = "#8bd5ca" -sky = "#91d7e3" -sapphire = "#7dc4e4" -blue = "#8aadf4" -lavender = "#b7bdf8" -text = "#cad3f5" -subtext1 = "#b8c0e0" -subtext0 = "#a5adcb" -overlay2 = "#939ab7" -overlay1 = "#8087a2" -overlay0 = "#6e738d" -surface2 = "#5b6078" -surface1 = "#494d64" -surface0 = "#363a4f" -base = "#24273a" -mantle = "#1e2030" -crust = "#181926" - -cursorline = "#303347" -secondary_cursor = "#b6a6a7" -secondary_cursor_select = "#8b91bf" -secondary_cursor_normal = "#b6a6a7" -secondary_cursor_insert = "#80a57a" diff --git a/vendor/themes/catppuccin_mocha.toml b/vendor/themes/catppuccin_mocha.toml deleted file mode 100644 index e4cbea7f..00000000 --- a/vendor/themes/catppuccin_mocha.toml +++ /dev/null @@ -1,168 +0,0 @@ -# NOTE: For contributors looking to modify the theme, please submit a pull request at https://github.com/catppuccin/helix instead of updating this file. Changes are frequently synchronized from the catppuccin/helix theme repository. -# Syntax highlighting -# ------------------- -"attribute" = "yellow" - -"type" = "yellow" -"type.builtin" = "mauve" -"type.enum.variant" = "teal" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "pink" -"string.special" = "blue" -"string.special.symbol" = "red" - -"comment" = { fg = "overlay2", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "blue" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" -"punctuation.special" = "sky" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.macro" = "rosewater" - -"tag" = "blue" - -"namespace" = { fg = "yellow", modifiers = ["italic"] } - -"special" = "blue" # fuzzy highlight - -"markup.heading.1" = "red" -"markup.heading.2" = "peach" -"markup.heading.3" = "yellow" -"markup.heading.4" = "green" -"markup.heading.5" = "sapphire" -"markup.heading.6" = "lavender" -"markup.list" = "teal" -"markup.list.unchecked" = "overlay2" -"markup.list.checked" = "green" -"markup.bold" = { fg = "red", modifiers = ["bold"] } -"markup.italic" = { fg = "red", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "blue", modifiers = ["italic", "underlined"] } -"markup.link.text" = "lavender" -"markup.link.label" = "sapphire" -"markup.raw" = "green" -"markup.quote" = "pink" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "blue" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"ui.statusline" = { fg = "subtext1", bg = "mantle" } -"ui.statusline.inactive" = { fg = "surface2", bg = "mantle" } -"ui.statusline.normal" = { fg = "base", bg = "rosewater", modifiers = ["bold"] } -"ui.statusline.insert" = { fg = "base", bg = "green", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "base", bg = "lavender", modifiers = ["bold"] } - -"ui.popup" = { fg = "text", bg = "surface0" } -"ui.window" = { fg = "crust" } -"ui.help" = { fg = "overlay2", bg = "surface0" } - -"ui.bufferline" = { fg = "subtext0", bg = "mantle" } -"ui.bufferline.active" = { fg = "mauve", bg = "base", underline = { color = "mauve", style = "line" } } -"ui.bufferline.background" = { bg = "crust" } - -"ui.text" = "text" -"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } -"ui.text.inactive" = { fg = "overlay1" } -"ui.text.directory" = { fg = "blue" } - -"ui.virtual" = "overlay0" -"ui.virtual.ruler" = { bg = "surface0" } -"ui.virtual.indent-guide" = "surface0" -"ui.virtual.inlay-hint" = { fg = "surface1", bg = "mantle" } -"ui.virtual.jump-label" = { fg = "rosewater", modifiers = ["bold"] } - -"ui.selection" = { bg = "surface1" } - -"ui.cursor" = { fg = "base", bg = "secondary_cursor" } -"ui.cursor.primary" = { fg = "base", bg = "rosewater" } -"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] } - -"ui.cursor.primary.normal" = { fg = "base", bg = "rosewater" } -"ui.cursor.primary.insert" = { fg = "base", bg = "green" } -"ui.cursor.primary.select" = { fg = "base", bg = "lavender" } - -"ui.cursor.normal" = { fg = "base", bg = "secondary_cursor_normal" } -"ui.cursor.insert" = { fg = "base", bg = "secondary_cursor_insert" } -"ui.cursor.select" = { fg = "base", bg = "secondary_cursor_select" } - -"ui.cursorline.primary" = { bg = "cursorline" } - -"ui.highlight" = { bg = "surface1", modifiers = ["bold"] } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } -"diagnostic.info" = { underline = { color = "sky", style = "curl" } } -"diagnostic.hint" = { underline = { color = "teal", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -error = "red" -warning = "yellow" -info = "sky" -hint = "teal" - -rainbow = ["red", "peach", "yellow", "green", "sapphire", "lavender"] - -[palette] -rosewater = "#f5e0dc" -flamingo = "#f2cdcd" -pink = "#f5c2e7" -mauve = "#cba6f7" -red = "#f38ba8" -maroon = "#eba0ac" -peach = "#fab387" -yellow = "#f9e2af" -green = "#a6e3a1" -teal = "#94e2d5" -sky = "#89dceb" -sapphire = "#74c7ec" -blue = "#89b4fa" -lavender = "#b4befe" -text = "#cdd6f4" -subtext1 = "#bac2de" -subtext0 = "#a6adc8" -overlay2 = "#9399b2" -overlay1 = "#7f849c" -overlay0 = "#6c7086" -surface2 = "#585b70" -surface1 = "#45475a" -surface0 = "#313244" -base = "#1e1e2e" -mantle = "#181825" -crust = "#11111b" - -cursorline = "#2a2b3c" -secondary_cursor = "#b5a6a8" -secondary_cursor_select = "#878ec0" -secondary_cursor_normal = "#b5a6a8" -secondary_cursor_insert = "#7ea87f" diff --git a/vendor/themes/dark_plus.toml b/vendor/themes/dark_plus.toml deleted file mode 100644 index fcb25e77..00000000 --- a/vendor/themes/dark_plus.toml +++ /dev/null @@ -1,138 +0,0 @@ -# Author: David Else <12832280+David-Else@users.noreply.github.com> - -# SYNTAX -"attribute" = "variable" -"comment" = "dark_green" -"constant" = "constant" -"constant.builtin" = "blue2" -"constant.character" = "orange" -"constant.character.escape" = "gold" -"constant.numeric" = "pale_green" -"constructor" = "type" -"diff.delta" = "blue4" -"diff.minus" = "orange_red" -"diff.plus" = "dark_green2" -"function" = "fn_declaration" -"function.builtin" = "fn_declaration" -"function.macro" = "blue2" -"keyword" = "blue2" -"keyword.control" = "special" -"keyword.directive" = "special" -"label" = "blue2" -"module" = "type" -"namespace" = "type" -"operator" = "text" -"punctuation" = "text" -"punctuation.delimiter" = "text" -"special" = "light_blue" -"string" = "orange" -"string.regexp" = "gold" -"tag" = "blue2" -"type" = "type" -"type.builtin" = "type" -"type.enum.variant" = "constant" -"variable" = "variable" -"variable.mutable" = { fg = "variable", underline.style= "line" } -"variable.builtin" = "blue2" -"variable.builtin.mutable" = { fg = "blue2", underline.style= "line" } -"variable.other.member" = "variable" -"variable.parameter" = "variable" -"variable.parameter.mutable" = { fg = "variable", underline.style= "line" } - -# MARKUP -"markup.heading" = { fg = "blue2", modifiers = ["bold"] } -"markup.list" = "blue3" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { underline.style= "line" } -"markup.link.text" = "orange" -"markup.quote" = "dark_green" -"markup.raw" = "orange" - -# UI -"ui.background" = { fg = "light_gray", bg = "dark_gray2" } -"ui.window" = { bg = "widget" } -"ui.popup" = { fg = "text", bg = "widget" } -"ui.help" = { fg = "text", bg = "widget" } -"ui.menu" = { fg = "text", bg = "widget" } -"ui.menu.selected" = { bg = "dark_blue2" } -# TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`. -"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.match" = { bg = "#3a3d41", underline.style = "line" } -"ui.selection" = { bg = "#3a3d41" } -"ui.selection.primary" = { bg = "dark_blue" } -"ui.linenr" = { fg = "dark_gray" } -"ui.linenr.selected" = { fg = "light_gray2" } -"ui.cursorline.primary" = { bg = "dark_gray3" } -"ui.statusline" = { fg = "white", bg = "blue" } -"ui.statusline.inactive" = { fg = "white", bg = "widget" } -"ui.statusline.insert" = { fg = "white", bg = "yellow" } -"ui.statusline.select" = { fg = "white", bg = "magenta" } -"ui.bufferline" = { fg = "text", bg = "widget" } -"ui.bufferline.active" = { fg = "white", bg = "blue" } -"ui.bufferline.background" = { bg = "background" } -"ui.text" = { fg = "text" } -"ui.text.focus" = { fg = "white" } -"ui.text.directory" = { fg = "blue2" } -"ui.text.inactive" = { fg = "dark_gray" } -"ui.virtual.whitespace" = { fg = "#3e3e3d" } -"ui.virtual.wrap" = { fg = "#3e3e3d" } -"ui.virtual.ruler" = { bg = "borders" } -"ui.virtual.indent-guide" = { fg = "dark_gray4" } -"ui.virtual.inlay-hint" = { fg = "dark_gray5"} -"ui.virtual.jump-label" = { fg = "yellow", modifiers = ["bold"] } -"ui.highlight.frameline" = { bg = "#4b4b18" } -"ui.debug.active" = { fg = "#ffcc00" } -"ui.debug.breakpoint" = { fg = "#e51400" } -"ui.picker.header.column" = { underline.style = "line" } -"ui.picker.header.column.active" = { fg ="white", underline.style = "line" } -"warning" = { fg = "gold2" } -"error" = { fg = "red" } -"info" = { fg = "light_blue" } -"hint" = { fg = "light_gray3" } -"diagnostic.error".underline = { color = "red", style = "curl" } -"diagnostic".underline = { color = "gold", style = "curl" } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -rainbow = ["#FFD700", "#DA70D6", "#179FFF"] - -[palette] -white = "#ffffff" -orange = "#ce9178" -gold = "#d7ba7d" -gold2 = "#cca700" -pale_green = "#b5cea8" -dark_green = "#6A9955" -dark_green2 = "#487e02" -light_gray = "#d4d4d4" -light_gray2 = "#c6c6c6" -light_gray3 = "#eeeeee" -dark_gray = "#858585" -dark_gray2 = "#1e1e1e" -dark_gray3 = "#282828" -dark_gray4 = "#404040" -dark_gray5 = "#8b949e" -blue = "#007acc" -blue2 = "#569CD6" -blue3 = "#6796E6" -blue4 = "#1b81a8" -light_blue = "#75beff" -dark_blue = "#264f78" -dark_blue2 = "#094771" -red = "#ff1212" -orange_red = "#f14c4c" - -type = "#4EC9B0" -special = "#C586C0" -variable = "#9CDCFE" -fn_declaration = "#DCDCAA" -constant = "#4FC1FF" - -background = "#1e1e1e" -text = "#d4d4d4" -cursor = "#a6a6a6" -widget = "#252526" -borders = "#323232" diff --git a/vendor/themes/doom-one.LICENSE b/vendor/themes/doom-one.LICENSE deleted file mode 100644 index 1d0112f1..00000000 --- a/vendor/themes/doom-one.LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -MIT License - -Copyright (c) 2025 NTBBloodbath - -This theme has been ported by spentbliss . - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/themes/doom-one.toml b/vendor/themes/doom-one.toml deleted file mode 100644 index 60dbd874..00000000 --- a/vendor/themes/doom-one.toml +++ /dev/null @@ -1,127 +0,0 @@ -# Author: spentbliss -# License: MIT (originally by NTBBloodbath) - -"ui.background" = { bg = "bg", fg = "fg" } -"ui.text" = "fg" -"ui.text.focus" = { bg = "bg_highlight", fg = "cyan" } -"ui.cursor" = { bg = "cyan", fg = "bg" } -"ui.linenr" = "grey" -"ui.linenr.selected" = "yellow" -"ui.statusline" = { fg = "blue" } -"ui.selection" = { bg = "bg_highlight" } -"ui.selection.primary" = { bg = "bg_highlight" } -"ui.virtual.ruler" = { bg = "bg_highlight" } -"ui.virtual.jump-label" = { fg = "cyan", modifiers = ["bold"] } - -# Markdown Highlighting -"markup.raw" = { fg = "blue", bg = "bg" } -"markup.raw.inline" = { fg = "orange" } -"markup.heading.1" = { fg = "#E99BEA", bg = "#4F4258"} -"markup.heading.2" = { fg = "#51AFEF", bg = "#2F4456" } -"markup.heading.3" = { fg = "#A9A1E1", bg = "#3F4153" } -"markup.heading.4" = { fg = "#98BE65", bg = "#3C453D" } -"markup.heading.5" = { fg = "#ECBE7B", bg = "#4B4641" } -"markup.heading.6" = { fg = "#DA8549", bg = "#483C39" } -"markup.list" = { fg = "magenta" } -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange" } -"markup.strikethrough" = { fg = "red", modifiers = ["crossed_out"] } -"markup.link" = { fg = "cyan" } -"markup.quote" = { fg = "fg" } - -# Syntax Highlighting for Code -"comment" = { fg = "grey" } -"comment.line" = { fg = "grey" } -"comment.block" = { fg = "grey" } -"comment.documentation" = { fg = "blue" } - -"keyword" = "blue" -"keyword.control" = "blue" -"keyword.operator" = "fg" -"keyword.function" = "blue" -"keyword.directive" = "green" -"keyword.storage" = "blue" - -"type" = "yellow" -"type.builtin" = "yellow" -"type.enum.variant" = "purple" - -"function" = "magenta" -"function.builtin" = "fg" -"function.method" = "fg" -"function.macro" = "purple" - -"variable" = "fg" -"variable.builtin" = "red" -"variable.parameter" = "fg" - -"string" = "green" -"string.special" = "green" - -"constant" = "orange" -"constant.builtin" = "orange" -"constant.numeric" = "orange" -"constant.character" = "orange" -"constant.boolean" = "orange" - -"attribute" = "magenta" -"operator" = "blue" -"tag" = { fg = "magenta", modifiers = ["bold"] } -"tag.special" = { fg = "orange", modifiers = ["bold"] } -"namespace" = "blue" -"macro" = "orange" -"label" = "red" - -# Interface specific -"ui.cursorline.primary" = { bg = "bg_highlight" } -"ui.cursorline.secondary" = { bg = "bg_alt" } -"ui.cursorcolumn.primary" = { bg = "bg_highlight" } -"ui.cursorcolumn.secondary" = { bg = "bg_alt" } -"ui.statusline.normal" = { fg = "bg", bg = "blue" } -"ui.statusline.insert" = { fg = "bg", bg = "green" } -"ui.statusline.select" = { fg = "bg", bg = "purple" } - -# Git changes indicator -"diff.plus" = "green" -"diff.plus.gutter" = "green" -"diff.minus" = "red" -"diff.minus.gutter" = "red" -"diff.delta" = "green" -"diff.delta.gutter" = "green" -"diff.delta.moved" = "orange" -"diff.delta.conflict" = "purple" - -# Diagnostic styles -"warning" = { fg = "yellow", modifiers = ["bold"] } -"error" = { fg = "red", modifiers = ["bold"] } -"info" = { fg = "cyan", modifiers = ["bold"] } -"hint" = { fg = "blue", modifiers = ["bold"] } -"diagnostic.error" = { fg = "red" } -"diagnostic.warning" = { fg = "yellow" } -"diagnostic.info" = { fg = "cyan" } -"diagnostic.hint" = { fg = "blue" } - -# Popups for documentation or file picker -"ui.popup" = { fg = "fg", bg = "bg" } -"ui.popup.info" = { fg = "fg", bg = "bg_alt" } -"ui.menu" = { fg = "fg", bg = "bg" } -"ui.menu.selected" = { fg = "cyan", bg = "bg_highlight" } - -# Additional overrides -"ui.virtual.whitespace" = "grey" -"ui.virtual.indent-guide" = { fg = "grey" } - -[palette] -bg = "#282C34" -fg = "#BBC2CF" -grey = "#5B6268" -blue = "#51AFEF" -green = "#98BE65" -cyan = "#46D9FF" -red = "#FF6C6B" -yellow = "#ECBE7B" -purple = "#A8A1E1" -magenta = "#C678DD" -orange = "#DA8548" -bg_alt = "#21242B" -bg_highlight = "#3C4048" diff --git a/vendor/themes/dracula.toml b/vendor/themes/dracula.toml deleted file mode 100644 index 8b4abe16..00000000 --- a/vendor/themes/dracula.toml +++ /dev/null @@ -1,159 +0,0 @@ -# Author : Sebastian Zivota -# Author : Chirikumbrah - -"annotation" = { fg = "foreground" } - -"attribute" = { fg = "green", modifiers = ["italic"] } - -"comment" = { fg = "comment" } -"comment.block" = { fg = "comment" } -"comment.block.documentation" = { fg = "comment" } -"comment.line" = { fg = "comment" } -"comment.line.documentation" = { fg = "comment" } - -"constant" = { fg = "purple" } -"constant.builtin" = { fg = "purple" } -"constant.builtin.boolean" = { fg = "purple" } -"constant.character" = { fg = "cyan" } -"constant.character.escape" = { fg = "pink" } -"constant.macro" = { fg = "purple" } -"constant.numeric" = { fg = "purple" } -"constructor" = { fg = "purple" } - -"definition" = { underline = { color = "cyan" } } - -"diagnostic" = { underline = { color = "orange", style = "curl" } } -"diagnostic.hint" = { underline = { color = "purple", style = "curl" } } -"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "cyan", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -"error" = { fg = "red" } -"hint" = { fg = "purple" } -"info" = { fg = "cyan" } -"warning" = { fg = "yellow" } - -"diff.delta" = { fg = "orange" } -"diff.minus" = { fg = "red" } -"diff.plus" = { fg = "green" } - -# d -"function" = { fg = "green" } -"function.builtin" = { fg = "green" } -"function.call" = { fg = "green" } -"function.macro" = { fg = "purple" } -"function.method" = { fg = "green" } - -"keyword" = { fg = "pink" } -"keyword.control.conditional" = { fg = "pink" } -"keyword.control.exception" = { fg = "purple" } -"keyword.control.import" = { fg = "pink" } -"keyword.control.repeat" = { fg = "pink" } -"keyword.directive" = { fg = "green" } -"keyword.function" = { fg = "pink" } -"keyword.operator" = { fg = "pink" } -"keyword.return" = { fg = "pink" } -"keyword.storage" = { fg = "pink" } -"keyword.storage.modifier" = { fg = "pink" } -"keyword.storage.type" = { fg = "cyan", modifiers = ["italic"] } - -"label" = { fg = "cyan" } - -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.heading" = { fg = "purple", modifiers = ["bold"] } -"markup.italic" = { fg = "yellow", modifiers = ["italic"] } -"markup.link.text" = { fg = "pink" } -"markup.link.url" = { fg = "cyan" } -"markup.list" = { fg = "cyan" } -"markup.quote" = { fg = "yellow", modifiers = ["italic"] } -"markup.raw" = { fg = "foreground" } -"markup.strikethrough" = { modifiers = ["crossed_out"] } - -"punctuation" = { fg = "foreground" } -"punctuation.bracket" = { fg = "foreground" } -"punctuation.delimiter" = { fg = "foreground" } -"punctuation.special" = { fg = "pink" } - -"special" = { fg = "pink" } - -"string" = { fg = "yellow" } -"string.regexp" = { fg = "red" } -"string.special" = { fg = "orange" } -"string.symbol" = { fg = "yellow" } - -"tag" = { fg = "pink" } -"tag.attribute" = { fg = "purple" } -"tag.delimiter" = { fg = "foreground" } - -"type" = { fg = "cyan", modifiers = ["italic"] } -"type.builtin" = { fg = "cyan" } -"type.enum.variant" = { fg = "foreground", modifiers = ["italic"] } - -"ui.background" = { fg = "foreground", bg = "background" } -"ui.cursor" = { fg = "background", bg = "purple", modifiers = ["dim"] } -"ui.cursor.insert" = { fg = "background", bg = "green", modifiers = ["dim"] } -"ui.cursor.match" = { fg = "foreground", bg = "grey" } -"ui.cursor.normal" = { fg = "background", bg = "purple", modifiers = ["dim"] } -"ui.cursor.primary.insert" = { fg = "background", bg = "green" } -"ui.cursor.primary.normal" = { fg = "background", bg = "purple" } -"ui.cursor.primary.select" = { fg = "background", bg = "cyan" } -"ui.cursor.select" = { fg = "background", bg = "cyan", modifiers = ["dim"] } -"ui.cursorline.primary" = { bg = "cursorline" } -"ui.debug" = { fg = "red" } -"ui.help" = { fg = "foreground", bg = "black" } -"ui.highlight.frameline" = { fg = "background", bg = "red" } -"ui.linenr" = { fg = "comment" } -"ui.linenr.selected" = { fg = "foreground" } -"ui.menu" = { fg = "foreground", bg = "current_line" } -"ui.menu.scroll" = { fg = "foreground", bg = "current_line" } -"ui.menu.selected" = { fg = "current_line", bg = "purple", modifiers = ["dim"] } -"ui.popup" = { fg = "foreground", bg = "black" } -"ui.selection" = { bg = "selection" } -"ui.selection.primary" = { bg = "current_line" } -"ui.statusline" = { fg = "foreground", bg = "darker" } -"ui.statusline.inactive" = { fg = "comment", bg = "darker" } -"ui.statusline.insert" = { fg = "black", bg = "green", modifiers = ["bold"] } -"ui.statusline.normal" = { fg = "black", bg = "purple", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "black", bg = "cyan", modifiers = ["bold"] } -"ui.text" = { fg = "foreground" } -"ui.text.focus" = { fg = "cyan" } -"ui.text.directory" = { fg = "cyan" } -"ui.virtual.indent-guide" = { fg = "indent" } -"ui.virtual.inlay-hint" = { fg = "cyan" } -"ui.virtual.inlay-hint.parameter" = { fg = "cyan", modifiers = ["italic", "dim"] } -"ui.virtual.inlay-hint.type" = { fg = "cyan", modifiers = ["italic", "dim"] } -"ui.virtual.jump-label" = { fg = "pink", modifiers = ["bold"] } -"ui.virtual.ruler" = { bg = "black" } -"ui.virtual.whitespace" = { fg = "whitespace" } -"ui.virtual.wrap" = { fg = "current_line" } -"ui.window" = { fg = "foreground" } - -"variable" = { fg = "foreground" } -"variable.builtin" = { fg = "purple", modifiers = ["italic"] } -"variable.other" = { fg = "foreground" } -"variable.other.member" = { fg = "foreground" } -"variable.parameter" = { fg = "orange", modifiers = ["italic"] } - - -[palette] -background = "#282A36" -black = "#191A21" -comment = "#6272A4" -current_line = "#44475a" -cursorline = "#2d303e" -cyan = "#8be9fd" -darker = "#222430" -foreground = "#f8f8f2" -green = "#50fa7b" -grey = "#666771" -indent = "#56596a" -orange = "#ffb86c" -pink = "#ff79c6" -purple = "#BD93F9" -red = "#ff5555" -selection = "#363848" -whitespace = "#586693" -yellow = "#f1fa8c" - diff --git a/vendor/themes/molokai.toml b/vendor/themes/molokai.toml index 0e48f775..a2562180 100644 --- a/vendor/themes/molokai.toml +++ b/vendor/themes/molokai.toml @@ -1,6 +1,6 @@ # Author : Maxwell Anderson -inherits = "monokai" +inherits = "monokai_helix" "comment" = "comment" "comment.block.documentation" = { fg = "comment", modifiers = ["bold"] } diff --git a/vendor/themes/monokai.toml b/vendor/themes/monokai.toml deleted file mode 100644 index dfa7040c..00000000 --- a/vendor/themes/monokai.toml +++ /dev/null @@ -1,121 +0,0 @@ -# Author: Shafkath Shuhan - -"tag" = { fg = "tag" } - -"namespace" = { fg = "type" } -"module" = { fg = "type" } - -"type" = { fg = "type" } -"type.builtin" = { fg = "#66D9EF" } -"type.enum.variant" = { fg = "text" } -"constructor" = { fg = "fn_declaration" } -"variable.other.member" = { fg = "variable" } - -"keyword" = { fg = "keyword" } -"keyword.directive" = { fg = "keyword" } -"keyword.control" = { fg = "keyword" } -"label" = { fg = "keyword" } - -"special" = { fg = "keyword" } -"operator" = { fg = "text" } - -"punctuation" = { fg = "text" } -"punctuation.delimiter" = { fg = "text" } - -"variable" = { fg = "variable" } -"variable.parameter" = { fg = "#fd971f" } -"variable.builtin" = { fg = "keyword" } -"constant" = { fg = "variable" } -"constant.builtin" = { fg = "#ae81ff" } - -"function" = { fg = "fn_declaration" } -"function.builtin" = { fg = "fn_declaration" } -"function.macro" = { fg = "keyword" } -"attribute" = { fg = "fn_declaration" } - -"comment" = { fg = "#88846F" } -"ui.virtual.whitespace" = "#88846F" -"ui.virtual.ruler" = { bg = "#24241e" } -"ui.virtual.jump-label" = { fg = "special", modifiers = ["bold"] } - -"string" = { fg = "#e6db74" } -"constant.character" = { fg = "#e6db74" } -"string.regexp" = { fg = "regex" } -"constant.numeric" = { fg = "#ae81ff" } -"constant.character.escape" = { fg = "#ae81ff" } - -# TODO -"markup.heading" = "blue" -"markup.list" = "red" -"markup.bold" = { fg = "yellow", modifiers = ["bold"] } -"markup.italic" = { fg = "magenta", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } -"markup.link.text" = "red" -"markup.quote" = "cyan" -"markup.raw" = "green" - -"diff.plus" = { fg = "#a6e22e" } -"diff.delta" = { fg = "#fd971f" } -"diff.minus" = { fg = "#f92672" } - -"ui.background" = { fg = "text", bg = "background" } - -"ui.window" = { bg = "widget" } -"ui.popup" = { fg = "text", bg = "widget" } -"ui.help" = { fg = "text", bg = "widget" } -"ui.menu" = { fg = "text", bg = "widget" } -"ui.menu.selected" = { bg = "#414339" } - -"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.match" = { fg = "#888888", modifiers = ["reversed"] } - -"ui.selection" = { bg = "#878b91" } -"ui.selection.primary" = { bg = "#575b61" } - -"ui.linenr" = { fg = "#90908a" } -"ui.linenr.selected" = { fg = "#c2c2bf" } - -"ui.cursorline" = { bg = "#24241e" } -"ui.statusline" = { fg = "active_text", bg = "#414339" } -"ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" } - -# Malformed ANSI: grey2, bg3. See 'https://github.com/helix-editor/helix/issues/5709' -# "ui.bufferline" = { fg = "grey2", bg = "bg3" } -"ui.bufferline.active" = { fg = "active_text", bg = "selection", modifiers = [ - "bold", -] } -"ui.virtual.inlay-hint" = { fg = "#88846F" } - -"ui.text" = { fg = "text" } -"ui.text.focus" = { fg = "active_text" } - -"warning" = { fg = "#cca700" } -"error" = { fg = "#f48771" } -"info" = { fg = "#75beff" } -"hint" = { fg = "#eeeeb3" } - -"diagnostic.warning" = { underline = { color = "#cca700", style = "curl" } } -"diagnostic.error" = { underline = { color = "#f48771", style = "curl" } } -"diagnostic.info" = { underline = { color = "#75beff", style = "curl" } } -"diagnostic.hint" = { underline = { color = "#eeeeb3", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -[palette] -type = "#A6E22E" -keyword = "#F92672" -regex = "#CE9178" -special = "#C586C0" -variable = "#F8F8F2" -fn_declaration = "#A6E22E" - -background = "#272822" -text = "#f8f8f2" -active_text = "#ffffff" -cursor = "#a6a6a6" -inactive_cursor = "#878b91" -widget = "#1e1f1c" -selection = "#414339" -tag = "#F92672" diff --git a/vendor/themes/monokai_aqua.toml b/vendor/themes/monokai_aqua.toml index b818a09e..61672230 100644 --- a/vendor/themes/monokai_aqua.toml +++ b/vendor/themes/monokai_aqua.toml @@ -1,4 +1,4 @@ -inherits = "monokai" +inherits = "monokai_helix" "keyword.control.import" = { fg = "cyan", modifiers = ["italic"] } "keyword.function" = { fg = "cyan", modifiers = ["italic"] } diff --git a/vendor/themes/monokai_helix.toml b/vendor/themes/monokai_helix.toml new file mode 100644 index 00000000..dfa7040c --- /dev/null +++ b/vendor/themes/monokai_helix.toml @@ -0,0 +1,121 @@ +# Author: Shafkath Shuhan + +"tag" = { fg = "tag" } + +"namespace" = { fg = "type" } +"module" = { fg = "type" } + +"type" = { fg = "type" } +"type.builtin" = { fg = "#66D9EF" } +"type.enum.variant" = { fg = "text" } +"constructor" = { fg = "fn_declaration" } +"variable.other.member" = { fg = "variable" } + +"keyword" = { fg = "keyword" } +"keyword.directive" = { fg = "keyword" } +"keyword.control" = { fg = "keyword" } +"label" = { fg = "keyword" } + +"special" = { fg = "keyword" } +"operator" = { fg = "text" } + +"punctuation" = { fg = "text" } +"punctuation.delimiter" = { fg = "text" } + +"variable" = { fg = "variable" } +"variable.parameter" = { fg = "#fd971f" } +"variable.builtin" = { fg = "keyword" } +"constant" = { fg = "variable" } +"constant.builtin" = { fg = "#ae81ff" } + +"function" = { fg = "fn_declaration" } +"function.builtin" = { fg = "fn_declaration" } +"function.macro" = { fg = "keyword" } +"attribute" = { fg = "fn_declaration" } + +"comment" = { fg = "#88846F" } +"ui.virtual.whitespace" = "#88846F" +"ui.virtual.ruler" = { bg = "#24241e" } +"ui.virtual.jump-label" = { fg = "special", modifiers = ["bold"] } + +"string" = { fg = "#e6db74" } +"constant.character" = { fg = "#e6db74" } +"string.regexp" = { fg = "regex" } +"constant.numeric" = { fg = "#ae81ff" } +"constant.character.escape" = { fg = "#ae81ff" } + +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.strikethrough" = { modifiers = ["crossed_out"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + +"diff.plus" = { fg = "#a6e22e" } +"diff.delta" = { fg = "#fd971f" } +"diff.minus" = { fg = "#f92672" } + +"ui.background" = { fg = "text", bg = "background" } + +"ui.window" = { bg = "widget" } +"ui.popup" = { fg = "text", bg = "widget" } +"ui.help" = { fg = "text", bg = "widget" } +"ui.menu" = { fg = "text", bg = "widget" } +"ui.menu.selected" = { bg = "#414339" } + +"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } +"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } +"ui.cursor.match" = { fg = "#888888", modifiers = ["reversed"] } + +"ui.selection" = { bg = "#878b91" } +"ui.selection.primary" = { bg = "#575b61" } + +"ui.linenr" = { fg = "#90908a" } +"ui.linenr.selected" = { fg = "#c2c2bf" } + +"ui.cursorline" = { bg = "#24241e" } +"ui.statusline" = { fg = "active_text", bg = "#414339" } +"ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" } + +# Malformed ANSI: grey2, bg3. See 'https://github.com/helix-editor/helix/issues/5709' +# "ui.bufferline" = { fg = "grey2", bg = "bg3" } +"ui.bufferline.active" = { fg = "active_text", bg = "selection", modifiers = [ + "bold", +] } +"ui.virtual.inlay-hint" = { fg = "#88846F" } + +"ui.text" = { fg = "text" } +"ui.text.focus" = { fg = "active_text" } + +"warning" = { fg = "#cca700" } +"error" = { fg = "#f48771" } +"info" = { fg = "#75beff" } +"hint" = { fg = "#eeeeb3" } + +"diagnostic.warning" = { underline = { color = "#cca700", style = "curl" } } +"diagnostic.error" = { underline = { color = "#f48771", style = "curl" } } +"diagnostic.info" = { underline = { color = "#75beff", style = "curl" } } +"diagnostic.hint" = { underline = { color = "#eeeeb3", style = "curl" } } +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } + +[palette] +type = "#A6E22E" +keyword = "#F92672" +regex = "#CE9178" +special = "#C586C0" +variable = "#F8F8F2" +fn_declaration = "#A6E22E" + +background = "#272822" +text = "#f8f8f2" +active_text = "#ffffff" +cursor = "#a6a6a6" +inactive_cursor = "#878b91" +widget = "#1e1f1c" +selection = "#414339" +tag = "#F92672" diff --git a/vendor/themes/monokai_pro.toml b/vendor/themes/monokai_pro.toml deleted file mode 100644 index 97f2a57c..00000000 --- a/vendor/themes/monokai_pro.toml +++ /dev/null @@ -1,134 +0,0 @@ -# Author : WindSoilder -# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro -# Credit goes to the original creator: https://monokai.pro - -"ui.linenr.selected" = { bg = "base3" } -"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } -"ui.menu" = { fg = "base8", bg = "base3" } -"ui.menu.selected" = { fg = "base2", bg = "yellow" } -"ui.virtual.whitespace" = "base5" -"ui.virtual.ruler" = { bg = "base1" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -"info" = "base8" -"hint" = "base8" - -# background color -"ui.background" = { bg = "base2" } - -# status bars, panels, modals, autocompletion -"ui.statusline" = { fg = "base8", bg = "base4" } -"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" } -"ui.statusline.normal" = { fg = "base4", bg = "blue" } -"ui.statusline.insert" = { fg = "base4", bg = "green" } -"ui.statusline.select" = { fg = "base4", bg = "purple" } -"ui.popup" = { bg = "base3" } -"ui.window" = { bg = "base3" } -"ui.help" = { fg = "base8", bg = "base3" } - -# active line, highlighting -"ui.selection" = { bg = "base4" } -"ui.cursor.match" = { bg = "base4" } -"ui.cursorline" = { bg = "base1" } - -# bufferline, inlay hints -"ui.bufferline" = { fg = "base6", bg = "base8x0c" } -"ui.bufferline.active" = { fg = "base8", bg = "base4" } -"ui.virtual.inlay-hint" = { fg = "base6" } - -# comments, nord3 based lighter color -"comment" = { fg = "base5", modifiers = ["italic"] } -"ui.linenr" = { fg = "base5" } - -# cursor, variables, constants, attributes, fields -"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] } -"attribute" = "blue" -"variable" = "base8" -"constant" = "orange" -"variable.builtin" = "red" -"constant.builtin" = "red" -"namespace" = "base8" - -# base text, punctuation -"ui.text" = { fg = "base8" } -"punctuation" = "base6" - -# classes, types, primitives -"type" = "green" -"type.builtin" = { fg = "red"} -"label" = "base8" - -# declaration, methods, routines -"constructor" = "blue" -"function" = "green" -"function.macro" = { fg = "blue" } -"function.builtin" = { fg = "cyan" } - -# operator, tags, units, punctuations -"operator" = "red" -"variable.other.member" = "base8" - -# keywords, special -"keyword" = { fg = "red" } -"keyword.directive" = "blue" -"variable.parameter" = "#f59762" - -# error -"error" = "red" - -# annotations, decorators -"special" = "#f59762" -"module" = "#f59762" - -# warnings, escape characters, regex -"warning" = "orange" -"constant.character.escape" = { fg = "base8" } - -# strings -"string" = "yellow" - -# integer, floating point -"constant.numeric" = "purple" - -# vcs -"diff.plus" = "green" -"diff.delta" = "orange" -"diff.minus" = "red" - -# make diagnostic underlined, to distinguish with selection text. -"diagnostic.warning" = { underline = { color = "orange", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "base8", style = "curl" } } -"diagnostic.hint" = { underline = { color = "base8", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default -"markup.heading" = "green" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "orange", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.quote" = "green" - -[palette] -# primary colors -"red" = "#ff6188" -"orange" = "#fc9867" -"yellow" = "#ffd866" -"green" = "#a9dc76" -"blue" = "#78dce8" -"purple" = "#ab9df2" -# base colors, sorted from darkest to lightest -"base0" = "#19181a" -"base1" = "#221f22" -"base2" = "#2d2a2e" -"base3" = "#403e41" -"base4" = "#5b595c" -"base5" = "#727072" -"base6" = "#939293" -"base7" = "#c1c0c0" -"base8" = "#fcfcfa" -# variants (for when transparency isn't supported) -"base8x0c" = "#363337" # using base2 as bg diff --git a/vendor/themes/monokai_pro_machine.toml b/vendor/themes/monokai_pro_machine.toml deleted file mode 100644 index e1f74b1c..00000000 --- a/vendor/themes/monokai_pro_machine.toml +++ /dev/null @@ -1,131 +0,0 @@ -# Author : WindSoilder -# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro -# Credit goes to the original creator: https://monokai.pro - -"ui.linenr.selected" = { bg = "base3" } -"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } -"ui.menu" = { fg = "base8", bg = "base3" } -"ui.menu.selected" = { fg = "base2", bg = "yellow" } -"ui.virtual.whitespace" = "base5" -"ui.virtual.ruler" = { bg = "base1" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -"info" = "base8" -"hint" = "base8" - -# background color -"ui.background" = { bg = "base2" } -"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" } - -# status bars, panels, modals, autocompletion -"ui.statusline" = { fg = "base8", bg = "base4" } -"ui.popup" = { bg = "base3" } -"ui.window" = { bg = "base3" } -"ui.help" = { fg = "base8", bg = "base3" } - -# active line, highlighting -"ui.selection" = { bg = "base4" } -"ui.cursor.match" = { bg = "base4" } -"ui.cursorline" = { bg = "base1" } - -# bufferline, inlay hints -"ui.bufferline" = { fg = "base6", bg = "base8x0c" } -"ui.bufferline.active" = { fg = "base8", bg = "base4" } -"ui.virtual.inlay-hint" = { fg = "base6" } - -# comments, nord3 based lighter color -"comment" = { fg = "base5", modifiers = ["italic"] } -"ui.linenr" = { fg = "base5" } - -# cursor, variables, constants, attributes, fields -"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] } -"attribute" = "blue" -"variable" = "base8" -"constant" = "orange" -"variable.builtin" = "red" -"constant.builtin" = "red" -"namespace" = "base8" - -# base text, punctuation -"ui.text" = { fg = "base8" } -"punctuation" = "base6" - -# classes, types, primitives -"type" = "green" -"type.builtin" = { fg = "red"} -"label" = "base8" - -# declaration, methods, routines -"constructor" = "blue" -"function" = "green" -"function.macro" = { fg = "blue" } -"function.builtin" = { fg = "cyan" } - -# operator, tags, units, punctuations -"operator" = "red" -"variable.other.member" = "base8" - -# keywords, special -"keyword" = { fg = "red" } -"keyword.directive" = "blue" -"variable.parameter" = "#f59762" - -# error -"error" = "red" - -# annotations, decorators -"special" = "#f59762" -"module" = "#f59762" - -# warnings, escape characters, regex -"warning" = "orange" -"constant.character.escape" = { fg = "base8" } - -# strings -"string" = "yellow" - -# integer, floating point -"constant.numeric" = "purple" - -# vcs -"diff.plus" = "green" -"diff.delta" = "orange" -"diff.minus" = "red" - -# make diagnostic underlined, to distinguish with selection text. -"diagnostic.warning" = { underline = { color = "orange", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "base8", style = "curl" } } -"diagnostic.hint" = { underline = { color = "base8", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default -"markup.heading" = "green" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "orange", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.quote" = "green" - -[palette] -# primary colors -"red" = "#ff6d7e" -"orange" = "#ffb270" -"yellow" = "#ffed72" -"green" = "#a2e57b" -"blue" = "#7cd5f1" -"purple" = "#baa0f8" -# base colors -"base0" = "#161b1e" -"base1" = "#1d2528" -"base2" = "#273136" -"base3" = "#3a4449" -"base4" = "#545f62" -"base5" = "#6b7678" -"base6" = "#798384" -"base7" = "#b8c4c3" -"base8" = "#f2fffc" -# variants -"base8x0c" = "#303a3e" diff --git a/vendor/themes/monokai_pro_octagon.toml b/vendor/themes/monokai_pro_octagon.toml deleted file mode 100644 index cfa85b65..00000000 --- a/vendor/themes/monokai_pro_octagon.toml +++ /dev/null @@ -1,134 +0,0 @@ -# Author : WindSoilder -# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro -# Credit goes to the original creator: https://monokai.pro - -"ui.linenr.selected" = { bg = "base3" } -"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } -"ui.menu" = { fg = "base8", bg = "base3" } -"ui.menu.selected" = { fg = "base2", bg = "yellow" } -"ui.virtual.whitespace" = "base5" -"ui.virtual.ruler" = { bg = "base1" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -"info" = "base8" -"hint" = "base8" - -# background color -"ui.background" = { bg = "base2" } -"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" } - -# status bars, panels, modals, autocompletion -"ui.statusline" = { fg = "base8", bg = "base4" } -"ui.statusline.normal" = { fg = "base4", bg = "blue" } -"ui.statusline.insert" = { fg = "base4", bg = "green" } -"ui.statusline.select" = { fg = "base4", bg = "purple" } -"ui.popup" = { bg = "base3" } -"ui.window" = { bg = "base3" } -"ui.help" = { fg = "base8", bg = "base3" } - -# active line, highlighting -"ui.selection" = { bg = "base4" } -"ui.cursor.match" = { bg = "base4" } -"ui.cursorline" = { bg = "base1" } - -# bufferline, inlay hints -"ui.bufferline" = { fg = "base6", bg = "base8x0c" } -"ui.bufferline.active" = { fg = "base8", bg = "base4" } -"ui.virtual.inlay-hint" = { fg = "base6" } - -# comments, nord3 based lighter color -"comment" = { fg = "base5", modifiers = ["italic"] } -"ui.linenr" = { fg = "base5" } - -# cursor, variables, constants, attributes, fields -"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] } -"attribute" = "blue" -"variable" = "base8" -"constant" = "orange" -"variable.builtin" = "red" -"constant.builtin" = "red" -"namespace" = "base8" - -# base text, punctuation -"ui.text" = { fg = "base8" } -"punctuation" = "base6" - -# classes, types, primitives -"type" = "green" -"type.builtin" = { fg = "red"} -"label" = "base8" - -# declaration, methods, routines -"constructor" = "blue" -"function" = "green" -"function.macro" = { fg = "blue" } -"function.builtin" = { fg = "cyan" } - -# operator, tags, units, punctuations -"operator" = "red" -"variable.other.member" = "base8" - -# keywords, special -"keyword" = { fg = "red" } -"keyword.directive" = "blue" -"variable.parameter" = "#f59762" - -# error -"error" = "red" - -# annotations, decorators -"special" = "#f59762" -"module" = "#f59762" - -# warnings, escape characters, regex -"warning" = "orange" -"constant.character.escape" = { fg = "base8" } - -# strings -"string" = "yellow" - -# integer, floating point -"constant.numeric" = "purple" - -# vcs -"diff.plus" = "green" -"diff.delta" = "orange" -"diff.minus" = "red" - -# make diagnostic underlined, to distinguish with selection text. -"diagnostic.warning" = { underline = { color = "orange", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "base8", style = "curl" } } -"diagnostic.hint" = { underline = { color = "base8", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default -"markup.heading" = "green" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "orange", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.quote" = "green" - -[palette] -# primary colors -"red" = "#ff657a" -"orange" = "#ff9b5e" -"yellow" = "#ffd76d" -"green" = "#bad761" -"blue" = "#9cd1bb" -"purple" = "#c39ac9" -# base colors -"base0" = "#161821" -"base1" = "#1e1f2b" -"base2" = "#282a3a" -"base3" = "#3a3d4b" -"base4" = "#535763" -"base5" = "#696d77" -"base6" = "#767b81" -"base7" = "#b2b9bd" -"base8" = "#eaf2f1" -# variants -"base8x0c" = "#303342" diff --git a/vendor/themes/monokai_pro_ristretto.toml b/vendor/themes/monokai_pro_ristretto.toml deleted file mode 100644 index a6ba6fcf..00000000 --- a/vendor/themes/monokai_pro_ristretto.toml +++ /dev/null @@ -1,131 +0,0 @@ -# Author : WindSoilder -# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro -# Credit goes to the original creator: https://monokai.pro - -"ui.linenr.selected" = { bg = "base3" } -"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } -"ui.menu" = { fg = "base8", bg = "base3" } -"ui.menu.selected" = { fg = "base2", bg = "yellow" } -"ui.virtual.whitespace" = "base5" -"ui.virtual.ruler" = { bg = "base1" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -"info" = "base8" -"hint" = "base8" - -# background color -"ui.background" = { bg = "base2" } -"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" } - -# status bars, panels, modals, autocompletion -"ui.statusline" = { fg = "base8", bg = "base4" } -"ui.popup" = { bg = "base3" } -"ui.window" = { bg = "base3" } -"ui.help" = { fg = "base8", bg = "base3" } - -# active line, highlighting -"ui.selection" = { bg = "base4" } -"ui.cursor.match" = { bg = "base4" } -"ui.cursorline" = { bg = "base1" } - -# bufferline, inlay hints -"ui.bufferline" = { fg = "base6", bg = "base8x0c" } -"ui.bufferline.active" = { fg = "base8", bg = "base4" } -"ui.virtual.inlay-hint" = { fg = "base6" } - -# comments, nord3 based lighter color -"comment" = { fg = "base5", modifiers = ["italic"] } -"ui.linenr" = { fg = "base5" } - -# cursor, variables, constants, attributes, fields -"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] } -"attribute" = "blue" -"variable" = "base8" -"constant" = "orange" -"variable.builtin" = "red" -"constant.builtin" = "red" -"namespace" = "base8" - -# base text, punctuation -"ui.text" = { fg = "base8" } -"punctuation" = "base6" - -# classes, types, primitives -"type" = "green" -"type.builtin" = { fg = "red"} -"label" = "base8" - -# declaration, methods, routines -"constructor" = "blue" -"function" = "green" -"function.macro" = { fg = "blue" } -"function.builtin" = { fg = "cyan" } - -# operator, tags, units, punctuations -"operator" = "red" -"variable.other.member" = "base8" - -# keywords, special -"keyword" = { fg = "red" } -"keyword.directive" = "blue" -"variable.parameter" = "#f59762" - -# error -"error" = "red" - -# annotations, decorators -"special" = "#f59762" -"module" = "#f59762" - -# warnings, escape characters, regex -"warning" = "orange" -"constant.character.escape" = { fg = "base8" } - -# strings -"string" = "yellow" - -# integer, floating point -"constant.numeric" = "purple" - -# vcs -"diff.plus" = "green" -"diff.delta" = "orange" -"diff.minus" = "red" - -# make diagnostic underlined, to distinguish with selection text. -"diagnostic.warning" = { underline = { color = "orange", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "base8", style = "curl" } } -"diagnostic.hint" = { underline = { color = "base8", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default -"markup.heading" = "green" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "orange", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.quote" = "green" - -[palette] -# primary colors -"red" = "#fd6883" -"orange" = "#f38d70" -"yellow" = "#f9cc6c" -"green" = "#adda78" -"blue" = "#85dacc" -"purple" = "#a8a9eb" -# base colors -"base0" = "#191515" -"base1" = "#211c1c" -"base2" = "#2c2525" -"base3" = "#403838" -"base4" = "#5b5353" -"base5" = "#72696a" -"base6" = "#8c8384" -"base7" = "#c3b7b8" -"base8" = "#fff1f3" -# variants -"base8x0c" = "#352e2e" diff --git a/vendor/themes/monokai_pro_spectrum.toml b/vendor/themes/monokai_pro_spectrum.toml deleted file mode 100644 index 1bfcb688..00000000 --- a/vendor/themes/monokai_pro_spectrum.toml +++ /dev/null @@ -1,131 +0,0 @@ -# Author : WindSoilder -# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro -# Credit goes to the original creator: https://monokai.pro - -"ui.linenr.selected" = { bg = "base3" } -"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } -"ui.menu" = { fg = "base8", bg = "base3" } -"ui.menu.selected" = { fg = "base2", bg = "yellow" } -"ui.virtual.whitespace" = "base4" -"ui.virtual.ruler" = { bg = "base1" } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -"info" = "base8" -"hint" = "base8" - -# background color -"ui.background" = { bg = "base2" } - -# status bars, panels, modals, autocompletion -"ui.statusline" = { fg = "base8", bg = "base4" } -"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" } -"ui.popup" = { bg = "base3" } -"ui.window" = { bg = "base3" } -"ui.help" = { fg = "base8", bg = "base3" } - -# active line, highlighting -"ui.selection" = { bg = "base4" } -"ui.cursor.match" = { bg = "base4" } -"ui.cursorline" = { bg = "base1" } - -# bufferline, inlay hints -"ui.bufferline" = { fg = "base6", bg = "base8x0c" } -"ui.bufferline.active" = { fg = "base8", bg = "base4" } -"ui.virtual.inlay-hint" = { fg = "base6" } - -# comments, nord3 based lighter color -"comment" = { fg = "base5", modifiers = ["italic"] } -"ui.linenr" = { fg = "base5" } - -# cursor, variables, constants, attributes, fields -"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] } -"attribute" = "blue" -"variable" = "base8" -"constant" = "orange" -"variable.builtin" = "red" -"constant.builtin" = "red" -"namespace" = "base8" - -# base text, punctuation -"ui.text" = { fg = "base8" } -"punctuation" = "base6" - -# classes, types, primitives -"type" = "green" -"type.builtin" = { fg = "red"} -"label" = "base8" - -# declaration, methods, routines -"constructor" = "blue" -"function" = "green" -"function.macro" = { fg = "blue" } -"function.builtin" = { fg = "blue" } - -# operator, tags, units, punctuations -"operator" = "red" -"variable.other.member" = "base8" - -# keywords, special -"keyword" = { fg = "red" } -"keyword.directive" = "blue" -"variable.parameter" = "#f59762" - -# error -"error" = { fg = "red", modifiers = ["bold"] } - -# annotations, decorators -"special" = "#f59762" -"module" = "#f59762" - -# warnings, escape characters, regex -"warning" = "orange" -"constant.character.escape" = { fg = "base8" } - -# strings -"string" = "yellow" - -# integer, floating point -"constant.numeric" = "purple" - -# vcs -"diff.plus" = "green" -"diff.delta" = "orange" -"diff.minus" = "red" - -# make diagnostic underlined, to distinguish with selection text. -"diagnostic.warning" = { underline = { color = "orange", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } -"diagnostic.info" = { underline = { color = "base8", style = "curl" } } -"diagnostic.hint" = { underline = { color = "base8", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default -"markup.heading" = "green" -"markup.bold" = { fg = "orange", modifiers = ["bold"] } -"markup.italic" = { fg = "orange", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "orange", modifiers = ["underlined"] } -"markup.link.text" = "yellow" -"markup.quote" = "green" - -[palette] -# primary colors -"red" = "#fc618d" -"orange" = "#fd9353" -"yellow" = "#fce566" -"green" = "#7bd88f" -"blue" = "#5ad4e6" -"purple" = "#948ae3" -# base colors -"base0" = "#131313" -"base1" = "#191919" -"base2" = "#222222" -"base3" = "#363537" -"base4" = "#525053" -"base5" = "#69676c" -"base6" = "#8b888f" -"base7" = "#bab6c0" -"base8" = "#f7f1ff" -# variants -"base8x0c" = "#2b2b2b" diff --git a/vendor/themes/nord-night.toml b/vendor/themes/nord-night.toml index b759738b..92fc35bf 100644 --- a/vendor/themes/nord-night.toml +++ b/vendor/themes/nord-night.toml @@ -4,7 +4,7 @@ # The Background and the Primary Text color have been slightly darkened. # The Aurora color palette has been used more generously. -inherits = 'nord' +inherits = 'nord_helix' 'constant' = 'nord13' 'constant.builtin.boolean' = 'nord13' diff --git a/vendor/themes/nord.toml b/vendor/themes/nord.toml deleted file mode 100644 index db7b6190..00000000 --- a/vendor/themes/nord.toml +++ /dev/null @@ -1,199 +0,0 @@ -# Nord (Dark Ambiance) port for Helix (https://helix-editor.com/) -# https://docs.helix-editor.com/themes.html -# https://www.nordtheme.com/docs/colors-and-palettes - -## SYNTAX HIGHLIGHTING - -# Constants -"constant" = "nord4" -"constant.builtin" = "nord9" -"constant.builtin.boolean" = "nord9" -"constant.builtin.character" = "nord15" -"constant.character.escape" = "nord13" -"constant.macro" = "nord9" -"constant.numeric" = "nord15" -"constructor" = "nord8" - -# Diagnostics -"diagnostic" = { underline = { color = "nord13", style = "curl" } } -"diagnostic.error" = { underline = { color = "nord11", style = "curl" } } -"error" = "nord11" -"diagnostic.hint" = { underline = { color = "nord10", style = "curl" } } -"hint" = "nord10" -"diagnostic.info" = { underline = { color = "nord8", style = "curl" } } -"info" = "nord8" -"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } } -"warning" = "nord13" -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -# Diffs -"diff.delta" = "nord13" -"diff.minus" = "nord11" -"diff.plus" = "nord14" - -# Functions -"function" = "nord8" -"function.builtin" = "nord7" -"function.method" = "nord8" -"function.macro" = "nord9" -"function.special" = "nord9" - -# Git -"git.delta.moved" = "nord12" - -# Keywords -"keyword" = "nord9" -"keyword.control.conditional" = "nord9" -"keyword.control.exception" = "nord9" -"keyword.control.repeat" = "nord9" -"keyword.directive" = "nord9" -"keyword.function" = "nord9" -"keyword.operator" = "nord9" -"keyword.return" = "nord9" -"keyword.storage.modifier" = "nord9" -"keyword.storage.type" = "nord9" - -# Punctuation -"punctuation" = "nord6" -"punctuation.bracket" = "nord6" -"punctuation.delimiter" = "nord6" -"punctuation.special" = "nord9" - -# Strings -"string" = "nord14" -"string.escape" = "nord13" -"string.regex" = "nord13" -"string.special" = "nord13" - -# Types -"type" = "nord7" -"type.builtin" = "nord7" - -# Variables -"variable" = "nord4" -"variable.builtin" = "nord9" -"variable.other.member" = "nord4" -"variable.parameter" = "nord8" -"attribute" = "nord9" - -# Misc. -"label" = "nord7" -"namespace" = "nord4" -"operator" = "nord9" -"special" = "nord9" -"tag" = "nord7" -"comment" = { fg = "nord3_bright", modifiers = ["italic"] } - -## EDITOR UI COLORS - -"ui.background" = { bg = "nord0" } -"ui.text" = "nord4" -"ui.window" = "nord1" - -# Debug -"ui.debug.active" = "nord13" -"ui.debug.breakpoint" = "nord11" - -# Popus and menus -"ui.menu" = { bg = "nord1" } -"ui.menu.scroll" = { fg = "nord4", bg = "nord3" } -"ui.menu.selected" = { fg = "nord8", bg = "nord2" } -"ui.popup" = { bg = "nord1" } -"ui.popup.info" = { bg = "nord1" } -"ui.help" = { bg = "nord1" } -"ui.text.focus" = { fg = "nord8", bg = "nord2" } - -# Gutter -"ui.gutter" = "nord5" -"ui.linenr" = "nord3" -"ui.linenr.selected" = "nord5" - -# Cursor -"ui.cursor" = { fg = "nord4", modifiers = ["reversed"] } -"ui.cursorcolumn.primary" = { bg = "nord1" } -"ui.cursorline.primary" = { bg = "nord1" } -"ui.cursor.match" = { bg = "nord3" } - -"ui.selection" = { bg = "nord3" } -"ui.highlight" = { fg = "nord8", bg = "nord2" } - -# Statusline -"ui.statusline" = { bg = "nord1" } -"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" } -"ui.statusline.insert" = { fg = "nord1", bg = "nord6" } -"ui.statusline.normal" = { fg = "nord1", bg = "nord8" } -"ui.statusline.select" = { fg = "nord1", bg = "nord7" } -"ui.statusline.separator" = "nord3" - -# Virtual/invisible text -"ui.virtual.indent-guide" = "nord3" -"ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] } -"ui.virtual.jump-label" = { fg = "nord11", modifiers = ["bold"] } -"ui.virtual.ruler" = { bg = "nord1" } -"ui.virtual.whitespace" = "nord3" -"ui.virtual.wrap" = "nord3" - -# Bufferline -"ui.bufferline" = { fg = "nord5", bg = "nord1" } -"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ - "italic", -] } - -# Markup -"markup.heading" = "nord8" -"markup.list" = "nord9" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.text" = "nord8" -"markup.raw" = "nord7" - -# Rainbow brackets -rainbow = ["nord13", "nord15", "nord14", "nord12"] - -[palette] -# Polar Night is made up of four darker colors that are commonly used for base elements like backgrounds or text color in bright ambiance designs. -# -# The origin color or the Polar Night palette -nord0 = "#2e3440" -# A brighter shade color based on nord0 -nord1 = "#3B4252" -# An even more brighter shade color of nord0 -nord2 = "#434C5E" -# The brightest shade color based on nord0 -nord3 = "#4C566A" -# 10% brighter for comments, see https://github.com/nordtheme/nord/issues/94 -nord3_bright = "#616e88" - -# Snow Storm is made up of three bright colors that are commonly used for text colors or base UI elements in bright ambiance designs. -# The origin color or the Snow Storm palette -nord4 = "#D8DEE9" -# A brighter shade color of nord4 -nord5 = "#E5E9F0" -# The brightest shade color based on nord4 -nord6 = "#ECEFF4" - -# Frost can be described as the heart palette of Nord, a group of four bluish colors that are commonly used for primary UI component and text highlighting and essential code syntax elements. -# -# A calm and highly contrasted color reminiscent of frozen polar water -nord7 = "#8FBCBB" -# The bright and shiny primary accent color reminiscent of pure and clear ice -nord8 = "#88C0D0" -# A more darkened and less saturated color reminiscent of arctic waters -nord9 = "#81A1C1" -# A dark and intensive color reminiscent of the deep arctic ocean -nord10 = "#5E81AC" - -# Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights. -# -# Red -nord11 = "#BF616A" -# Orange -nord12 = "#D08770" -# Yellow -nord13 = "#EBCB8B" -# Green -nord14 = "#A3BE8C" -# Purple -nord15 = "#B48EAD" diff --git a/vendor/themes/nord_helix.toml b/vendor/themes/nord_helix.toml new file mode 100644 index 00000000..db7b6190 --- /dev/null +++ b/vendor/themes/nord_helix.toml @@ -0,0 +1,199 @@ +# Nord (Dark Ambiance) port for Helix (https://helix-editor.com/) +# https://docs.helix-editor.com/themes.html +# https://www.nordtheme.com/docs/colors-and-palettes + +## SYNTAX HIGHLIGHTING + +# Constants +"constant" = "nord4" +"constant.builtin" = "nord9" +"constant.builtin.boolean" = "nord9" +"constant.builtin.character" = "nord15" +"constant.character.escape" = "nord13" +"constant.macro" = "nord9" +"constant.numeric" = "nord15" +"constructor" = "nord8" + +# Diagnostics +"diagnostic" = { underline = { color = "nord13", style = "curl" } } +"diagnostic.error" = { underline = { color = "nord11", style = "curl" } } +"error" = "nord11" +"diagnostic.hint" = { underline = { color = "nord10", style = "curl" } } +"hint" = "nord10" +"diagnostic.info" = { underline = { color = "nord8", style = "curl" } } +"info" = "nord8" +"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } } +"warning" = "nord13" +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } + +# Diffs +"diff.delta" = "nord13" +"diff.minus" = "nord11" +"diff.plus" = "nord14" + +# Functions +"function" = "nord8" +"function.builtin" = "nord7" +"function.method" = "nord8" +"function.macro" = "nord9" +"function.special" = "nord9" + +# Git +"git.delta.moved" = "nord12" + +# Keywords +"keyword" = "nord9" +"keyword.control.conditional" = "nord9" +"keyword.control.exception" = "nord9" +"keyword.control.repeat" = "nord9" +"keyword.directive" = "nord9" +"keyword.function" = "nord9" +"keyword.operator" = "nord9" +"keyword.return" = "nord9" +"keyword.storage.modifier" = "nord9" +"keyword.storage.type" = "nord9" + +# Punctuation +"punctuation" = "nord6" +"punctuation.bracket" = "nord6" +"punctuation.delimiter" = "nord6" +"punctuation.special" = "nord9" + +# Strings +"string" = "nord14" +"string.escape" = "nord13" +"string.regex" = "nord13" +"string.special" = "nord13" + +# Types +"type" = "nord7" +"type.builtin" = "nord7" + +# Variables +"variable" = "nord4" +"variable.builtin" = "nord9" +"variable.other.member" = "nord4" +"variable.parameter" = "nord8" +"attribute" = "nord9" + +# Misc. +"label" = "nord7" +"namespace" = "nord4" +"operator" = "nord9" +"special" = "nord9" +"tag" = "nord7" +"comment" = { fg = "nord3_bright", modifiers = ["italic"] } + +## EDITOR UI COLORS + +"ui.background" = { bg = "nord0" } +"ui.text" = "nord4" +"ui.window" = "nord1" + +# Debug +"ui.debug.active" = "nord13" +"ui.debug.breakpoint" = "nord11" + +# Popus and menus +"ui.menu" = { bg = "nord1" } +"ui.menu.scroll" = { fg = "nord4", bg = "nord3" } +"ui.menu.selected" = { fg = "nord8", bg = "nord2" } +"ui.popup" = { bg = "nord1" } +"ui.popup.info" = { bg = "nord1" } +"ui.help" = { bg = "nord1" } +"ui.text.focus" = { fg = "nord8", bg = "nord2" } + +# Gutter +"ui.gutter" = "nord5" +"ui.linenr" = "nord3" +"ui.linenr.selected" = "nord5" + +# Cursor +"ui.cursor" = { fg = "nord4", modifiers = ["reversed"] } +"ui.cursorcolumn.primary" = { bg = "nord1" } +"ui.cursorline.primary" = { bg = "nord1" } +"ui.cursor.match" = { bg = "nord3" } + +"ui.selection" = { bg = "nord3" } +"ui.highlight" = { fg = "nord8", bg = "nord2" } + +# Statusline +"ui.statusline" = { bg = "nord1" } +"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" } +"ui.statusline.insert" = { fg = "nord1", bg = "nord6" } +"ui.statusline.normal" = { fg = "nord1", bg = "nord8" } +"ui.statusline.select" = { fg = "nord1", bg = "nord7" } +"ui.statusline.separator" = "nord3" + +# Virtual/invisible text +"ui.virtual.indent-guide" = "nord3" +"ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] } +"ui.virtual.jump-label" = { fg = "nord11", modifiers = ["bold"] } +"ui.virtual.ruler" = { bg = "nord1" } +"ui.virtual.whitespace" = "nord3" +"ui.virtual.wrap" = "nord3" + +# Bufferline +"ui.bufferline" = { fg = "nord5", bg = "nord1" } +"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ + "italic", +] } + +# Markup +"markup.heading" = "nord8" +"markup.list" = "nord9" +"markup.bold" = { modifiers = ["bold"] } +"markup.italic" = { modifiers = ["italic"] } +"markup.strikethrough" = { modifiers = ["crossed_out"] } +"markup.link.text" = "nord8" +"markup.raw" = "nord7" + +# Rainbow brackets +rainbow = ["nord13", "nord15", "nord14", "nord12"] + +[palette] +# Polar Night is made up of four darker colors that are commonly used for base elements like backgrounds or text color in bright ambiance designs. +# +# The origin color or the Polar Night palette +nord0 = "#2e3440" +# A brighter shade color based on nord0 +nord1 = "#3B4252" +# An even more brighter shade color of nord0 +nord2 = "#434C5E" +# The brightest shade color based on nord0 +nord3 = "#4C566A" +# 10% brighter for comments, see https://github.com/nordtheme/nord/issues/94 +nord3_bright = "#616e88" + +# Snow Storm is made up of three bright colors that are commonly used for text colors or base UI elements in bright ambiance designs. +# The origin color or the Snow Storm palette +nord4 = "#D8DEE9" +# A brighter shade color of nord4 +nord5 = "#E5E9F0" +# The brightest shade color based on nord4 +nord6 = "#ECEFF4" + +# Frost can be described as the heart palette of Nord, a group of four bluish colors that are commonly used for primary UI component and text highlighting and essential code syntax elements. +# +# A calm and highly contrasted color reminiscent of frozen polar water +nord7 = "#8FBCBB" +# The bright and shiny primary accent color reminiscent of pure and clear ice +nord8 = "#88C0D0" +# A more darkened and less saturated color reminiscent of arctic waters +nord9 = "#81A1C1" +# A dark and intensive color reminiscent of the deep arctic ocean +nord10 = "#5E81AC" + +# Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights. +# +# Red +nord11 = "#BF616A" +# Orange +nord12 = "#D08770" +# Yellow +nord13 = "#EBCB8B" +# Green +nord14 = "#A3BE8C" +# Purple +nord15 = "#B48EAD" diff --git a/vendor/themes/rose_pine.toml b/vendor/themes/rose_pine.toml deleted file mode 100644 index 33c71486..00000000 --- a/vendor/themes/rose_pine.toml +++ /dev/null @@ -1,197 +0,0 @@ -# Author: Rosé Pine -# Upstream: https://github.com/rose-pine/helix -# Contributing: -# Please submit changes to https://github.com/rose-pine/helix. -# The Rosé Pine team will update Helix, including you as a co-author. - -"ui.background" = { bg = "base" } -"ui.background.separator" = { bg = "base" } - -"ui.cursor" = { fg = "text", bg = "highlight_high" } -# "ui.cursor.select" = {} -"ui.cursor.match" = { fg = "text", bg = "highlight_med" } -"ui.cursor.primary" = { fg = "text", bg = "muted" } - -# "ui.gutter" = {} -# "ui.gutter.selected" = {} - -"ui.linenr" = { fg = "muted" } -"ui.linenr.selected" = { fg = "text" } - -"ui.bufferline" = { fg = "muted", bg = "base" } -"ui.bufferline.active" = { fg = "text", bg = "overlay" } -"ui.statusline" = { fg = "subtle", bg = "surface" } -"ui.statusline.inactive" = { fg = "muted", bg = "surface" } -"ui.statusline.normal" = { fg = "rose", bg = "rose_10" } -"ui.statusline.insert" = { fg = "foam", bg = "foam_10" } -"ui.statusline.select" = { fg = "iris", bg = "iris_10" } -# "ui.statusline.separator" = {} - -"ui.popup" = { bg = "surface" } -"ui.popup.info" = { bg = "surface" } - -"ui.window" = { fg = "overlay", bg = "base" } -"ui.help" = { fg = "subtle", bg = "overlay" } - -"ui.text" = { fg = "text" } -"ui.text.focus" = { bg = "overlay" } -"ui.text.info" = { fg = "subtle" } -"ui.text.directory" = { fg = "iris" } - -"ui.virtual.jump-label" = { fg = "love", modifiers = ["bold"] } -"ui.virtual.ruler" = { bg = "overlay" } -"ui.virtual.whitespace" = { fg = "highlight_high" } -"ui.virtual.indent-guide" = { fg = "muted" } -"ui.virtual.inlay-hint" = { fg = "subtle" } - -"ui.menu" = { fg = "subtle", bg = "surface" } -"ui.menu.selected" = { fg = "text", bg = "overlay" } -"ui.menu.scroll" = { fg = "muted", bg = "highlight_med" } - -"ui.selection" = { bg = "overlay" } -"ui.selection.primary" = { bg = "highlight_med" } - -"ui.cursorline.primary" = { bg = "highlight_low" } -"ui.cursorline.secondary" = { bg = "surface" } - -"warning" = "gold" -"error" = "love" -"info" = "foam" -"hint" = "iris" -"debug" = "rose" - -"diagnostic" = { underline = { color = "subtle", style = "curl" } } -"diagnostic.hint" = { underline = { color = "iris", style = "curl" } } -"diagnostic.info" = { underline = { color = "foam", style = "curl" } } -"diagnostic.warning" = { underline = { color = "gold", style = "curl" } } -"diagnostic.error" = { underline = { color = "love", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } -"special" = "rose" - -"attribute" = "iris" - -"type" = "foam" -# "type.builtin" = "" - -"constructor" = "foam" - -"constant" = "foam" -"constant.builtin" = "love" -"constant.builtin.boolean" = "rose" -"constant.character" = "gold" -"constant.character.escape" = "pine" -"constant.numeric" = "gold" -# "constant.numeric.integer" = "" -# "constant.numeric.float" = "" - -"string" = "gold" -# "string.regexp" = "" -# "string.special" = "" -# "string.special.path" = "" -# "string.special.url" = "" -# "string.special.symbol" = "" - -"comment" = { fg = "muted", modifiers = ["italic"] } -# "comment.line" = "" -# "comment.line.documentation" = "" -# "comment.block" = "" -# "comment.block.documentation" = "" - -"variable" = "text" -"variable.builtin" = "love" -"variable.parameter" = "iris" -# "variable.other" = "" -"variable.other.member" = "foam" - -"label" = "foam" - -"punctuation" = "subtle" -# "punctuation.delimiter" = "" -# "punctuation.bracket" = "" -# "punctuation.special" = "" - -"keyword" = "pine" -# "keyword.control" = "" -# "keyword.control.conditional" = "" -# "keyword.control.repeat" = "" -# "keyword.control.import" = "" -# "keyword.control.return" = "" -# "keyword.control.exception" = "" -"keyword.operator" = "subtle" -# "keyword.directive" = "" -# "keyword.function" = "" -# "keyword.storage" = "" -# "keyword.storage.type" = "" -# "keyword.storage.modifier" = "" - -"operator" = "subtle" - -"function" = "rose" # maybe pine -"function.builtin" = "love" -# "function.method" = "" -# "function.macro" = "" -# "function.special" = "" - -"tag" = "foam" - -"namespace" = "text" - -"markup.heading.marker" = "muted" -"markup.heading" = { fg = "iris", modifiers = ["bold"] } -"markup.heading.1" = { fg = "iris", modifiers = ["bold"] } -"markup.heading.2" = { fg = "foam", modifiers = ["bold"] } -"markup.heading.3" = { fg = "rose", modifiers = ["bold"] } -"markup.heading.4" = { fg = "gold", modifiers = ["bold"] } -"markup.heading.5" = { fg = "pine", modifiers = ["bold"] } -"markup.heading.6" = { fg = "foam", modifiers = ["bold"] } -# "markup.heading.completion" = "" -# "markup.heading.hover" = "" -"markup.list" = "muted" -# "markup.list.unnumbered" = "" -# "markup.list.numbered" = "" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link" = "iris" -"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } } -"markup.link.label" = "subtle" -"markup.link.text" = "text" -"markup.quote" = "subtle" -"markup.raw" = "subtle" -# "markup.raw.inline" = {} -# "markup.raw.inline.completion" = {} -# "markup.raw.inline.hover" = {} -# "markup.raw.block" = {} -# "markup.normal" = "" -# "markup.normal.completion" = "" -# "markup.normal.hover" = "" - -"diff" = "overlay" -"diff.plus" = "foam" -"diff.minus" = "love" -"diff.delta" = "highlight_high" -# "diff.delta.moved" = "" - -[palette] -base = "#191724" -surface = "#1f1d2e" -overlay = "#26233a" -muted = "#6e6a86" -subtle = "#908caa" -text = "#e0def4" -love = "#eb6f92" -love_10 = "#311f30" -gold = "#f6c177" -gold_10 = "#30282c" -rose = "#ebbcba" -rose_10 = "#2f2834" -pine = "#31748f" -pine_10 = "#1a2030" -foam = "#9ccfd8" -foam_10 = "#252937" -iris = "#c4a7e7" -iris_10 = "#2b2539" -highlight_low = "#21202e" -highlight_med = "#403d52" -highlight_high = "#524f67" diff --git a/vendor/themes/rose_pine_dawn.toml b/vendor/themes/rose_pine_dawn.toml deleted file mode 100644 index d3949e1a..00000000 --- a/vendor/themes/rose_pine_dawn.toml +++ /dev/null @@ -1,30 +0,0 @@ -# Author: Rosé Pine -# Upstream: https://github.com/rose-pine/helix -# Contributing: -# Please submit changes to https://github.com/rose-pine/helix. -# The Rosé Pine team will update Helix, including you as a co-author. - -inherits = "rose_pine" - -[palette] -base = "#faf4ed" -surface = "#fffaf3" -overlay = "#f2e9e1" -muted = "#9893a5" -subtle = "#797593" -text = "#575279" -love = "#b4637a" -love_10 = "#f6e4e0" -gold = "#ea9d34" -gold_10 = "#fbead8" -rose = "#d7827e" -rose_10 = "#fae8e1" -pine = "#286983" -pine_10 = "#e5e6e2" -foam = "#56949f" -foam_10 = "#eaeae5" -iris = "#907aa9" -iris_10 = "#f1e8e6" -highlight_low = "#f4ede8" -highlight_med = "#dfdad9" -highlight_high = "#cecacd" diff --git a/vendor/themes/rose_pine_moon.toml b/vendor/themes/rose_pine_moon.toml deleted file mode 100644 index f1d04dd3..00000000 --- a/vendor/themes/rose_pine_moon.toml +++ /dev/null @@ -1,30 +0,0 @@ -# Author: Rosé Pine -# Upstream: https://github.com/rose-pine/helix -# Contributing: -# Please submit changes to https://github.com/rose-pine/helix. -# The Rosé Pine team will update Helix, including you as a co-author. - -inherits = "rose_pine" - -[palette] -base = "#232136" -surface = "#2a273f" -overlay = "#393552" -muted = "#6e6a86" -subtle = "#908caa" -text = "#e0def4" -love = "#eb6f92" -love_10 = "#3a2841" -gold = "#f6c177" -gold_10 = "#39313e" -rose = "#ea9a97" -rose_10 = "#392d41" -pine = "#3e8fb0" -pine_10 = "#252c44" -foam = "#9ccfd8" -foam_10 = "#2e3248" -iris = "#c4a7e7" -iris_10 = "#342e4a" -highlight_low = "#2a283e" -highlight_med = "#44415a" -highlight_high = "#56526e" diff --git a/vendor/themes/solarized_dark.toml b/vendor/themes/solarized_dark.toml deleted file mode 100644 index c4f6815a..00000000 --- a/vendor/themes/solarized_dark.toml +++ /dev/null @@ -1,135 +0,0 @@ -"attribute" = { fg = "violet" } -"keyword" = { fg = "green" } -"keyword.directive" = { fg = "orange" } -"namespace" = { fg = "violet" } -"operator" = { fg = "green" } -"special" = { fg = "orange" } -"variable.builtin" = { fg = "cyan", modifiers = ["bold"] } -"variable.function" = { fg = "blue" } -"type" = { fg = "yellow" } -"type.builtin" = { fg = "yellow", modifiers = ["bold"] } -"constructor" = { fg = "blue" } -"function" = { fg = "blue" } -"function.macro" = { fg = "magenta" } -"function.builtin" = { fg = "blue", modifiers = ["bold"] } -"function.special" = { fg = "magenta" } -"comment" = { fg = "base01" } -"string" = { fg = "cyan" } -"constant" = { fg = "cyan" } -"constant.builtin" = { fg = "cyan", modifiers = ["bold"] } -"constant.character.escape" = { fg = "red", modifiers = ["bold"] } -"label" = { fg = "green" } -"module" = { fg = "violet" } -"tag" = { fg = "magenta" } - -# TODO -"markup.heading" = "blue" -"markup.list" = "red" -"markup.bold" = { fg = "yellow", modifiers = ["bold"] } -"markup.italic" = { fg = "magenta", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } -"markup.link.text" = "red" -"markup.quote" = "cyan" -"markup.raw" = "green" - -"diff.plus" = { fg = "green" } -"diff.delta" = { fg = "yellow" } -"diff.minus" = { fg = "red" } - -# 背景 -"ui.background" = { bg = "base03" } - -"ui.virtual.whitespace" = { fg = "base01" } -"ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -# 行å�·æ � -"ui.linenr" = { fg = "base0", bg = "base02" } -# 当å‰�行å�·æ � -"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] } -#cursorline -"ui.cursorline" = { bg = "base03" } - -# 状æ€�æ � -"ui.statusline" = { fg = "base03", bg = "base0" } -"ui.statusline.normal" = { bg = "blue" } -"ui.statusline.insert" = { bg = "green" } -"ui.statusline.select" = { bg = "yellow" } - -# é�žæ´»åŠ¨çŠ¶æ€�æ � -"ui.statusline.inactive" = { fg = "base1", bg = "base01" } - -# 补全窗å�£, preview窗å�£ -"ui.popup" = { bg = "base02" } -# å½±å“� 补全选中 cmd弹出信æ�¯é€‰ä¸­ -"ui.menu.selected" = { fg = "base02", bg = "base2"} -"ui.menu" = { fg = "base0", bg = "base02" } -# ?? -"ui.window" = { fg = "base3" } -# 命令行 补全的帮助信æ�¯ -"ui.help" = { modifiers = ["reversed"] } - -# å¿«æ�·é”®çª—å�£ -"ui.popup.info" = {fg = "base02", bg = "base1", modifiers = ["bold"]} -# å¿«æ�·é”®å­—体 -"ui.text.info" = {fg = "base02", modifiers = ["bold"]} - -# 普通ui的字体样å¼� -"ui.text" = { fg = "base1" } -# å½±å“� picker列表选中, å¿«æ�·é”®å¸®åŠ©çª—å�£æ–‡æœ¬ -"ui.text.focus" = { fg = "blue", modifiers = ["bold"]} - -# 主光标/selectio -"ui.cursor.primary" = { fg = "base03", bg = "base1" } -"ui.cursor.select" = { fg = "base02", bg = "cyan" } -"ui.cursorline.primary" = { bg = "base02" } -"ui.cursorline.secondary" = { bg = "base025" } - -"ui.selection" = { bg = "base0175" } -"ui.selection.primary" = { bg = "base015" } - -"ui.virtual.indent-guide" = { fg = "base02" } -"ui.virtual.ruler" = { bg = "base02" } - -# normal模å¼�的光标 -"ui.cursor" = {fg = "base02", bg = "cyan"} -"ui.cursor.insert" = {fg = "base03", bg = "base3"} -# 当å‰�光标匹é…�的标点符å�· -"ui.cursor.match" = { fg = "base03", bg = "base00" } - -"warning" = { fg = "orange", modifiers= ["bold", "underlined"] } -"error" = { fg = "red", modifiers= ["bold", "underlined"] } -"info" = { fg = "blue", modifiers= ["bold", "underlined"] } -"hint" = { fg = "base01", modifiers= ["bold", "underlined"] } - -"diagnostic.warning" = { underline = { style = "curl", color = "orange" } } -"diagnostic.error" = { underline = { style = "curl", color = "red" } } -"diagnostic.info" = { underline = { style = "curl", color = "blue" } } -"diagnostic.hint" = { underline = { style = "curl", color = "base01" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - -[palette] -# 深色 è¶Šæ�¥è¶Šæ·± -base03 = "#002b36" -base025 = "#03303b" -base02 = "#073642" -base0175 = "#16404b" -base015 = "#2c4f59" -base01 = "#586e75" -base00 = "#657b83" -base0 = "#839496" -base1 = "#93a1a1" -base2 = "#eee8d5" -base3 = "#fdf6e3" - -# 浅色 越來越浅 -yellow = "#b58900" -orange = "#cb4b16" -red = "#dc322f" -magenta = "#d33682" -violet = "#6c71c4" -blue = "#268bd2" -cyan = "#2aa198" -green = "#859900" diff --git a/vendor/themes/solarized_light.toml b/vendor/themes/solarized_light.toml deleted file mode 100644 index 2db54ca1..00000000 --- a/vendor/themes/solarized_light.toml +++ /dev/null @@ -1,155 +0,0 @@ -"attribute" = { fg = "violet" } -"keyword" = { fg = "green" } -"keyword.directive" = { fg = "orange" } -"namespace" = { fg = "violet" } -"operator" = { fg = "green" } -"special" = { fg = "orange" } -"variable.builtin" = { fg = "cyan", modifiers = ["bold"] } -"variable.function" = { fg = "blue" } -"type" = { fg = "yellow" } -"type.builtin" = { fg = "yellow", modifiers = ["bold"] } -"constructor" = { fg = "blue" } -"function" = { fg = "blue" } -"function.macro" = { fg = "magenta" } -"function.builtin" = { fg = "blue", modifiers = ["bold"] } -"function.special" = { fg = "magenta" } -"comment" = { fg = "base01" } -"string" = { fg = "cyan" } -"constant" = { fg = "cyan" } -"constant.builtin" = { fg = "cyan", modifiers = ["bold"] } -"constant.character.escape" = { fg = "red", modifiers = ["bold"] } -"label" = { fg = "green" } -"module" = { fg = "violet" } -"tag" = { fg = "magenta" } - -# TODO -"markup.heading" = "blue" -"markup.list" = "red" -"markup.bold" = { fg = "yellow", modifiers = ["bold"] } -"markup.italic" = { fg = "magenta", modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } -"markup.link.text" = "red" -"markup.quote" = "cyan" -"markup.raw" = "green" - -"diff.plus" = { fg = "green" } -"diff.delta" = { fg = "yellow" } -"diff.minus" = { fg = "red" } - -# 背景 -# background -"ui.background" = { bg = "base03" } - -"ui.virtual.whitespace" = { fg = "base01" } -"ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] } -"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] } - -# 行å�·æ � -# line number column -"ui.linenr" = { fg = "base0", bg = "base02" } -# 当å‰�行å�·æ � -# current line number column -"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] } -# cursorline -"ui.cursorline" = { bg = "base0" } - -# 状æ€�æ � -# status bar -"ui.statusline" = { fg = "base03", bg = "base0" } -"ui.statusline.normal" = { bg = "blue" } -"ui.statusline.insert" = { bg = "green" } -"ui.statusline.select" = { bg = "yellow" } - -# é�žæ´»åŠ¨çŠ¶æ€�æ � -# inactive status bar -"ui.statusline.inactive" = { fg = "base1", bg = "base01" } - -# 补全窗å�£, preview窗å�£ -# Completion window, preview window -"ui.popup" = { bg = "base02" } -# å½±å“� 补全选中 cmd弹出信æ�¯é€‰ä¸­ -# Affect completion selection, cmd pop-up information selection -"ui.menu.selected" = { fg = "base02", bg = "base2"} -"ui.menu" = { fg = "base0", bg = "base02" } -# ?? -"ui.window" = { fg = "base3" } -# 命令行 补全的帮助信æ�¯ -# Command line completion help information -"ui.help" = { modifiers = ["reversed"] } - -# å¿«æ�·é”®çª—å�£ -# Shortcut window -"ui.popup.info" = { bg = "base1" } -# å¿«æ�·é”®å­—体 -# Shortcut font -"ui.text.info" = {fg = "base02", modifiers = ["bold"]} - -# 普通ui的字体样å¼� -# Normal ui font style -"ui.text" = { fg = "base1" } -# å½±å“� picker列表选中, å¿«æ�·é”®å¸®åŠ©çª—å�£æ–‡æœ¬ -# Affects picker list selection, shortcut key help window text -"ui.text.focus" = { fg = "blue", modifiers = ["bold"]} - -# 主光标/selection -# main cursor/selection -"ui.cursor.primary" = { fg = "base03", bg = "base1" } -"ui.cursor.select" = { fg = "base02", bg = "cyan" } - -"ui.cursorline.primary" = { bg = "base02" } -"ui.cursorline.secondary" = { bg = "base025" } - -"ui.selection" = { bg = "base0175" } -"ui.selection.primary" = { bg = "base015" } - -"ui.virtual.indent-guide" = { fg = "base02" } -"ui.virtual.ruler" = { bg = "base02" } - -# normal模å¼�的光标 -# normal mode cursor -"ui.cursor" = {fg = "base02", bg = "cyan"} -"ui.cursor.insert" = {fg = "base03", bg = "base3"} -# 当å‰�光标匹é…�的标点符å�· -# The punctuation character matched by the current cursor -"ui.cursor.match" = { fg = "base02", bg = "base015" } - -"warning" = { fg = "orange", modifiers= ["bold", "underlined"] } -"error" = { fg = "red", modifiers= ["bold", "underlined"] } -"info" = { fg = "blue", modifiers= ["bold", "underlined"] } -"hint" = { fg = "base01", modifiers= ["bold", "underlined"] } - -"diagnostic.warning" = { underline = { style = "curl", color = "orange" } } -"diagnostic.error" = { underline = { style = "curl", color = "red" } } -"diagnostic.info" = { underline = { style = "curl", color = "blue" } } -"diagnostic.hint" = { underline = { style = "curl", color = "base01" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } - - -[palette] -red = '#dc322f' -green = '#859900' -yellow = '#b58900' -blue = '#268bd2' -magenta = '#d33682' -cyan = '#2aa198' -orange = '#cb4b16' -violet = '#6c71c4' - -# 深色 è¶Šæ�¥è¶Šæ·± -# dark getting darker -base0 = '#657b83' -base1 = '#586e75' -base2 = '#073642' -base3 = '#002b36' - -# 浅色 越來越浅 -# Lighter and lighter -base00 = '#839496' -base01 = '#93a1a1' -base015 = '#c5c8bd' -base0175 = '#dddbcc' -base02 = '#eee8d5' -base025 = '#f5eedb' -base03 = '#fdf6e3' diff --git a/vendor/themes/tokyonight_day.toml b/vendor/themes/tokyonight_day.toml deleted file mode 100644 index 18c3b45f..00000000 --- a/vendor/themes/tokyonight_day.toml +++ /dev/null @@ -1,41 +0,0 @@ -# Author: Paul Graydon - -inherits = "tokyonight" - -[palette] -red = "#f52a65" -orange = "#b15c00" -yellow = "#8c6c3e" -light-green = "#587539" -green = "#387068" -aqua = "#188092" -teal = "#118c74" -turquoise = "#006a83" -light-cyan = "#2e5857" -cyan = "#007197" -blue = "#2e7de9" -purple = "#7847bd" -magenta = "#9854f1" -comment = "#848cb5" -black = "#a1a6c5" - -add = "#aecde6" -change = "#d6d8e3" -delete = "#dfccd4" - -error = "#c64343" -hint = "#118c74" -info = "#07879d" - -fg = "#3760bf" -fg-dark = "#6172b0" -fg-gutter = "#a8aecb" -fg-linenr = "#68709a" -fg-selected = "#b3b8d1" -border = "#e9e9ed" -border-highlight = "#2496ac" -bg = "#e1e2e7" -bg-inlay = "#acd7eb" -bg-selection = "#c4c8da" -bg-menu = "#e9e9ec" -bg-focus = "#b6bfe2" diff --git a/vendor/themes/tokyonight_moon.toml b/vendor/themes/tokyonight_moon.toml deleted file mode 100644 index 09b38db3..00000000 --- a/vendor/themes/tokyonight_moon.toml +++ /dev/null @@ -1,41 +0,0 @@ -# Author: Paul Graydon - -inherits = "tokyonight" - -[palette] -red = "#ff757f" -orange = "#ff966c" -yellow = "#ffc777" -light-green = "#c3e88d" -green = "#4fd6be" -aqua = "#65bcff" -teal = "#4fd6be" -turquoise = "#89ddff" -light-cyan = "#b4f9f8" -cyan = "#86e1fc" -blue = "#82aaff" -purple = "#fca7ea" -magenta = "#c099ff" -comment = "#636da6" -black = "#444a73" - -add = "#b8db87" -change = "#7ca1f2" -delete = "#e26a75" - -error = "#c53b53" -hint = "#4fd6be" -info = "#0db9d7" - -fg = "#c8d3f5" -fg-dark = "#828bb8" -fg-gutter = "#3b4261" -fg-linenr = "#737aa2" -fg-selected = "#363c58" -border = "#1b1d2b" -border-highlight = "#589ed7" -bg = "#222436" -bg-inlay = "#273644" -bg-selection = "#2f334d" -bg-menu = "#1e2030" -bg-focus = "#2d3f76" diff --git a/vendor/themes/tokyonight_storm.toml b/vendor/themes/tokyonight_storm.toml deleted file mode 100644 index 7bdddd8b..00000000 --- a/vendor/themes/tokyonight_storm.toml +++ /dev/null @@ -1,12 +0,0 @@ -# Author: Paul Graydon - -inherits = "tokyonight" - -[palette] -border = "#1d202f" -bg = "#24283b" -bg-inlay = "#233745" -bg-selection = "#373d5a" -bg-menu = "#1f2335" -bg-focus = "#2e3c64" -border-highlight = "#29a4bd" -- cgit v1.3 From 3ad8a8117435124d5df8c1d70de62c32dd97e113 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 28 Oct 2026 21:23:53 -0300 Subject: one copy of each codec: PNG and JPEG through wuffs (ghostty's, already linked by ghostty-vt), stb_image without them, its writer and its inflate, SDL without its private stb_image; a symbol-table guard; docs/shared-libs.md ReleaseFast before, both binaries carried stb_image's PNG, JPEG and inflate beside wuffs's (whose function tables keep its decoders linked whatever pardes calls), stb_image_write and its deflate (unused), and the GUI a second stb_image of SDL's (SDL_stb.c, for SDL_LoadPNG and camera MJPEG). Now: - image.zig decodes PNG and JPEG with wuffs (`wuffs_images`, wherever ghostty-vt is in the build), sized from the IHDR or the first SOF before decoding, as stb's info call sized them; other formats and the builds without ghostty-vt keep stb_image. - build.zig compiles zstbi with -DSTBI_NO_PNG -DSTBI_NO_JPEG and patches its stb_image_write include out (one count-checked anchor; a no-op stbi_flip_vertically_on_write stays for zstbi.deinit), and SDL with SDL_DISABLE_STB. Text: tty -74,488 bytes, gui -154,392. `zig build shared-libs-check` (in unit-test, ELF) reads the linked symbol table and fails on a family the build chose against: stb's PNG/JPEG/inflate beside wuffs, a second stb_image, stb_image_write's deflate, a second zlib or FreeType. Checked against the old binaries: it names every one. docs/shared-libs.md: the inventory (implementation, users, copies and bytes before and after, allocator hook) and where one copy was not possible: zlib and wuffs both inflate (FreeType's and MuPDF's zlib API vs ghostty's kitty o=z), MuPDF's libjpeg beside wuffs (filter-dct.c is libjpeg's API), MuPDF's unreached fitz image loaders, base64 in Zig std/simdutf/MuPDF, per-library Unicode code, std.debug's flate. Co-Authored-By: Claude Opus 5.5 --- build.zig | 54 ++++++++++++++++++ docs/shared-libs.md | 120 +++++++++++++++++++++++++++++++++++++++ src/CHANGELOG.md | 8 +++ src/image.zig | 135 ++++++++++++++++++++++++++++++++++++++++++-- tools/shared_libs_check.zig | 127 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 439 insertions(+), 5 deletions(-) create mode 100644 docs/shared-libs.md create mode 100644 tools/shared_libs_check.zig (limited to 'tools') diff --git a/build.zig b/build.zig index 93114103..2f1c45e1 100644 --- a/build.zig +++ b/build.zig @@ -911,6 +911,34 @@ pub fn build(b: *std.Build) void { // override uucode on vaxis LAST so it wins over ghostty's build() wiring. vaxis_mod.addImport("uucode", uucode_mod); + // One PNG and one JPEG decoder (docs/shared-libs.md): ghostty's, wuffs, + // which ghostty-vt links for kitty graphics whatever pardes does (its + // decoders stay in through wuffs's function tables). Where it is in the + // build, image.zig decodes PNG and JPEG through it, and stb_image is + // compiled without them, so without the inflate only its PNG used. Its + // writer goes too, and the deflate it carries: pardes writes no image + // through stb. A fresh fetch keeps both: the flags and the patch are + // applied here, at build time. + const wuffs_mod: ?*std.Build.Module = if (ghostty_core_vt) |vt| vt.import_table.get("wuffs") else null; + for ([_]?*std.Build.Step.Options{ opts, gui_opts }) |o| if (o) |x| x.addOption(bool, "wuffs_images", wuffs_mod != null); + if (wuffs_mod != null) if (zstbi_dep) |dep| { + var sources: usize = 0; + for (zstbi_mod.link_objects.items) |obj| switch (obj) { + .c_source_file => |csf| { + sources += 1; + const src = configureRead(b, io, dep.builder.root, "src/zstbi.c", 1 << 20) catch @panic("read zstbi.c"); + const writer = "#define STB_IMAGE_WRITE_IMPLEMENTATION\n#include \"stb_image_write.h\"\n"; + if (std.mem.count(u8, src, writer) != 1) std.debug.panic("zstbi.c changed at `{s}`: redo its patch in build.zig", .{writer}); + // zstbi.deinit still resets the writer's flip flag. + const patched = std.mem.replaceOwned(u8, b.allocator, src, writer, "void stbi_flip_vertically_on_write(int flag) { (void)flag; }\n") catch @panic("OOM"); + csf.file = b.addWriteFiles().add("zstbi.c", patched); + csf.flags = std.mem.concat(b.allocator, []const u8, &.{ csf.flags, &.{ "-DSTBI_NO_PNG", "-DSTBI_NO_JPEG" } }) catch @panic("OOM"); + }, + else => {}, + }; + if (sources != 1) @panic("zstbi's build no longer compiles one C file: redo its patch in build.zig"); + }; + // One call per module instead of one line per module per dependency, and // BEFORE the fold below, which reads what these imports put in the table. for (core_mods) |m| wireCore(m, .{ @@ -925,6 +953,7 @@ pub fn build(b: *std.Build) void { .ghostty_vt = ghostty_core_vt, .vaxis = vaxis_mod, .uucode = uucode_mod, + .wuffs = wuffs_mod, }); const iso_off = b.addOptions(); @@ -973,6 +1002,10 @@ pub fn build(b: *std.Build) void { const sdl_dep = b.lazyDependency("sdl", .{ .target = target, .optimize = optimize, .sanitize_c = .off, .preferred_linkage = .static }); if (sdl_dep) |dep| { const sdl_lib = dep.artifact("SDL3"); + // SDL's own stb_image (SDL_stb.c, for SDL_LoadPNG and a camera's + // MJPEG, neither of which pardes calls) is a second PNG and JPEG + // decoder beside the build's: off (docs/shared-libs.md). + sdl_lib.root_module.addCMacro("SDL_DISABLE_STB", "1"); gm.linkLibrary(sdl_lib); gm.addIncludePath(dep.path("include")); // gui.zig's `c`: SDL and the font shim, which @cImport gave it before Zig 0.17. @@ -1682,6 +1715,25 @@ pub fn build(b: *std.Build) void { b.step("history", "compare command output and test/build runtime across jj revisions").dependOn(&run_history.step); const unit_step = b.step("unit-test", "run native shell and module unit tests"); + // One copy of each codec in the binary (docs/shared-libs.md): the + // linked symbol table, read for the families the build chose against. + // ELF only; it runs with every unit-test, like the perf gate. + if (target.result.ofmt == .elf) { + const libs_check = b.addExecutable(.{ + .name = "pardes-shared-libs-check", + .root_module = b.createModule(.{ + .target = b.graph.host, + .optimize = .debug, + .root_source_file = b.path("tools/shared_libs_check.zig"), + .link_libc = true, + }), + }); + const run_libs_check = b.addRunArtifact(libs_check); + run_libs_check.addArtifactArg(exe); + const libs_check_step = b.step("shared-libs-check", "fail when the binary links a second copy of a codec the build chose one of (docs/shared-libs.md)"); + libs_check_step.dependOn(&run_libs_check.step); + unit_step.dependOn(&run_libs_check.step); + } // The perf gate runs with every unit-test (a regression like a // contrast search per grapheme costs 100x, far past the gate). unit_step.dependOn(perf_gate_step); @@ -2055,6 +2107,7 @@ fn wireCore(m: *std.Build.Module, d: struct { ghostty_vt: ?*std.Build.Module = null, vaxis: ?*std.Build.Module = null, uucode: ?*std.Build.Module = null, + wuffs: ?*std.Build.Module = null, }) void { if (d.themes) |x| m.addImport("generated_themes", x); if (d.tree_sitter) |x| m.addImport("tree-sitter", x); @@ -2067,6 +2120,7 @@ fn wireCore(m: *std.Build.Module, d: struct { if (d.ghostty_vt) |x| m.addImport("ghostty-vt", x); if (d.vaxis) |x| m.addImport("vaxis", x); if (d.uucode) |x| m.addImport("uucode", x); + if (d.wuffs) |x| m.addImport("wuffs", x); } /// The CPU feature set for the ESP32-P4 firmware target, as a `Cpu.Feature.Set`. Spelled as a diff --git a/docs/shared-libs.md b/docs/shared-libs.md new file mode 100644 index 00000000..79f3cdb9 --- /dev/null +++ b/docs/shared-libs.md @@ -0,0 +1,120 @@ +# One copy of each library + +The policy (2026-09-24): + +- **One copy per library in a binary.** When a dependency bundles a library + the build also has, a build change makes it use the build's copy. Duplicates + link silently: same symbol names, the linker keeps one of each, and the two + copies were compiled with different options. +- **Every C library allocates through a Zig allocator** where it has a hook, + so tests run its allocations under the Debug allocator. +- **Patches to fetched packages are applied in build.zig at build time**, each + behind a count-checked anchor (as for vaxis and mvzr), because a fresh fetch + would clobber a patch made in zig-pkg. +- **This file lists what is shared, and where the policy could not be met.** + +`zig build shared-libs-check -Dplatform=tty|gui` (it also runs with every +`unit-test`) reads the linked binary's ELF symbol table. It fails when a family +the build chose against is linked again: stb_image's PNG, JPEG or inflate +beside wuffs, a second stb_image, stb_image_write's deflate, a second zlib, or +a second FreeType (tools/shared_libs_check.zig). It counts static functions +too, and several functions per family, because a release build inlines some +of them. + +## Inventory (ghostty 1.4.0, 2026-10-28) + +Sizes are function bytes in the ReleaseFast symbol tables (`nm -S`). The tty +and gui columns are the two binaries. + +| Job | Implementation | Who uses it | Copies before → after | Bytes before → after (tty / gui) | Allocator | +|---|---|---|---|---|---| +| PNG decode | wuffs (ghostty-vt's `pkg/wuffs`) | ghostty-vt; **now pardes's image panes and its kitty `f=100` hook** | 1 → 1 | 35.0 KiB, unchanged (already linked: wuffs's function tables keep its decoders in) | Zig allocator: ghostty's wrapper allocates every work buffer | +| PNG decode | stb_image (zstbi) | image panes, kitty `f=100` | 1 / 2 → **0** | 17.9 / 25.2 KiB → 0 | removed | +| PNG and JPEG decode | SDL's private stb_image (`SDL_stb.c`) | `SDL_LoadPNG` and camera MJPEG, which pardes never calls | gui 1 → **0** (`SDL_DISABLE_STB`) | counted in the stb rows; glue 4.9 → 0.6 KiB | (SDL_malloc) | +| PNG decode | MuPDF's `fz_load_png` (on our zlib) | `fz_new_image_from_buffer` only, which PDF rendering does not call | 1 → 1 | 6.3 KiB | fz allocator | +| JPEG decode | wuffs | **now image panes** | 1 → 1 | 39.4 KiB, unchanged | Zig allocator | +| JPEG decode | stb_image | image panes | 1 / 2 → **0** | 18.1 / 38.1 KiB → 0 | removed | +| JPEG decode | MuPDF's libjpeg | PDF `DCTDecode` | 1 → 1 | 114.9 KiB | fz allocator (MuPDF's memory manager) | +| GIF, BMP, TGA, PSD, HDR, PIC, PNM | stb_image | image panes | 1 → 1 | 22.3 KiB | Zig allocator (`zstbi.init`) | +| Image resize | stb_image_resize | image panes (downscale) | 1 → 1 | 28.4 KiB | Zig allocator | +| Image write (and its deflate) | stb_image_write | nothing | 1 → **0** (patched out of zstbi.c) | 30.6 KiB → 0 | removed | +| Inflate | zlib (allyourcodebase) | FreeType gzip, MuPDF `FlateDecode` | 1 → 1 (MuPDF links FreeType's, mupdf.zig) | 15.5 + 9.7 + 4.6 KiB | per stream: MuPDF's `fz_zlib_alloc`, FreeType's `FT_Memory` | +| Inflate | wuffs zlib/deflate | ghostty-vt: kitty `o=z` | 1 → 1 | 17.2 KiB | Zig allocator | +| Inflate | stb_image's own | stb PNG | 1 / 2 → **0** | 1.1 / 2.3 KiB → 0 (most of it was inlined into the PNG decoder) | removed | +| Fonts | FreeType (allyourcodebase) | gui glyph atlas, MuPDF (built against it, not its slim bundle) | 1 → 1 | 331 KiB | gui: `ui_malloc` (c_heap); MuPDF's library: `FT_MemoryRec` on fz | +| Shaping | HarfBuzz 11.0.0 (the tarball ghostty pins) | gui | 1 → 1 | 143 KiB | `hb_*_impl` → `ui_*` | +| JPEG 2000, JBIG2 | openjpeg, jbig2dec (inside MuPDF) | PDF | 1 → 1 | 66 KiB (jbig2) | `fz_opj_malloc`, `Jbig2Allocator` on fz | +| Unicode properties | uucode | ghostty-vt, vaxis, pardes: one module (`external_uucode`) | 1 → 1 | | Zig | +| UTF-8, base64 (SIMD) | simdutf, highway | ghostty-vt | 1 → 1 | 206 KiB (debug) | none: allocates nothing in these paths | +| Regex | mvzr | pardes | 1 → 1 | 17 KiB | Zig | +| Parsing | tree-sitter | pardes | 1 → 1 | | `ts_set_allocator` → c_heap | +| Window, input, GPU | SDL 3.4.18 | gui | 1 → 1 | 1009 KiB | `SDL_SetMemoryFunctions` | + +Text section: tty 61,369,343 → 61,294,855 bytes (**−74,488**); gui +67,336,392 → 67,182,000 bytes (**−154,392**). + +## What changed (this change) + +- **PNG and JPEG are wuffs's**, the decoders ghostty itself uses. image.zig + calls them wherever ghostty-vt is in the build (`wuffs_images`). Each image + is sized from its header first: PNG's IHDR, JPEG's first SOF. Other formats, + and builds without ghostty-vt (esp32p4, web), stay on stb_image. +- **zstbi is compiled with `-DSTBI_NO_PNG -DSTBI_NO_JPEG`.** That also drops + stb's inflate, which only PNG used. Its `stb_image_write` include is patched + out (one count-checked anchor), with a no-op `stbi_flip_vertically_on_write` + left for `zstbi.deinit`. Both happen in build.zig, so a fresh fetch keeps + them. +- **SDL is compiled with `SDL_DISABLE_STB`.** `SDL_LoadPNG` and MJPEG camera + frames then report unsupported; pardes calls neither. + +## Where one copy was not possible + +- **Two inflates: zlib and wuffs.** FreeType and MuPDF call zlib's C API + (`inflateInit2_`, `inflate`, raw and zlib streams). ghostty-vt calls + `wuffs.zlib.decode` for kitty `o=z`. One of them would have to go: + - Dropping zlib needs a zlib-API shim over wuffs's streaming decoder. + - Dropping wuffs needs a patch to ghostty's `graphics_image.zig` that points + away from ghostty's own choice. + + Neither is small, and each copy is about 17 KiB. +- **Two JPEG decoders: MuPDF's libjpeg and wuffs.** MuPDF's `DCTDecode` filter + (`filter-dct.c`) is written against libjpeg's streaming source-manager API. + Moving PDFs onto wuffs means a new DCT filter for fitz. Moving image panes + onto libjpeg instead would leave the builds without MuPDF (esp32p4, web) + with no JPEG decoder. +- **MuPDF's fitz image loaders** (`fz_load_png`, `_jpeg`, `_gif`, `_bmp`, + `_tiff`, `_pnm`, `_psd`; 16.7 KiB together). They are compiled because + mupdf.zig builds all of `source/fitz`. They are reachable only through + `fz_new_image_from_buffer`, which PDF rendering does not call. Dropping + them means stubbing fitz's image-type dispatch (`image.c`) at build time. + Left in. +- **base64**: + - Zig's `std.base64`: pardes (dumps, the tty's kitty output) and vaxis. + - simdutf's: ghostty-vt, for kitty payloads. + - MuPDF's own: unused paths. + + Pure Zig beside C++, so lower priority. Going through simdutf from pardes + would mean importing ghostty's SIMD module surface. +- **Unicode text**: uucode is shared. Each of these still carries its own + UTF-8 and property code for its own job: + - ghostty's generated `unicode_tables` (built from the same uucode); + - HarfBuzz's UCD; + - SDL's `SDL_utf8*`; + - MuPDF's `fz_chartorune`; + - simdutf. + + None of them is a separate copy of the same library. +- **Image scaling**: stb_image_resize (image panes) beside MuPDF's pixmap + scaler and SDL's blitter. These are three algorithms with different jobs, + not one library twice. +- **Zig's `std.compress.flate`** (15 KiB): std.debug pulls it in to read + compressed debug sections for stack traces. It is not a codec pardes + calls. +- **zigimg** (vaxis's image loader, pure Zig): vaxis only uses it to load + images from paths, which pardes never asks for. Zig compiles only what is + referenced, so none of it is linked. +- **libc++**: simdutf's build links Zig's bundled libc++ (`link_libcpp` unless + MSVC). It is one copy, and its `new`/`delete` go to libc's malloc, not a Zig + allocator. +- **simdutf and highway**: no allocator hook, and none needed; the paths + ghostty uses allocate nothing (`HWY_NO_LIBCXX`, `SIMDUTF_NO_LIBCXX`). diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 7aab597d..4466ad26 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -2,6 +2,14 @@ ## Unreleased +- One PNG and one JPEG decoder in a binary: images decode through wuffs, + the decoders ghostty uses (ghostty-vt already links them), and stb_image + keeps only the other formats. stb's own inflate and image writer go, as + does SDL's private stb_image, which pardes never called: 73 KB less code + in the tty binary, 151 KB in the GUI. `zig build shared-libs-check` (run + with unit-test) fails if a second copy of one of them comes back; + docs/shared-libs.md lists what is shared and where one copy was not + possible. - Kitty graphics in a terminal pane take every medium kitty and ghostty do: a file (`t=f`), a temporary file (`t=t`) and shared memory (`t=s`) beside direct data, so `kitten icat` no longer falls back to base64 diff --git a/src/image.zig b/src/image.zig index 5ceadd76..e334965a 100644 --- a/src/image.zig +++ b/src/image.zig @@ -756,6 +756,71 @@ var started = false; extern fn stbi_info_from_memory(buffer: [*]const u8, len: c_int, x: *c_int, y: *c_int, comp: *c_int) c_int; +/// PNG and JPEG are ghostty's decoders (wuffs, which ghostty-vt links for +/// kitty graphics) wherever ghostty-vt is in the build; stb_image is then +/// compiled without them, and without the inflate only its PNG used +/// (build.zig, docs/shared-libs.md). Other formats, and builds without +/// ghostty-vt, are stb_image's. +const wuffs_images = @hasDecl(@import("pardes_config"), "wuffs_images") and @import("pardes_config").wuffs_images; +const wuffs = if (wuffs_images) @import("wuffs") else struct {}; + +const Format = enum { png, jpeg, other }; + +fn format(bytes: []const u8) Format { + if (std.mem.startsWith(u8, bytes, "\x89PNG\r\n\x1a\n")) return .png; + if (bytes.len >= 3 and bytes[0] == 0xff and bytes[1] == 0xd8 and bytes[2] == 0xff) return .jpeg; + return .other; +} + +const Size = struct { w: usize, h: usize }; + +/// An image's size from its header alone, before anything is decoded. +fn headerSize(bytes: []const u8) ?Size { + if (comptime wuffs_images) switch (format(bytes)) { + .png => { + // The signature, then IHDR first: length, type, width, height. + if (bytes.len < 24 or !std.mem.eql(u8, bytes[12..16], "IHDR")) return null; + return .{ .w = std.mem.readInt(u32, bytes[16..20], .big), .h = std.mem.readInt(u32, bytes[20..24], .big) }; + }, + .jpeg => return jpegSize(bytes), + .other => {}, + }; + var iw: c_int = 0; + var ih: c_int = 0; + var ic: c_int = 0; + if (stbi_info_from_memory(bytes.ptr, @intCast(bytes.len), &iw, &ih, &ic) != 1) return null; + return .{ .w = @intCast(@max(0, iw)), .h = @intCast(@max(0, ih)) }; +} + +/// A JPEG's size, from its first start-of-frame segment (any SOFn but the +/// DHT, JPG and DAC markers that share their range). +fn jpegSize(bytes: []const u8) ?Size { + var at: usize = 2; + while (at + 4 <= bytes.len) { + if (bytes[at] != 0xff) return null; + const marker = bytes[at + 1]; + // Fill bytes, and the markers that stand alone. + if (marker == 0xff) { + at += 1; + continue; + } + if (marker == 0x01 or (marker >= 0xd0 and marker <= 0xd7)) { + at += 2; + continue; + } + const len = std.mem.readInt(u16, bytes[at + 2 ..][0..2], .big); + if (len < 2) return null; + const sof = marker >= 0xc0 and marker <= 0xcf and marker != 0xc4 and marker != 0xc8 and marker != 0xcc; + if (sof) { + if (at + 9 > bytes.len) return null; + return .{ .w = std.mem.readInt(u16, bytes[at + 7 ..][0..2], .big), .h = std.mem.readInt(u16, bytes[at + 5 ..][0..2], .big) }; + } + if (marker == 0xda) return null; // scan data before any frame + at += 2 + len; + } + return null; +} + /// Whether `bytes` are an image `decode` can read, from its header alone. pub fn readable(bytes: []const u8) bool { if (bytes.len == 0 or bytes.len > std.math.maxInt(c_int)) return false; @@ -763,6 +828,7 @@ pub fn readable(bytes: []const u8) bool { var h: c_int = 0; var c: c_int = 0; if (!started) return true; // ponytail: no stb_image yet (a unit test), so no judging + if (comptime wuffs_images) if (format(bytes) != .other) return headerSize(bytes) != null; return stbi_info_from_memory(bytes.ptr, @intCast(bytes.len), &w, &h, &c) == 1; } @@ -776,13 +842,33 @@ pub fn decode(gpa: std.mem.Allocator, bytes: []const u8) ?Decoded { if (!started) return null; if (bytes.len == 0 or bytes.len > std.math.maxInt(c_int)) return null; // Bounded before decoding: a few KB of PNG can name gigapixels. - var iw: c_int = 0; - var ih: c_int = 0; - var ic: c_int = 0; - if (stbi_info_from_memory(bytes.ptr, @intCast(bytes.len), &iw, &ih, &ic) != 1) return null; - if (@as(usize, @intCast(@max(0, iw))) * @as(usize, @intCast(@max(0, ih))) > @import("memory.zig").limits.image_decode_pixels) return null; + const size = headerSize(bytes) orelse return null; + const pixels = std.math.mul(usize, size.w, size.h) catch return null; + if (pixels > @import("memory.zig").limits.image_decode_pixels) return null; + if (comptime wuffs_images) switch (format(bytes)) { + inline .png, .jpeg => |f| { + const got = @field(wuffs, @tagName(f)).decode(gpa, bytes) catch return null; + defer gpa.free(got.data); + if (got.data.len != @as(usize, got.width) * got.height * 4) return null; + return finish(gpa, .{ + .data = got.data, + .width = got.width, + .height = got.height, + .num_components = 4, + .bytes_per_component = 1, + .bytes_per_row = got.width * 4, + .is_hdr = false, + }); + }, + .other => {}, + }; var img = zstbi.Image.loadFromMemory(bytes, 4) catch return null; // 4 = RGBA defer img.deinit(); + return finish(gpa, img); +} + +/// The decoded RGBA, scaled to MAX_DIM at most, in a gpa copy. +fn finish(gpa: std.mem.Allocator, img: zstbi.Image) ?Decoded { var scaled: ?zstbi.Image = null; defer if (scaled) |*s| s.deinit(); const longest = @max(img.width, img.height); @@ -796,6 +882,45 @@ pub fn decode(gpa: std.mem.Allocator, bytes: []const u8) ?Decoded { return .{ .rgba = rgba, .w = src.width, .h = src.height }; } +test "PNG and JPEG decode through wuffs, sized from their headers first; other formats through stb_image" { + const gpa = std.testing.allocator; + start(std.testing.io, gpa); + defer stop(); + const dec = std.base64.standard.Decoder; + const Fixture = struct { b64: []const u8, w: usize, h: usize, rgb: [3]u8, tolerance: u8 }; + const fixtures = [_]Fixture{ + // 4x2, red left, blue right (a hand-built PNG). + .{ .b64 = "iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAIAAADwyuo0AAAAE0lEQVR4nGP4z8AARGDiPwMyBwBnsgf5Q2OaZwAAAABJRU5ErkJggg==", .w = 4, .h = 2, .rgb = .{ 255, 0, 0 }, .tolerance = 0 }, + // 16x8 of (200,30,30), baseline and progressive (Pillow, quality 95). + .{ .b64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAIBAQEBAQIBAQECAgICAgQDAgICAgUEBAMEBgUGBgYFBgYGBwkIBgcJBwYGCAsICQoKCgoKBggLDAsKDAkKCgr/2wBDAQICAgICAgUDAwUKBwYHCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr/wAARCAAIABADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD5Dooor8LP9VD/2Q==", .w = 16, .h = 8, .rgb = .{ 200, 30, 30 }, .tolerance = 6 }, + .{ .b64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAIBAQEBAQIBAQECAgICAgQDAgICAgUEBAMEBgUGBgYFBgYGBwkIBgcJBwYGCAsICQoKCgoKBggLDAsKDAkKCgr/2wBDAQICAgICAgUDAwUKBwYHCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr/wgARCAAIABADASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAf/xAAVAQEBAAAAAAAAAAAAAAAAAAAGCP/aAAwDAQACEAMQAAABkIC1V//EABQQAQAAAAAAAAAAAAAAAAAAABD/2gAIAQEAAQUCP//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQMBAT8Bf//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQIBAT8Bf//EABQQAQAAAAAAAAAAAAAAAAAAABD/2gAIAQEABj8CP//EABQQAQAAAAAAAAAAAAAAAAAAABD/2gAIAQEAAT8hP//aAAwDAQACAAMAAAAQA//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQMBAT8Qf//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQIBAT8Qf//EABQQAQAAAAAAAAAAAAAAAAAAABD/2gAIAQEAAT8QP//Z", .w = 16, .h = 8, .rgb = .{ 200, 30, 30 }, .tolerance = 6 }, + }; + for (fixtures) |f| { + const bytes = try gpa.alloc(u8, try dec.calcSizeForSlice(f.b64)); + defer gpa.free(bytes); + try dec.decode(bytes, f.b64); + try std.testing.expect(readable(bytes)); + const size = headerSize(bytes).?; + try std.testing.expectEqual(Size{ .w = f.w, .h = f.h }, size); + const got = decode(gpa, bytes) orelse return error.NotDecoded; + defer gpa.free(got.rgba); + try std.testing.expectEqual(f.w, got.w); + try std.testing.expectEqual(f.h, got.h); + for (got.rgba[0..3], f.rgb) |have, want| try std.testing.expect(@max(have, want) - @min(have, want) <= f.tolerance); + try std.testing.expectEqual(@as(u8, 255), got.rgba[3]); + } + // A PPM still goes through stb_image. + const ppm = "P6\n2 1\n255\n\x0d\x4d\xe7\x0d\x4d\xe7"; + try std.testing.expectEqual(Format.other, format(ppm)); + const got = decode(gpa, ppm) orelse return error.NotDecoded; + defer gpa.free(got.rgba); + try std.testing.expectEqualSlices(u8, &.{ 0x0d, 0x4d, 0xe7, 255 }, got.rgba[0..4]); + // Truncated headers are no image, never a read past the end. + try std.testing.expect(headerSize("\x89PNG\r\n\x1a\n\x00\x00") == null); + try std.testing.expect(headerSize("\xff\xd8\xff\xe0\x00\x10JFIF") == null); + try std.testing.expect(decode(gpa, "\xff\xd8\xff\xe0\x00\x10JFIF") == null); +} + // ---- the image pane ---- const GridKey = struct { diff --git a/tools/shared_libs_check.zig b/tools/shared_libs_check.zig new file mode 100644 index 00000000..d18c6850 --- /dev/null +++ b/tools/shared_libs_check.zig @@ -0,0 +1,127 @@ +//! One copy of each codec in a pardes binary (docs/shared-libs.md). +//! +//! zig build shared-libs-check -Dplatform=tty|gui +//! +//! Reads the linked executable's ELF symbol table and fails when a family of +//! symbols the build has chosen against is in it: a second PNG, JPEG or +//! inflate implementation beside the one docs/shared-libs.md names for the +//! job. The families are named by functions each copy defines (static ones +//! too: the symbol table keeps locals), so a dependency that brings its own +//! copy back shows here, whatever its symbols are called in the end. +const std = @import("std"); + +const Family = struct { + /// What the family is, and what the build uses instead. + what: []const u8, + /// Functions only that copy defines; an optimized build inlines some + /// of them, so a copy counts as linked when any is there, as many + /// times as the most of them are. + symbols: []const []const u8, + /// How many copies may be linked (0: none). + most: usize = 0, +}; + +const stb_png = [_][]const u8{ "stbi__png_load", "stbi__parse_png_file", "stbi__create_png_image_raw" }; +const stb_jpeg = [_][]const u8{ "stbi__jpeg_load", "stbi__decode_jpeg_header", "stbi__jpeg_decode_block" }; +const stb_inflate = [_][]const u8{ "stbi__parse_zlib", "stbi__do_zlib", "stbi__zbuild_huffman", "stbi__zhuffman_decode" }; +const stb_deflate = [_][]const u8{ "stbi_zlib_compress", "stbiw__zlib_bitrev", "stbi_write_png_to_mem" }; + +/// Banned in every binary that links ghostty-vt (wuffs decodes PNG and +/// JPEG; zlib and wuffs are the two inflates, see docs/shared-libs.md). +const with_wuffs = [_]Family{ + .{ .what = "stb_image's PNG decoder (wuffs decodes PNG: STBI_NO_PNG)", .symbols = &stb_png }, + .{ .what = "stb_image's JPEG decoder (wuffs decodes JPEG: STBI_NO_JPEG)", .symbols = &stb_jpeg }, + .{ .what = "stb_image's own inflate (zlib and wuffs inflate)", .symbols = &stb_inflate }, +}; + +/// Banned everywhere. +const always = [_]Family{ + // SDL's SDL_stb.c (SDL_LoadPNG, camera MJPEG) is off: SDL_DISABLE_STB. + .{ .what = "a second stb_image PNG decoder (SDL_stb.c)", .symbols = &stb_png, .most = 1 }, + .{ .what = "a second stb_image JPEG decoder (SDL_stb.c)", .symbols = &stb_jpeg, .most = 1 }, + // zstbi's stb_image_write, patched out: its own deflate beside zlib's. + .{ .what = "stb_image_write and its deflate (zlib deflates)", .symbols = &stb_deflate }, + // One zlib: FreeType's, which MuPDF links (mupdf.zig). + .{ .what = "a second zlib", .symbols = &.{ "inflate_table", "inflate_fast", "deflate_slow" }, .most = 1 }, + // One FreeType: the build's, which MuPDF is compiled against. + .{ .what = "a second FreeType", .symbols = &.{ "FT_Init_FreeType", "FT_New_Library" }, .most = 1 }, +}; + +pub fn main(init: std.process.Init) !void { + var arena_state: std.heap.ArenaAllocator = .init(std.heap.page_allocator); + defer arena_state.deinit(); + const arena = arena_state.allocator(); + const args = try init.minimal.args.toSlice(arena); + if (args.len != 2) return error.BadArgs; + const bytes = try readFile(arena, try arena.dupeSentinel(u8, args[1], 0)); + + var counts = std.StringHashMap(usize).init(arena); + try symbols(bytes, &counts); + if (counts.count() == 0) { + std.debug.print("shared-libs-check: {s} has no symbol table (stripped?): nothing to check\n", .{args[1]}); + return; + } + const wuffs = counts.get("wuffs_zlib__decoder__transform_io") != null or + counts.get("wuffs_base__pixel_swizzler__prepare") != null; + var failed = false; + for ([2][]const Family{ &always, if (wuffs) &with_wuffs else &.{} }) |set| for (set) |family| { + var n: usize = 0; + var seen: []const u8 = family.symbols[0]; + for (family.symbols) |symbol| { + const here = counts.get(symbol) orelse 0; + if (here > n) { + n = here; + seen = symbol; + } + } + if (n > family.most) { + failed = true; + std.debug.print("shared-libs-check: {s}: `{s}` is linked {d} times (at most {d})\n", .{ family.what, seen, n, family.most }); + } + }; + if (failed) return error.DuplicateLibrary; + std.debug.print("shared-libs-check: one copy of each ({d} symbols{s})\n", .{ counts.count(), if (wuffs) ", wuffs present" else "" }); +} + +/// Counts every name in the ELF64 little-endian symbol tables of `bytes`. +fn symbols(bytes: []const u8, counts: *std.StringHashMap(usize)) !void { + if (bytes.len < @sizeOf(std.elf.Elf64_Ehdr) or !std.mem.eql(u8, bytes[0..4], "\x7fELF")) return error.NotElf; + if (bytes[std.elf.EI.CLASS] != std.elf.ELFCLASS64 or bytes[std.elf.EI.DATA] != std.elf.ELFDATA2LSB) return error.UnsupportedElf; + const eh = std.mem.bytesAsValue(std.elf.Elf64_Ehdr, bytes[0..@sizeOf(std.elf.Elf64_Ehdr)]); + const shoff: usize = @intCast(eh.e_shoff); + const shnum: usize = eh.e_shnum; + const shsize: usize = eh.e_shentsize; + if (shsize != @sizeOf(std.elf.Elf64_Shdr) or shoff + shnum * shsize > bytes.len) return error.BadSections; + const sections = std.mem.bytesAsSlice(std.elf.Elf64_Shdr, @as([]align(1) const u8, bytes[shoff..][0 .. shnum * shsize])); + for (sections) |section| { + if (section.sh_type != std.elf.SHT_SYMTAB) continue; + const strtab = sections[section.sh_link]; + const strings = bytes[@intCast(strtab.sh_offset)..][0..@intCast(strtab.sh_size)]; + const table = bytes[@intCast(section.sh_offset)..][0..@intCast(section.sh_size)]; + const syms = std.mem.bytesAsSlice(std.elf.Elf64_Sym, @as([]align(1) const u8, table)); + for (syms) |sym| { + // Functions only: a family is the code it brings. + if (sym.st_type() != std.elf.STT_FUNC or sym.st_shndx == 0) continue; + const name = std.mem.sliceTo(strings[sym.st_name..], 0); + const gop = try counts.getOrPut(name); + gop.value_ptr.* = if (gop.found_existing) gop.value_ptr.* + 1 else 1; + } + } +} + +fn readFile(arena: std.mem.Allocator, path: [:0]const u8) ![]u8 { + const c = std.c; + const fd = c.open(path, .{ .ACCMODE = .RDONLY }, @as(c.mode_t, 0)); + if (fd < 0) return error.OpenFailed; + defer _ = c.close(fd); + const end = c.lseek(fd, 0, c.SEEK.END); + if (end < 0 or c.lseek(fd, 0, c.SEEK.SET) < 0) return error.ReadFailed; + const out = try arena.alloc(u8, @intCast(end)); + var filled: usize = 0; + while (filled < out.len) { + const n = c.read(fd, out[filled..].ptr, out.len - filled); + if (n <= 0) return error.ReadFailed; + filled += @intCast(n); + } + return out; +} -- cgit v1.3