From ca23d86093552248553147c3077b8871bf692fb4 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Fri, 17 Feb 2023 08:03:21 -0500 Subject: [PATCH 01/18] bump --- src/errors.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/errors.jl b/src/errors.jl index e7a220dd5..8be7c8a30 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -158,7 +158,7 @@ function install_term_stacktrace(; fit = false, ) print(io, err_panel) - STACKTRACE_PRINTED_ERROR_MSG[] = true + # STACKTRACE_PRINTED_ERROR_MSG[] = true else STACKTRACE_PRINTED_ERROR_MSG[] = false end From 1343c5c80517b40a532429db843a9a6ad91a1af5 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sat, 18 Feb 2023 11:07:48 -0500 Subject: [PATCH 02/18] remved STACKTRACE_PRINTED_ERROR_MSG --- src/errors.jl | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/errors.jl b/src/errors.jl index 8be7c8a30..d31f8226f 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -41,7 +41,6 @@ import ..Measures: height export install_term_stacktrace -const STACKTRACE_PRINTED_ERROR_MSG = Ref(false) """ Stores information useful for creating the layout @@ -143,25 +142,20 @@ function install_term_stacktrace(; # print message panel if VSCode is not handling that through a second call to this fn - if STACKTRACE_PRINTED_ERROR_MSG[] == false - msg = highlight(sprint(Base.showerror, er)) |> apply_style - err_panel = Panel( - RenderableText( - reshape_code_string(msg, ctx.module_line_w); - width = ctx.module_line_w, - ); - width = ctx.out_w, - title = "{bold $(ctx.theme.err_errmsg) default underline}$(typeof(er)){/bold $(ctx.theme.err_errmsg) default underline}", - padding = (2, 2, 1, 1), - style = "dim $(ctx.theme.err_errmsg)", - title_justify = :center, - fit = false, - ) - print(io, err_panel) - # STACKTRACE_PRINTED_ERROR_MSG[] = true - else - STACKTRACE_PRINTED_ERROR_MSG[] = false - end + msg = highlight(sprint(Base.showerror, er)) |> apply_style + err_panel = Panel( + RenderableText( + reshape_code_string(msg, ctx.module_line_w); + width = ctx.module_line_w, + ); + width = ctx.out_w, + title = "{bold $(ctx.theme.err_errmsg) default underline}$(typeof(er)){/bold $(ctx.theme.err_errmsg) default underline}", + padding = (2, 2, 1, 1), + style = "dim $(ctx.theme.err_errmsg)", + title_justify = :center, + fit = false, + ) + print(io, err_panel) catch cought_err # catch when something goes wrong during error handling in Term @error "Term.jl: error while rendering error message: " cought_err From f2750ac2a4e24875993d68dbfde85695edf06b98 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sat, 18 Feb 2023 15:32:24 -0500 Subject: [PATCH 03/18] fixed logs styling --- scripts/text_reshaping.jl | 2 +- src/__text_utils.jl | 4 ++-- src/_errors.jl | 2 ++ src/_utils.jl | 2 +- src/highlight.jl | 2 +- src/link.jl | 1 + src/logs.jl | 26 ++++++++++++++++++++++++-- test/13_test_logs.jl | 6 ++++++ 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/scripts/text_reshaping.jl b/scripts/text_reshaping.jl index a63657bbd..96b78a483 100644 --- a/scripts/text_reshaping.jl +++ b/scripts/text_reshaping.jl @@ -47,7 +47,7 @@ for text in strings print("\n\n") println("\e[0m" * '_'^width) - tprintln(reshape_text(text, width)) + tprintln(reshape_text(text, width) * Panel(; height=10, width=10)) println("\e[0m" * '_'^width) end diff --git a/src/__text_utils.jl b/src/__text_utils.jl index fff7da886..663780984 100644 --- a/src/__text_utils.jl +++ b/src/__text_utils.jl @@ -133,7 +133,7 @@ function fix_markup_across_lines(lines::Vector)::Vector i < length(lines) && (lines[i + 1] = "{$markup}" * lines[i + 1]) end end - lines[i] = ln * "\e[0m" + lines[i] = ln # * "\e[0m" end return lines @@ -204,7 +204,7 @@ function fix_ansi_across_lines(lines::Vector)::Vector i < length(lines) && (lines[i + 1] = ansi * lines[i + 1]) end end - lines[i] = ln # * "\e[0m" + lines[i] = ln end return lines diff --git a/src/_errors.jl b/src/_errors.jl index 8e2c8bbd6..cb6136b30 100644 --- a/src/_errors.jl +++ b/src/_errors.jl @@ -40,6 +40,8 @@ function frame_module(frame::StackFrame)::Union{Nothing,String} return m end +frame_module(t::Tuple) = frame_module(t[1]) + """ Get module from file path. """ diff --git a/src/_utils.jl b/src/_utils.jl index d20c439d3..b94584563 100644 --- a/src/_utils.jl +++ b/src/_utils.jl @@ -6,7 +6,7 @@ function get_relative_path(file_path::AbstractString) # Use the splitdir() function to split the file path into its individual components components = splitpath(file_path) return if length(components) > 2 - "..." * joinpath(components[(end - 2):end]...) + joinpath(components[(end - 1):end]...) else file_path end diff --git a/src/highlight.jl b/src/highlight.jl index bb24f771e..36cb55224 100644 --- a/src/highlight.jl +++ b/src/highlight.jl @@ -8,7 +8,7 @@ using Highlights.Format highlight_regexes = OrderedDict( :number => (r"(?(? - (r"(?(?(?![\:\<])[\+\-\*\%\^\&\|\!\=\>\<\~\[\]])"), + (r"(?(?(?![\:\<])[\+\-\*\%\^\&\|\!\=\>\<\~\[\]×])"), :string => (r"(?[\'\"][\w\n]*[\'\"])",), :code => (r"(?([\`]{3}|[\`]{1})(\n|.)*?([\`]{3}|[\`]{1}))",), :expression => (r"(?\:\(+.+[\)])",), diff --git a/src/link.jl b/src/link.jl index 16415f099..7e9284118 100644 --- a/src/link.jl +++ b/src/link.jl @@ -108,6 +108,7 @@ function Link( ) link_dest = isnothing(line_number) ? file_path : "$file_path#$line_number" short_path = get_relative_path(file_path) + display_text = isnothing(line_number) ? short_path : "$short_path $(line_number)" link_text = "{$(style)}" * diff --git a/src/logs.jl b/src/logs.jl index 4292711e5..21d39c42d 100644 --- a/src/logs.jl +++ b/src/logs.jl @@ -176,6 +176,23 @@ function style_log_msg_kw_value(logger, v::Union{AbstractArray,AbstractMatrix}) return (v, _style) end +""" +Create string display for a log message value. +""" +function log_value_display end + +function log_value_display(x::AbstractArray) + a = highlight(str_trunc(string(x), 100); ignore_ansi=true) + + s = foldl((a, b) -> a * " × " * b, string.(size(x))) + b = highlight("{bold dim}Size: $(s){/bold dim}"; ignore_ansi=true) + return a * "\n" * b +end + +log_value_display(x::AbstractDict) = highlight(str_trunc(string(x), 100); ignore_ansi=true) +log_value_display(x) = highlight(str_trunc(string(x), 100);) + + """ handle_message(logger::TermLogger, lvl, msg, _mod, group, id, file, line; kwargs...) @@ -256,12 +273,16 @@ function Logging.handle_message( # Create display of type,k->v for each kwarg _types = map(t -> t isa Function ? Function : typeof(t), (collect(values(kwargs)))) types_w = min(console_width() / 5, maximum(width.(string.(_types)))) |> round |> Int + types_w = max(12, types_w) - _keys = map(k -> string(k), keys(kwargs)) + _keys = map(k -> highlight(string(k), theme=logger.theme), keys(kwargs)) keys_w = min(console_width() / 5, maximum(width.(_keys))) |> round |> Int + keys_ = max(12, keys_w) - _vals = map(v -> highlight(string(v)), collect(values(kwargs))) + _vals = map(v -> log_value_display(v), collect(values(kwargs))) vals_w = min(console_width() / 5 * 3 - 7, maximum(width.(_vals)) - 7) |> round |> Int + vals_w = max(12, vals_w) + # function to format content, style and shape fmt_str(x, style::String, w::Int) = RenderableText(string(x); width = w, style = style) @@ -273,6 +294,7 @@ function Logging.handle_message( ts = fmt_str.(_types, "dim " * logger.theme.type, types_w) vs = fmt_str.(_vals, "", vals_w) + # print all kwargs eq = "{$(logger.theme.operator)}={/$(logger.theme.operator)}" tprintln(" $vert"; highlight = false) diff --git a/test/13_test_logs.jl b/test/13_test_logs.jl index bffdc21e5..61a2af3f6 100644 --- a/test/13_test_logs.jl +++ b/test/13_test_logs.jl @@ -35,6 +35,12 @@ end s""" 1 + 2 @info MyStruct("aa a"^100, zeros(200), 4) + + + @info "A" zeros(100, 100) zeros(10) zeros(100, 100, 100) + @info "B" (1, 2) + @info "C" Panel() + @info "D" Dict{Symbol, Number}(Symbol(x)=>x for x in 1:100) end # IS_WIN || @compare_to_string output "logs.txt" From a6b7f4062b96177769d302ab8077a9134e84803c Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sat, 18 Feb 2023 15:47:39 -0500 Subject: [PATCH 04/18] fixed detailed pbar layout --- examples/progressbars.jl | 6 +- scripts/progressbar.jl | 216 --------------------------------------- src/_progress.jl | 23 ++++- test/15_test_progress.jl | 7 +- 4 files changed, 27 insertions(+), 225 deletions(-) delete mode 100644 scripts/progressbar.jl diff --git a/examples/progressbars.jl b/examples/progressbars.jl index a55166e34..3c1bafdee 100644 --- a/examples/progressbars.jl +++ b/examples/progressbars.jl @@ -1,7 +1,6 @@ using Term import Term.Progress: ProgressBar, start!, update!, stop!, with, @track, addjob!, render import Term.Consoles: clear -using Term.LiveDisplays tprint(hLine("progress bars"; style = "blue")) @@ -22,7 +21,8 @@ for i in 1:100 update!(job) sleep(0.01) i % 25 == 0 && println("We can print from here too") - LiveDisplays.refresh!(pbar) + render(pbar) + # LiveDisplays.refresh!(pbar) end stop!(pbar) @@ -41,7 +41,7 @@ for i in 1:100 i % 2 == 0 && update!(job2) i % 3 == 0 && update!(job3) sleep(0.01) - LiveDisplays.refresh!(pbar) + render(pbar) end stop!(pbar) diff --git a/scripts/progressbar.jl b/scripts/progressbar.jl deleted file mode 100644 index a0aefeab0..000000000 --- a/scripts/progressbar.jl +++ /dev/null @@ -1,216 +0,0 @@ -using ProgressLogging - -using Term.progress -import Term.Consoles: clear, cursor_position -import Term.Progress: SPINNERS -import Term: tprintln, Panel, install_term_logger - -install_term_logger() - -function simple(; kwargs...) - pbar = ProgressBar(; refresh_rate = 60, expand = false, width = 150, kwargs...) - j1 = addjob!(pbar; N = 100, description = "First") - - with(pbar) do - for i in 1:100 - update!(j1) - sleep(0.01) - end - end -end - -function simple_slow(; kwargs...) - pbar = ProgressBar(; - refresh_rate = 60, - expand = false, - columns = :detailed, - width = 150, - kwargs..., - ) - j1 = addjob!(pbar; N = 5, description = "First") - - with(pbar) do - for i in 1:5 - for k in 1:10000 - x = rand(100, 100) - y = x .^ 2 .- rand(100, 100) - # yield() - end - - update!(j1) - # println(i) - # sleep(.001) - end - end -end - -function multi_nested() - pbar = ProgressBar(; refresh_rate = 60, expand = false, width = 150) - with(pbar) do - outer = addjob!(pbar; N = 3, description = "outer") - for i in 1:3 - println("iii", i) - inner = addjob!(pbar; N = 100, description = "inner $i") - for j in 1:100 - update!(inner) - sleep(0.005) - end - - update!(outer) - removejob!(pbar, inner) - sleep(1) - end - end -end - -function multi_nested_double() - pbar = ProgressBar(; refresh_rate = 60, expand = false, width = 150) - with(pbar) do - outer = addjob!(pbar; N = 3, description = "outer") - for i in 1:3 - println(i) - inner = addjob!(pbar; N = 100, description = "inner $i") - inner2 = addjob!(pbar; N = 100, description = "inner $i v2") - for j in 1:100 - update!(inner) - update!(inner2) - sleep(0.005) - end - - update!(outer) - removejob!(pbar, inner) - end - end -end - -function multi(; kwargs...) - pbar = ProgressBar(; refresh_rate = 60, expand = false, width = 150, kwargs...) - j1 = addjob!(pbar; N = 50, description = "First") - j2 = addjob!(pbar; N = 75, description = "Second") - j3 = addjob!(pbar; N = 100, description = "Third") - - text = [ - " [italic white]Let", - " [green]the", - " [bright_blue]texts", - " [white]be", - Panel("[bold red underline]shown!"; fit = true), - ] - idx = 1 - with(pbar) do - for i in 1:100 - i % 20 == 0 && begin - tprintln(text[idx]) - idx += 1 - end - - update!(j1) - update!(j2) - update!(j3) - sleep(0.025) - end - end -end - -function spinner() - for spinner in keys(SPINNERS) - columns_kwargs = Dict( - :SpinnerColumn => Dict(:spinnertype => spinner, :style => "bold green"), - :CompletedColumn => Dict(:style => "dim"), - ) - - pbar = ProgressBar(; columns = :spinner, columns_kwargs = columns_kwargs) - with(pbar) do - job = addjob!(pbar; description = "[orange1]$spinner...") - for i in 1:500 - update!(job) - sleep(0.0025) - end - end - end -end - -function mixed() - columns_kwargs = Dict( - :SpinnerColumn => Dict(:style => "bold green"), - :CompletedColumn => Dict(:style => "dim"), - ) - - pbar = ProgressBar(; columns_kwargs = columns_kwargs) - with(pbar) do - j1 = addjob!(pbar; N = length(keys(SPINNERS))) - - for spinner in keys(SPINNERS) - update!(j1) - job = addjob!(pbar; description = "...") - for i in 1:500 - update!(job) - sleep(0.001) - end - end - end -end - -function transientjobs() - columns_kwargs = Dict( - :SpinnerColumn => Dict(:style => "bold green"), - :CompletedColumn => Dict(:style => "dim"), - ) - - pbar = ProgressBar(; columns_kwargs = columns_kwargs) - with(pbar) do - j1 = addjob!(pbar; N = length(keys(SPINNERS))) - - for spinner in keys(SPINNERS) - println(spinner) - update!(j1) - job = addjob!(pbar; N = 500, description = "...", transient = true) - for i in 1:500 - update!(job) - sleep(0.001) - end - end - end -end - -function progresslogging() - @progress "outer...." for i in 1:6 - @progress "inner... $i" for j in 1:100 - sleep(0.01) - end - end -end - -function _track() - @track for i in 1:10 - sleep(0.1) - end -end - -function _track_slow() - @track for i in 1:10 - for k in 1:10000 - x = rand(100, 100) - y = x .^ 2 .- rand(100, 100) - end - end -end - -clear() -println("starting") -print("_"^150) - -# simple(; transient=false, columns=:detailed) -# multi(; transient=false) -# multi_nested() -# multi_nested_double() -# spinner() -# mixed() -# transientjobs() -# progresslogging() -# _track() - -simple_slow() -# _track_slow() - -println("done") diff --git a/src/_progress.jl b/src/_progress.jl index 7ae29c8a4..0d6095e42 100644 --- a/src/_progress.jl +++ b/src/_progress.jl @@ -1,4 +1,4 @@ -import MyterialColors: orange_light, teal, purple_light +import MyterialColors: orange_light, teal, purple_light, blue_light """ Definition of several type of columns for progress bars. @@ -30,6 +30,21 @@ end update!(col::DescriptionColumn, args...)::String = col.text + +mutable struct TextColumn <: AbstractColumn + job::ProgressJob + segments::Vector{Segment} + measure::Measure + text::String + + function TextColumn(job::ProgressJob; style::String = blue_light, text="") + seg = Segment(text, style) + return new(job, [seg], seg.measure, seg.text) + end +end + +update!(col::TextColumn, args...)::String = col.text + # ----------------------------- separator column ----------------------------- # struct SeparatorColumn <: AbstractColumn job::ProgressJob @@ -141,7 +156,7 @@ struct ElapsedColumn <: AbstractColumn padwidth::Int ElapsedColumn(job::ProgressJob; style = TERM_THEME[].progress_elapsedcol_default) = - new(job, [], Measure(6 + 9, 1), style, 6) + new(job, [], Measure(1, 6 + 9), style, 6) end function update!(col::ElapsedColumn, args...)::String @@ -173,7 +188,7 @@ struct ETAColumn <: AbstractColumn padwidth::Int ETAColumn(job::ProgressJob; style = TERM_THEME[].progress_etacol_default) = - new(job, [], Measure(9 + 11, 1), style, 9) + new(job, [], Measure(1, 9 + 11), style, 9) end function update!(col::ETAColumn, args...)::String @@ -216,7 +231,7 @@ mutable struct ProgressColumn <: AbstractColumn end function setwidth!(col::ProgressColumn, width::Int) - col.measure = Measure(width, 1) + col.measure = Measure(1, width) return col.nsegs = width end diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index 6b53dba35..15961a285 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -69,7 +69,7 @@ end end @testset "\e[34mProgress columns" begin - for colinfo in (:minimal, :default, :spinner, :detailed) + for (i, colinfo) in enumerate((:minimal, :default, :spinner, :detailed)) pbar = ProgressBar(; columns = colinfo) @test pbar.columns == get_columns(colinfo) @test pbar.columns isa Vector{DataType} @@ -83,9 +83,12 @@ end sleep(0.01) end end + + IS_WINDOWS || @compare_to_string render(job) "pbar_cols_style_$i" end - colkwargs = Dict(:DescriptionColumn => Dict(:style => "red")) + mycols = [DescriptionColumn, CompletedColumn, SeparatorColumn, ProgressColumn, TextColumn] + colkwargs = Dict(:DescriptionColumn => Dict(:style => "red"), :TextColumn => Dict(:text => "test")) pbar = ProgressBar(; columns_kwargs = colkwargs) job = addjob!(pbar; N = 10) @test job.columns[1].segments[1].text == "\e[31mRunning...\e[39m" From e5aae82d31d3b8fd9ee5bcdd34f8c0dbe5b6d326 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 09:35:06 -0500 Subject: [PATCH 05/18] removed the use of links and added display_text to Link --- src/Live/pager.jl | 2 +- src/_errors.jl | 3 ++- src/_utils.jl | 2 +- src/errors.jl | 2 +- src/link.jl | 16 +++++++--------- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Live/pager.jl b/src/Live/pager.jl index 6460dc28f..9ab94e2df 100644 --- a/src/Live/pager.jl +++ b/src/Live/pager.jl @@ -118,7 +118,7 @@ function Pager( line_numbers, length(content), 1, - max(height - 5, 1), + max(height - 5, 1), + "a" ) end diff --git a/src/_errors.jl b/src/_errors.jl index cb6136b30..5864841cf 100644 --- a/src/_errors.jl +++ b/src/_errors.jl @@ -216,7 +216,8 @@ function add_stack_frame!( panel_content = if length(string(frame.file)) > 0 # get a link renderable pointing to error if TERM_SHOW_LINK_IN_STACKTRACE[] == true - source_file = Link(string(frame.file), frame.line; style = "underline dim") + # source_file = Link(string(frame.file), frame.line; style = "underline dim") + source_file = RenderableText(string(frame.file)*":$(frame.line)"; style = "underline dim") _out = func_line / source_file else _out = func_line diff --git a/src/_utils.jl b/src/_utils.jl index b94584563..c5d0ce1a5 100644 --- a/src/_utils.jl +++ b/src/_utils.jl @@ -6,7 +6,7 @@ function get_relative_path(file_path::AbstractString) # Use the splitdir() function to split the file path into its individual components components = splitpath(file_path) return if length(components) > 2 - joinpath(components[(end - 1):end]...) + joinpath(components[(end - 2):end]...) else file_path end diff --git a/src/errors.jl b/src/errors.jl index d31f8226f..cae9d8b10 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -21,7 +21,7 @@ import Term: reshape_code_string, TERM_SHOW_LINK_IN_STACKTRACE -import ..Links: Link +# import ..Links: Link import ..Style: apply_style import ..Layout: hLine, diff --git a/src/link.jl b/src/link.jl index 7e9284118..5903e11e4 100644 --- a/src/link.jl +++ b/src/link.jl @@ -103,20 +103,18 @@ Build a link given a file path and line number. """ function Link( file_path::AbstractString, - line_number::Union{Nothing,Integer} = nothing; + line_number::Union{Nothing,Integer} = nothing, + display_text::Union{Nothing,String} = nothing; style = TERM_THEME[].link, ) - link_dest = isnothing(line_number) ? file_path : "$file_path#$line_number" - short_path = get_relative_path(file_path) + link_dest = isnothing(line_number) ? "file://"*file_path : "file://$file_path#$line_number" + isnothing(display_text) && (display_text = isnothing(line_number) ? file_path : "$file_path:$line_number") + link_text = "{$(style)}" * "\e]8;;" * link_dest * "\a" * display_text * "\e]8;;\a" * "{/$(style)}" |> apply_style + - display_text = isnothing(line_number) ? short_path : "$short_path $(line_number)" - link_text = - "{$(style)}" * - "\x1b]8;;$link_dest\x1b\\$display_text\x1b]8;;\x1b\\" * - "{/$(style)}" |> apply_style link_measure = Measure(1, textlen(display_text)) - link_string = LinkString(link_text, link_measure.w) + return Link( [Segment(link_string)], link_measure, From 0946e92a2096e583755a30d824e94be881d88649 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:24:28 -0500 Subject: [PATCH 06/18] tests fix and update --- scripts/text_reshaping.jl | 2 +- src/Live/pager.jl | 2 +- src/Term.jl | 6 +- src/_errors.jl | 5 +- src/_progress.jl | 15 ++- src/errors.jl | 4 +- src/highlight.jl | 6 +- src/link.jl | 16 ++- src/logs.jl | 12 +- src/progress.jl | 31 ++--- test/07_test_renderables.jl | 4 +- test/13_test_logs.jl | 5 +- test/15_test_progress.jl | 46 ++++++- test/23_test_link.jl | 20 +-- test/runtests.jl | 2 +- test/txtfiles/annotations_1.txt | 8 +- test/txtfiles/annotations_2.txt | 37 +++-- test/txtfiles/annotations_3.txt | 37 +++-- test/txtfiles/annotations_4.txt | 45 +++---- test/txtfiles/automatic_repr_showme_1.txt | 8 +- test/txtfiles/code_highlight_1_1_1.txt | 4 +- test/txtfiles/code_highlight_1_1_1_trunc.txt | 2 +- test/txtfiles/code_highlight_1_2_1.txt | 8 +- test/txtfiles/code_highlight_1_2_1_trunc.txt | 4 +- test/txtfiles/code_highlight_1_3_1.txt | 16 +-- test/txtfiles/code_highlight_1_3_1_trunc.txt | 8 +- test/txtfiles/code_highlight_1_4_1.txt | 24 ++-- test/txtfiles/code_highlight_1_4_1_trunc.txt | 12 +- test/txtfiles/code_highlight_2_1_1.txt | 4 +- test/txtfiles/code_highlight_2_1_1_trunc.txt | 2 +- test/txtfiles/code_highlight_2_2_1.txt | 12 +- test/txtfiles/code_highlight_2_2_1_trunc.txt | 6 +- test/txtfiles/code_highlight_2_3_1.txt | 20 +-- test/txtfiles/code_highlight_2_3_1_trunc.txt | 10 +- test/txtfiles/code_highlight_2_4_1.txt | 28 ++-- test/txtfiles/code_highlight_2_4_1_trunc.txt | 14 +- test/txtfiles/code_highlight_3_2_1.txt | 12 +- test/txtfiles/code_highlight_3_2_1_trunc.txt | 6 +- test/txtfiles/code_highlight_3_3_1.txt | 28 ++-- test/txtfiles/code_highlight_3_3_1_trunc.txt | 14 +- test/txtfiles/code_highlight_3_4_1.txt | 40 +++--- test/txtfiles/code_highlight_3_4_1_trunc.txt | 20 +-- test/txtfiles/code_highlight_4_1_1.txt | 4 +- test/txtfiles/code_highlight_4_1_1_trunc.txt | 2 +- test/txtfiles/code_highlight_4_2_1.txt | 20 +-- test/txtfiles/code_highlight_4_2_1_trunc.txt | 6 +- test/txtfiles/code_highlight_4_2_2.txt | 10 +- test/txtfiles/code_highlight_4_2_2_trunc.txt | 4 +- test/txtfiles/code_highlight_4_2_3.txt | 4 +- test/txtfiles/code_highlight_4_2_3_trunc.txt | 2 +- test/txtfiles/code_highlight_4_3_1.txt | 30 ++--- test/txtfiles/code_highlight_4_3_1_trunc.txt | 8 +- test/txtfiles/code_highlight_4_3_2.txt | 14 +- test/txtfiles/code_highlight_4_3_2_trunc.txt | 6 +- test/txtfiles/code_highlight_4_3_3.txt | 4 +- test/txtfiles/code_highlight_4_3_3_trunc.txt | 2 +- test/txtfiles/code_highlight_4_4_1.txt | 46 +++---- test/txtfiles/code_highlight_4_4_1_trunc.txt | 12 +- test/txtfiles/code_highlight_4_4_2.txt | 18 +-- test/txtfiles/code_highlight_4_4_2_trunc.txt | 8 +- test/txtfiles/code_highlight_4_4_3.txt | 4 +- test/txtfiles/code_highlight_4_4_3_trunc.txt | 2 +- test/txtfiles/code_highlight_5_2_1.txt | 10 +- test/txtfiles/code_highlight_5_2_1_trunc.txt | 2 +- test/txtfiles/code_highlight_5_2_2.txt | 4 +- test/txtfiles/code_highlight_5_2_2_trunc.txt | 2 +- test/txtfiles/code_highlight_5_3_1.txt | 20 +-- test/txtfiles/code_highlight_5_3_1_trunc.txt | 6 +- test/txtfiles/code_highlight_5_3_2.txt | 8 +- test/txtfiles/code_highlight_5_3_2_trunc.txt | 4 +- test/txtfiles/code_highlight_5_4_1.txt | 30 ++--- test/txtfiles/code_highlight_5_4_1_trunc.txt | 8 +- test/txtfiles/code_highlight_5_4_2.txt | 14 +- test/txtfiles/code_highlight_5_4_2_trunc.txt | 6 +- test/txtfiles/code_highlight_5_4_3.txt | 4 +- test/txtfiles/code_highlight_5_4_3_trunc.txt | 2 +- test/txtfiles/code_highlight_6_3_1.txt | 16 +-- test/txtfiles/code_highlight_6_3_1_trunc.txt | 4 +- test/txtfiles/code_highlight_6_3_2.txt | 8 +- test/txtfiles/code_highlight_6_3_2_trunc.txt | 4 +- test/txtfiles/code_highlight_6_4_1.txt | 30 ++--- test/txtfiles/code_highlight_6_4_1_trunc.txt | 8 +- test/txtfiles/code_highlight_6_4_2.txt | 14 +- test/txtfiles/code_highlight_6_4_2_trunc.txt | 6 +- test/txtfiles/code_highlight_6_4_3.txt | 4 +- test/txtfiles/code_highlight_6_4_3_trunc.txt | 2 +- test/txtfiles/dendo_expr_8.txt | 2 +- test/txtfiles/link_pad_1_1.txt | 2 +- test/txtfiles/link_pad_1_2.txt | 2 +- test/txtfiles/link_pad_1_3.txt | 2 +- test/txtfiles/link_pad_2_1.txt | 2 +- test/txtfiles/link_pad_2_2.txt | 2 +- test/txtfiles/link_pad_2_3.txt | 2 +- test/txtfiles/link_pad_3_1.txt | 2 +- test/txtfiles/link_pad_3_2.txt | 2 +- test/txtfiles/link_pad_3_3.txt | 2 +- test/txtfiles/link_panel_1_1_1.txt | 6 +- test/txtfiles/link_panel_1_1_2.txt | 8 +- test/txtfiles/link_panel_1_1_3.txt | 6 +- test/txtfiles/link_panel_1_1_4.txt | 2 +- test/txtfiles/link_panel_1_1_5.txt | 12 +- test/txtfiles/link_panel_1_2_1.txt | 2 +- test/txtfiles/link_panel_1_2_2.txt | 2 +- test/txtfiles/link_panel_1_2_3.txt | 2 +- test/txtfiles/link_panel_1_2_4.txt | 2 +- test/txtfiles/link_panel_1_2_5.txt | 4 +- test/txtfiles/link_panel_2_1_1.txt | 6 +- test/txtfiles/link_panel_2_1_2.txt | 8 +- test/txtfiles/link_panel_2_1_3.txt | 6 +- test/txtfiles/link_panel_2_1_4.txt | 2 +- test/txtfiles/link_panel_2_1_5.txt | 12 +- test/txtfiles/link_panel_2_2_1.txt | 2 +- test/txtfiles/link_panel_2_2_2.txt | 2 +- test/txtfiles/link_panel_2_2_3.txt | 2 +- test/txtfiles/link_panel_2_2_4.txt | 2 +- test/txtfiles/link_panel_2_2_5.txt | 4 +- test/txtfiles/link_panel_3_1_1.txt | 6 +- test/txtfiles/link_panel_3_1_2.txt | 8 +- test/txtfiles/link_panel_3_1_3.txt | 6 +- test/txtfiles/link_panel_3_1_4.txt | 2 +- test/txtfiles/link_panel_3_1_5.txt | 12 +- test/txtfiles/link_panel_3_2_1.txt | 2 +- test/txtfiles/link_panel_3_2_2.txt | 2 +- test/txtfiles/link_panel_3_2_3.txt | 2 +- test/txtfiles/link_panel_3_2_4.txt | 2 +- test/txtfiles/link_panel_3_2_5.txt | 4 +- test/txtfiles/markdown_3.txt | 48 +++---- test/txtfiles/mts_repr.txt | 12 +- test/txtfiles/nested_tags_reshape_1_1.txt | 6 +- .../nested_tags_reshape_1_1_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_1_2.txt | 6 +- .../nested_tags_reshape_1_2_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_1_3.txt | 6 +- .../nested_tags_reshape_1_3_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_2_1.txt | 6 +- .../nested_tags_reshape_2_1_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_2_2.txt | 6 +- .../nested_tags_reshape_2_2_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_2_3.txt | 6 +- .../nested_tags_reshape_2_3_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_3_1.txt | 6 +- .../nested_tags_reshape_3_1_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_3_2.txt | 6 +- .../nested_tags_reshape_3_2_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_3_3.txt | 6 +- .../nested_tags_reshape_3_3_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_4_1.txt | 6 +- .../nested_tags_reshape_4_1_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_4_2.txt | 6 +- .../nested_tags_reshape_4_2_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_4_3.txt | 6 +- .../nested_tags_reshape_4_3_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_5_1.txt | 6 +- .../nested_tags_reshape_5_1_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_5_2.txt | 6 +- .../nested_tags_reshape_5_2_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_5_3.txt | 6 +- .../nested_tags_reshape_5_3_reverse.txt | 6 +- test/txtfiles/nested_tags_reshape_6_1.txt | 14 +- .../nested_tags_reshape_6_1_reverse.txt | 14 +- test/txtfiles/nested_tags_reshape_6_2.txt | 14 +- .../nested_tags_reshape_6_2_reverse.txt | 14 +- test/txtfiles/nested_tags_reshape_6_3.txt | 14 +- .../nested_tags_reshape_6_3_reverse.txt | 14 +- test/txtfiles/panels_layout_macro.txt | 6 +- test/txtfiles/pbar_cols_style_1.txt | 1 + test/txtfiles/pbar_cols_style_2.txt | 1 + test/txtfiles/pbar_cols_style_3.txt | 1 + test/txtfiles/pbar_cols_style_4.txt | 1 + test/txtfiles/pbar_customization.txt | 1 + test/txtfiles/rend_text_shape_1.txt | 126 +++++++++--------- test/txtfiles/rend_text_shape_2.txt | 104 +++++++-------- test/txtfiles/rend_text_shape_3.txt | 74 +++++----- test/txtfiles/rend_text_shape_4.txt | 60 ++++----- test/txtfiles/rend_text_shape_5.txt | 44 +++--- test/txtfiles/rend_text_shape_6.txt | 40 +++--- test/txtfiles/rend_text_shape_7.txt | 16 +-- test/txtfiles/renderable_text_1.txt | 8 +- test/txtfiles/renderable_text_2.txt | 8 +- test/txtfiles/reshaped_code_1_1.txt | 8 +- test/txtfiles/reshaped_code_1_2.txt | 4 +- test/txtfiles/reshaped_code_1_3.txt | 4 +- test/txtfiles/reshaped_code_2_1.txt | 4 +- test/txtfiles/reshaped_code_3_1.txt | 24 ++-- test/txtfiles/reshaped_code_3_2.txt | 12 +- test/txtfiles/reshaped_code_3_3.txt | 10 +- test/txtfiles/reshaped_code_4_1.txt | 20 +-- test/txtfiles/reshaped_code_4_2.txt | 10 +- test/txtfiles/reshaped_code_4_3.txt | 8 +- test/txtfiles/reshaped_code_5_1.txt | 6 +- test/txtfiles/reshaped_code_5_2.txt | 4 +- test/txtfiles/reshaped_rend_with_markup_1.txt | 10 +- test/txtfiles/reshaped_rend_with_markup_2.txt | 10 +- test/txtfiles/reshaped_rend_with_markup_3.txt | 20 +-- test/txtfiles/reshaped_rend_with_markup_4.txt | 20 +-- test/txtfiles/reshaped_rend_with_markup_5.txt | 20 +-- test/txtfiles/reshaped_rend_with_markup_6.txt | 20 +-- test/txtfiles/reshaped_text_1.txt | 9 +- test/txtfiles/reshaped_text_10.txt | 7 +- test/txtfiles/reshaped_text_11.txt | 7 +- test/txtfiles/reshaped_text_12.txt | 6 +- test/txtfiles/reshaped_text_13.txt | 8 +- test/txtfiles/reshaped_text_14.txt | 6 +- test/txtfiles/reshaped_text_15.txt | 6 +- test/txtfiles/reshaped_text_2.txt | 9 +- test/txtfiles/reshaped_text_3.txt | 8 +- test/txtfiles/reshaped_text_4.txt | 12 +- test/txtfiles/reshaped_text_5.txt | 12 +- test/txtfiles/reshaped_text_6.txt | 6 +- test/txtfiles/reshaped_text_7.txt | 6 +- test/txtfiles/reshaped_text_8.txt | 10 +- test/txtfiles/reshaped_text_9.txt | 6 +- test/txtfiles/reshaped_text_markuo_1_1.txt | 8 +- test/txtfiles/reshaped_text_markuo_1_2.txt | 4 +- test/txtfiles/reshaped_text_markuo_1_3.txt | 4 +- test/txtfiles/reshaped_text_markuo_1_4.txt | 6 +- test/txtfiles/reshaped_text_markuo_1_5.txt | 6 +- test/txtfiles/reshaped_text_markuo_1_6.txt | 6 +- test/txtfiles/reshaped_text_markuo_1_7.txt | 12 +- test/txtfiles/reshaped_text_markuo_2_1.txt | 8 +- test/txtfiles/reshaped_text_markuo_2_2.txt | 4 +- test/txtfiles/reshaped_text_markuo_2_3.txt | 4 +- test/txtfiles/reshaped_text_markuo_2_4.txt | 6 +- test/txtfiles/reshaped_text_markuo_2_5.txt | 6 +- test/txtfiles/reshaped_text_markuo_2_6.txt | 6 +- test/txtfiles/reshaped_text_markuo_2_7.txt | 12 +- test/txtfiles/reshaped_text_markuo_3_1.txt | 14 +- test/txtfiles/reshaped_text_markuo_3_2.txt | 8 +- test/txtfiles/reshaped_text_markuo_3_3.txt | 8 +- test/txtfiles/reshaped_text_markuo_3_4.txt | 10 +- test/txtfiles/reshaped_text_markuo_3_5.txt | 10 +- test/txtfiles/reshaped_text_markuo_3_6.txt | 10 +- test/txtfiles/reshaped_text_markuo_3_7.txt | 22 +-- test/txtfiles/small_panel_title_5_3_1.txt | 2 +- test/txtfiles/small_panel_title_5_3_2.txt | 2 +- test/txtfiles/small_panel_title_5_3_3.txt | 2 +- test/txtfiles/small_panel_title_5_4_1.txt | 2 +- test/txtfiles/small_panel_title_5_4_2.txt | 2 +- test/txtfiles/small_panel_title_5_4_3.txt | 2 +- test/txtfiles/small_panel_title_6_3_1.txt | 2 +- test/txtfiles/small_panel_title_6_3_2.txt | 2 +- test/txtfiles/small_panel_title_6_3_3.txt | 2 +- test/txtfiles/small_panel_title_6_4_1.txt | 2 +- test/txtfiles/small_panel_title_6_4_2.txt | 2 +- test/txtfiles/small_panel_title_6_4_3.txt | 2 +- test/txtfiles/small_panel_title_7_3_1.txt | 2 +- test/txtfiles/small_panel_title_7_3_2.txt | 2 +- test/txtfiles/small_panel_title_7_3_3.txt | 2 +- test/txtfiles/small_panel_title_7_4_1.txt | 2 +- test/txtfiles/small_panel_title_7_4_2.txt | 2 +- test/txtfiles/small_panel_title_7_4_3.txt | 2 +- test/txtfiles/small_panel_title_8_3_1.txt | 2 +- test/txtfiles/small_panel_title_8_3_2.txt | 2 +- test/txtfiles/small_panel_title_8_3_3.txt | 2 +- test/txtfiles/small_panel_title_8_4_1.txt | 2 +- test/txtfiles/small_panel_title_8_4_2.txt | 2 +- test/txtfiles/small_panel_title_8_4_3.txt | 2 +- test/txtfiles/str_trunc_1.txt | 8 +- test/txtfiles/str_trunc_3.txt | 4 +- test/txtfiles/table_7.txt | 14 +- test/txtfiles/table_8.txt | 10 +- test/txtfiles/termshow_1.txt | 2 +- test/txtfiles/tree_1_1_1.txt | 12 +- test/txtfiles/tree_1_1_4.txt | 30 ++--- test/txtfiles/tree_1_1_5.txt | 14 +- test/txtfiles/tree_1_1_9.txt | 24 ++-- test/txtfiles/tree_1_2_1.txt | 12 +- test/txtfiles/tree_1_2_4.txt | 36 ++--- test/txtfiles/tree_1_2_5.txt | 14 +- test/txtfiles/tree_1_2_9.txt | 24 ++-- test/txtfiles/tree_1_3_1.txt | 12 +- test/txtfiles/tree_1_3_4.txt | 36 ++--- test/txtfiles/tree_1_3_5.txt | 14 +- test/txtfiles/tree_1_3_9.txt | 24 ++-- test/txtfiles/tree_2_1_1.txt | 12 +- test/txtfiles/tree_2_1_4.txt | 30 ++--- test/txtfiles/tree_2_1_5.txt | 14 +- test/txtfiles/tree_2_1_9.txt | 24 ++-- test/txtfiles/tree_2_2_1.txt | 12 +- test/txtfiles/tree_2_2_4.txt | 36 ++--- test/txtfiles/tree_2_2_5.txt | 14 +- test/txtfiles/tree_2_2_9.txt | 24 ++-- test/txtfiles/tree_2_3_1.txt | 12 +- test/txtfiles/tree_2_3_4.txt | 36 ++--- test/txtfiles/tree_2_3_5.txt | 14 +- test/txtfiles/tree_2_3_9.txt | 24 ++-- test/txtfiles/trim_renderables_1.txt | 55 ++++---- test/txtfiles/trim_renderables_2.txt | 20 +-- test/txtfiles/widget_gal_1_1_1_b.txt | 24 ++-- test/txtfiles/widget_gal_1_1_2_b.txt | 28 ++-- test/txtfiles/widget_gal_1_2_1_b.txt | 28 ++-- test/txtfiles/widget_gal_1_2_2_b.txt | 28 ++-- test/txtfiles/widget_gal_2_1_1_b.txt | 18 +-- test/txtfiles/widget_gal_2_1_2_b.txt | 18 +-- test/txtfiles/widget_gal_2_2_1_b.txt | 18 +-- test/txtfiles/widget_gal_2_2_2_b.txt | 18 +-- test/txtfiles/widget_pager_1_1_1.txt | 34 ++--- test/txtfiles/widget_pager_1_1_2.txt | 34 ++--- test/txtfiles/widget_pager_1_2_1.txt | 72 +++++----- test/txtfiles/widget_pager_1_2_2.txt | 74 +++++----- test/txtfiles/widget_pager_2_1_1.txt | 32 ++--- test/txtfiles/widget_pager_2_1_2.txt | 32 ++--- test/txtfiles/widget_pager_2_2_1.txt | 72 +++++----- test/txtfiles/widget_pager_2_2_2.txt | 72 +++++----- test/txtfiles/widget_simplemenu_2_2_1.txt | 4 +- test/txtfiles/widget_simplemenu_2_2_1_b.txt | 4 +- test/txtfiles/widget_simplemenu_2_2_2.txt | 4 +- test/txtfiles/widget_simplemenu_2_2_2_b.txt | 4 +- test/txtfiles/widget_text_2_1.txt | 2 +- test/txtfiles/widget_text_2_2.txt | 14 +- 310 files changed, 1925 insertions(+), 1880 deletions(-) create mode 100644 test/txtfiles/pbar_cols_style_1.txt create mode 100644 test/txtfiles/pbar_cols_style_2.txt create mode 100644 test/txtfiles/pbar_cols_style_3.txt create mode 100644 test/txtfiles/pbar_cols_style_4.txt create mode 100644 test/txtfiles/pbar_customization.txt diff --git a/scripts/text_reshaping.jl b/scripts/text_reshaping.jl index 96b78a483..90519e2d4 100644 --- a/scripts/text_reshaping.jl +++ b/scripts/text_reshaping.jl @@ -47,7 +47,7 @@ for text in strings print("\n\n") println("\e[0m" * '_'^width) - tprintln(reshape_text(text, width) * Panel(; height=10, width=10)) + tprintln(reshape_text(text, width) * Panel(; height = 10, width = 10)) println("\e[0m" * '_'^width) end diff --git a/src/Live/pager.jl b/src/Live/pager.jl index 9ab94e2df..6460dc28f 100644 --- a/src/Live/pager.jl +++ b/src/Live/pager.jl @@ -118,7 +118,7 @@ function Pager( line_numbers, length(content), 1, - max(height - 5, 1), + "a" + max(height - 5, 1), ) end diff --git a/src/Term.jl b/src/Term.jl index 4071e1169..20cce3a2b 100644 --- a/src/Term.jl +++ b/src/Term.jl @@ -45,8 +45,10 @@ const DEFAULT_STACKTRACE_WIDTH = Ref{Int}(140) default_width(io = stdout)::Int = min(DEFAULT_CONSOLE_WIDTH[], something(ACTIVE_CONSOLE_WIDTH[], displaysize(io)[2])) -default_stacktrace_width(io = stderr)::Int = - min(DEFAULT_STACKTRACE_WIDTH[], something(ACTIVE_CONSOLE_WIDTH[], displaysize(io)[2])) +default_stacktrace_width(io = stderr)::Int = min( + DEFAULT_STACKTRACE_WIDTH[], + something(ACTIVE_CONSOLE_WIDTH[], displaysize(io)[2] - 4), +) const DEFAULT_ASPECT_RATIO = Ref(4 / 3) # 4:3 - 16:9 - 21:9 diff --git a/src/_errors.jl b/src/_errors.jl index 5864841cf..4e5779331 100644 --- a/src/_errors.jl +++ b/src/_errors.jl @@ -217,7 +217,10 @@ function add_stack_frame!( # get a link renderable pointing to error if TERM_SHOW_LINK_IN_STACKTRACE[] == true # source_file = Link(string(frame.file), frame.line; style = "underline dim") - source_file = RenderableText(string(frame.file)*":$(frame.line)"; style = "underline dim") + source_file = RenderableText( + string(frame.file) * ":$(frame.line)"; + style = "underline dim", + ) _out = func_line / source_file else _out = func_line diff --git a/src/_progress.jl b/src/_progress.jl index 0d6095e42..8ae6b9132 100644 --- a/src/_progress.jl +++ b/src/_progress.jl @@ -30,14 +30,13 @@ end update!(col::DescriptionColumn, args...)::String = col.text - mutable struct TextColumn <: AbstractColumn job::ProgressJob segments::Vector{Segment} measure::Measure text::String - function TextColumn(job::ProgressJob; style::String = blue_light, text="") + function TextColumn(job::ProgressJob; style::String = blue_light, text = "") seg = Segment(text, style) return new(job, [seg], seg.measure, seg.text) end @@ -226,8 +225,14 @@ mutable struct ProgressColumn <: AbstractColumn segments::Vector{Segment} measure::Measure nsegs::Int + completed_char::Char + remaining_char::Char - ProgressColumn(job::ProgressJob) = new(job, Vector{Segment}(), Measure(0, 0), 0) + ProgressColumn( + job::ProgressJob; + completed_char::Char = '━', + remaining_char::Char = ' ', + ) = new(job, Vector{Segment}(), Measure(0, 0), 0, completed_char, remaining_char) end function setwidth!(col::ProgressColumn, width::Int) @@ -242,11 +247,11 @@ function update!(col::ProgressColumn, color::String, args...)::String "{" * color * " bold}" * - '━'^(completed) * + col.completed_char^(completed) * "{/" * color * " bold}" * - " "^(remaining), + col.remaining_char^(remaining), ) end diff --git a/src/errors.jl b/src/errors.jl index cae9d8b10..601f8a208 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -41,7 +41,6 @@ import ..Measures: height export install_term_stacktrace - """ Stores information useful for creating the layout of a stack trace visualization. @@ -55,7 +54,7 @@ struct StacktraceContext theme::Theme end -function StacktraceContext(w = default_stacktrace_width()) +function StacktraceContext(w = default_stacktrace_width() - 12) frame_panel_w = w - 4 - 12 - 3 # panel walls and padding module_line_w = w - 4 - 4 func_name_w = frame_panel_w - 4 - 8 # including (n) before fname @@ -123,6 +122,7 @@ function install_term_stacktrace(; length(bt) > 0 && print( io, hLine( + ctx.out_w, "{default bold $(ctx.theme.err_errmsg)}$ename{/default bold $(ctx.theme.err_errmsg)}"; style = "dim $(ctx.theme.err_errmsg)", ), diff --git a/src/highlight.jl b/src/highlight.jl index 36cb55224..cdbbf0400 100644 --- a/src/highlight.jl +++ b/src/highlight.jl @@ -7,8 +7,10 @@ using Highlights.Format # ------------------------------- highlighting ------------------------------- # highlight_regexes = OrderedDict( :number => (r"(?(? - (r"(?(?(?![\:\<])[\+\-\*\%\^\&\|\!\=\>\<\~\[\]×])"), + :operator => ( + r"(?(?(?![\:\<])[\+\-\*\%\^\&\|\!\=\>\<\~\[\]×])", + ), :string => (r"(?[\'\"][\w\n]*[\'\"])",), :code => (r"(?([\`]{3}|[\`]{1})(\n|.)*?([\`]{3}|[\`]{1}))",), :expression => (r"(?\:\(+.+[\)])",), diff --git a/src/link.jl b/src/link.jl index 5903e11e4..d770b4270 100644 --- a/src/link.jl +++ b/src/link.jl @@ -107,11 +107,19 @@ function Link( display_text::Union{Nothing,String} = nothing; style = TERM_THEME[].link, ) - link_dest = isnothing(line_number) ? "file://"*file_path : "file://$file_path#$line_number" - isnothing(display_text) && (display_text = isnothing(line_number) ? file_path : "$file_path:$line_number") - link_text = "{$(style)}" * "\e]8;;" * link_dest * "\a" * display_text * "\e]8;;\a" * "{/$(style)}" |> apply_style + link_dest = + isnothing(line_number) ? "file://" * file_path : "file://$file_path#$line_number" + isnothing(display_text) && + (display_text = isnothing(line_number) ? file_path : "$file_path:$line_number") + link_text = + "{$(style)}" * + "\e]8;;" * + link_dest * + "\a" * + display_text * + "\e]8;;\a" * + "{/$(style)}" |> apply_style - link_measure = Measure(1, textlen(display_text)) link_string = LinkString(link_text, link_measure.w) diff --git a/src/logs.jl b/src/logs.jl index 21d39c42d..f3f62aec7 100644 --- a/src/logs.jl +++ b/src/logs.jl @@ -182,17 +182,17 @@ Create string display for a log message value. function log_value_display end function log_value_display(x::AbstractArray) - a = highlight(str_trunc(string(x), 100); ignore_ansi=true) + a = highlight(str_trunc(string(x), 100); ignore_ansi = true) s = foldl((a, b) -> a * " × " * b, string.(size(x))) - b = highlight("{bold dim}Size: $(s){/bold dim}"; ignore_ansi=true) + b = highlight("{bold dim}Size: $(s){/bold dim}"; ignore_ansi = true) return a * "\n" * b end -log_value_display(x::AbstractDict) = highlight(str_trunc(string(x), 100); ignore_ansi=true) +log_value_display(x::AbstractDict) = + highlight(str_trunc(string(x), 100); ignore_ansi = true) log_value_display(x) = highlight(str_trunc(string(x), 100);) - """ handle_message(logger::TermLogger, lvl, msg, _mod, group, id, file, line; kwargs...) @@ -275,7 +275,7 @@ function Logging.handle_message( types_w = min(console_width() / 5, maximum(width.(string.(_types)))) |> round |> Int types_w = max(12, types_w) - _keys = map(k -> highlight(string(k), theme=logger.theme), keys(kwargs)) + _keys = map(k -> highlight(string(k), theme = logger.theme), keys(kwargs)) keys_w = min(console_width() / 5, maximum(width.(_keys))) |> round |> Int keys_ = max(12, keys_w) @@ -283,7 +283,6 @@ function Logging.handle_message( vals_w = min(console_width() / 5 * 3 - 7, maximum(width.(_vals)) - 7) |> round |> Int vals_w = max(12, vals_w) - # function to format content, style and shape fmt_str(x, style::String, w::Int) = RenderableText(string(x); width = w, style = style) fmt_str(::Function, style::String, w::Int) = @@ -294,7 +293,6 @@ function Logging.handle_message( ts = fmt_str.(_types, "dim " * logger.theme.type, types_w) vs = fmt_str.(_vals, "", vals_w) - # print all kwargs eq = "{$(logger.theme.operator)}={/$(logger.theme.operator)}" tprintln(" $vert"; highlight = false) diff --git a/src/progress.jl b/src/progress.jl index 41ae1d8da..24d6d7b58 100644 --- a/src/progress.jl +++ b/src/progress.jl @@ -259,7 +259,7 @@ mutable struct ProgressBar columns_kwargs::Dict transient::Bool - colors::Vector{RGBColor} + colors::Union{String,Vector{RGBColor}} Δt::Float64 buff::IOBuffer # will be used to store temporarily re-directed stdout @@ -287,17 +287,13 @@ end Create a ProgressBar instance. """ function ProgressBar(; - width::Int = default_width(), + width::Int = default_width(), columns::Union{Vector{DataType},Symbol} = :default, - columns_kwargs::Dict = Dict(), - expand::Bool = false, - transient::Bool = false, - colors::Vector{RGBColor} = [ - RGBColor("(1, .05, .05)"), - RGBColor("(.05, .05, 1)"), - RGBColor("(.05, 1, .05)"), - ], - refresh_rate::Int = 60, # FPS of rendering + columns_kwargs::Dict = Dict(), + expand::Bool = false, + transient::Bool = false, + colors::Union{String,Vector{RGBColor}} = [RGBColor("(1, .05, .05)"), RGBColor("(.05, .05, 1)"), RGBColor("(.05, 1, .05)")], + refresh_rate::Int = 60, # FPS of rendering ) columns = columns isa Symbol ? get_columns(columns) : columns @@ -348,21 +344,15 @@ function addjob!( start::Bool = true, transient::Bool = false, id = nothing, + columns_kwargs::Dict = Dict(), )::ProgressJob pbar.running && print("\n") # create Job pbar.paused = true id = isnothing(id) ? length(pbar.jobs) + 1 : id - job = ProgressJob( - id, - N, - description, - pbar.columns, - pbar.width, - pbar.columns_kwargs, - transient, - ) + kwargs = merge(pbar.columns_kwargs, columns_kwargs) + job = ProgressJob(id, N, description, pbar.columns, pbar.width, kwargs, transient) # start job start && start!(job) @@ -740,6 +730,7 @@ Get the RGB color of of a progress bar's bar based on progress. """ function jobcolor(pbar::ProgressBar, job::ProgressJob) isnothing(job.N) && return "white" + pbar.colors isa String && return pbar.colors α = 0.8 * job.i / job.N β = max(sin(π * job.i / job.N) * 0.7, 0.4) diff --git a/test/07_test_renderables.jl b/test/07_test_renderables.jl index dd8b994bb..c9e427eef 100644 --- a/test/07_test_renderables.jl +++ b/test/07_test_renderables.jl @@ -39,12 +39,12 @@ end width = 22 r = RenderableText(lorem; width = width) @test string(r) == - "Lorem ipsum dolor\e[0m \nsit amet, consectetur\e[0m \n adipiscing elit,\e[0m \nsed do eiusmod tempor\e[0m \n incididunt ut labore\e[0m \n\e[0m " + "Lorem ipsum dolor \nsit amet, consectetur \n adipiscing elit, \nsed do eiusmod tempor \n incididunt ut labore " @test r.measure.w == width r = RenderableText(lorem; width = width, style = "red") @test string(r) == - "\e[31mLorem ipsum dolor\e[0m \e[39m\n\e[31msit amet, consectetur\e[0m \e[39m\n\e[31m adipiscing elit,\e[0m \e[39m\n\e[31msed do eiusmod tempor\e[0m \e[39m\n\e[31m incididunt ut labore\e[0m \e[39m\n\e[31m\e[0m \e[39m" + "\e[31mLorem ipsum dolor \e[39m\n\e[31msit amet, consectetur \e[39m\n\e[31m adipiscing elit, \e[39m\n\e[31msed do eiusmod tempor \e[39m\n\e[31m incididunt ut labore \e[39m" @test r.measure.w == width @test string(RenderableText("a string")) == "a string" diff --git a/test/13_test_logs.jl b/test/13_test_logs.jl index 61a2af3f6..17a1b1615 100644 --- a/test/13_test_logs.jl +++ b/test/13_test_logs.jl @@ -36,11 +36,10 @@ end @info MyStruct("aa a"^100, zeros(200), 4) - - @info "A" zeros(100, 100) zeros(10) zeros(100, 100, 100) + @info "A" zeros(100, 100) zeros(10) zeros(100, 100, 100) @info "B" (1, 2) @info "C" Panel() - @info "D" Dict{Symbol, Number}(Symbol(x)=>x for x in 1:100) + @info "D" Dict{Symbol,Number}(Symbol(x) => x for x in 1:100) end # IS_WIN || @compare_to_string output "logs.txt" diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index 15961a285..0fa7f00a4 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -1,6 +1,8 @@ using Term.Progress import Term.Progress: AbstractColumn, getjob, get_columns, jobcolor import Term: install_term_logger, uninstall_term_logger, str_trunc +import Term.Progress: + CompletedColumn, SeparatorColumn, ProgressColumn, DescriptionColumn, TextColumn using ProgressLogging @@ -84,16 +86,54 @@ end end end - IS_WINDOWS || @compare_to_string render(job) "pbar_cols_style_$i" + start!(pbar) + IS_WIN || @compare_to_string render(job) "pbar_cols_style_$i" end - mycols = [DescriptionColumn, CompletedColumn, SeparatorColumn, ProgressColumn, TextColumn] - colkwargs = Dict(:DescriptionColumn => Dict(:style => "red"), :TextColumn => Dict(:text => "test")) + mycols = + [DescriptionColumn, CompletedColumn, SeparatorColumn, ProgressColumn, TextColumn] + colkwargs = Dict( + :DescriptionColumn => Dict(:style => "red"), + :TextColumn => Dict(:text => "test"), + ) pbar = ProgressBar(; columns_kwargs = colkwargs) job = addjob!(pbar; N = 10) @test job.columns[1].segments[1].text == "\e[31mRunning...\e[39m" end +@testset "Progress customization" begin + pbar = ProgressBar(; + expand = true, + columns = :detailed, + colors = "#ffffff", + columns_kwargs = Dict( + :ProgressColumn => Dict(:completed_char => '█', :remaining_char => '░'), + ), + ) + job = addjob!(pbar; N = 100, description = "Test") + + job2 = addjob!( + pbar; + N = 100, + description = "Test2", + columns_kwargs = Dict( + :ProgressColumn => Dict(:completed_char => 'x', :remaining_char => '_'), + ), + ) + + with(pbar) do + for i in 1:100 + update!(job) + update!(job2) + sleep(0.01) + i == 45 && break + end + end + + start!(pbar) # re-activate + IS_WIN || @compare_to_string render(pbar) "pbar_customization" +end + @testset "\e[34mProgress foreachprogress" begin @test_nowarn redirect_stdout(Base.DevNull()) do Term.Progress.foreachprogress(1:10) do i diff --git a/test/23_test_link.jl b/test/23_test_link.jl index 2d1b29fc0..5d0d3f12c 100644 --- a/test/23_test_link.jl +++ b/test/23_test_link.jl @@ -16,20 +16,20 @@ ren = RenderableText("abcd") lr = RenderableText(l2 * ren) @testset "LINK measure" begin - @test l1.measure.w == 25 - @test l2.measure.w == 29 - @test l3.measure.w == 29 + @test l1.measure.w == 61 + @test l2.measure.w == 65 + @test l3.measure.w == 65 ren_w = ren.measure.w - @test (l1 * ren).measure.w == 25 + ren_w - @test (l2 * ren).measure.w == 29 + ren_w - @test (l3 * ren).measure.w == 29 + ren_w + @test (l1 * ren).measure.w == 61 + ren_w + @test (l2 * ren).measure.w == 65 + ren_w + @test (l3 * ren).measure.w == 65 + ren_w - @test lr.measure.w == 33 - @test (lr * ren).measure.w == 37 + @test lr.measure.w == 69 + @test (lr * ren).measure.w == 73 - @test (l1 / l2).measure.w == 29 - @test (l1 / lr).measure.w == 33 + @test (l1 / l2).measure.w == 65 + @test (l1 / lr).measure.w == 69 end @testset "LINK padding" begin diff --git a/test/runtests.jl b/test/runtests.jl index 8d38787fe..c2f9c7a35 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -16,7 +16,7 @@ const TIMEROUTPUT = TimerOutputs.TimerOutput() import Term.Consoles: Console, enable, disable Term.DEBUG_ON[] = false -const TEST_DEBUG_MODE = false # renderables are saved as strings +const TEST_DEBUG_MODE = true # renderables are saved as strings const TEST_CONSOLE_WIDTH = 80 const IS_WIN = Sys.iswindows() con = Console(TEST_CONSOLE_WIDTH) diff --git a/test/txtfiles/annotations_1.txt b/test/txtfiles/annotations_1.txt index 468fc45b5..dbb6ef20d 100644 --- a/test/txtfiles/annotations_1.txt +++ b/test/txtfiles/annotations_1.txt @@ -10,8 +10,8 @@ ╰───────────────────────────────────────────╯ │ │ ╭───────────────────────────────────────╮ - ╰─│ Setting this as `true` adjusts │ - │ the panel's width to fit `content` │ - │ . Otherwise `Panel` will have │ - │ a fixed width │ + ╰─│ Setting this as `true` adjusts │ + │ the panel's width to fit `content` │ + │ . Otherwise `Panel` will have │ + │ a fixed width │ ╰───────────────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/annotations_2.txt b/test/txtfiles/annotations_2.txt index 7a861e8b7..1ebd4e267 100644 --- a/test/txtfiles/annotations_2.txt +++ b/test/txtfiles/annotations_2.txt @@ -2,8 +2,8 @@ This is an example of an annotation to display nicely some info ───┬─── ─────┬──── ────┬──── │ │ │ │ ╭───────────────────────────────────────────╮ - ╰─│ very simple but important, pay attenti  │ - │ on!  │ + ╰─│ very simple but important, pay attenti  │ + │ on!  │ ╰───────────────────────────────────────────╯ │ │ │ ╭────────────╮ │ @@ -12,21 +12,20 @@ This is an example of an annotation to display nicely some info ╰────────────╯ │ │ │ ╭─────╮ - ╰─│ h │ - │ o │ - │ p │ - │ e │ - │ f │ - │ u │ - │ l │ - │ l │ - │ y │ - │  │ - │ u │ - │ s │ - │ e │ - │ f │ - │ u │ - │ l │ - │  │ + ╰─│ h │ + │ o │ + │ p │ + │ e │ + │ f │ + │ u │ + │ l │ + │ l │ + │ y │ + │  │ + │ u │ + │ s │ + │ e │ + │ f │ + │ u │ + │ l │ ╰─────╯ \ No newline at end of file diff --git a/test/txtfiles/annotations_3.txt b/test/txtfiles/annotations_3.txt index 407925ef5..df58bb433 100644 --- a/test/txtfiles/annotations_3.txt +++ b/test/txtfiles/annotations_3.txt @@ -2,8 +2,8 @@ ───┬─── ─────┬──── ────┬──── │ │ │ │ ╭───────────────────────────────────────────╮ - ╰─│ very simple but important, pay attenti  │ - │ on!  │ + ╰─│ very simple but important, pay attenti  │ + │ on!  │ ╰───────────────────────────────────────────╯ │ │ │ ╭────────────╮ │ @@ -12,21 +12,20 @@ ╰────────────╯ │ │ │ ╭─────╮ - ╰─│ h │ - │ o │ - │ p │ - │ e │ - │ f │ - │ u │ - │ l │ - │ l │ - │ y │ - │  │ - │ u │ - │ s │ - │ e │ - │ f │ - │ u │ - │ l │ - │  │ + ╰─│ h │ + │ o │ + │ p │ + │ e │ + │ f │ + │ u │ + │ l │ + │ l │ + │ y │ + │  │ + │ u │ + │ s │ + │ e │ + │ f │ + │ u │ + │ l │ ╰─────╯ \ No newline at end of file diff --git a/test/txtfiles/annotations_4.txt b/test/txtfiles/annotations_4.txt index 560877aa6..fa99402f2 100644 --- a/test/txtfiles/annotations_4.txt +++ b/test/txtfiles/annotations_4.txt @@ -2,33 +2,32 @@ ───┬─── ─────┬──── ────┬──── │ │ │ │ ╭───────────────────────────────────────────╮ - ╰─│ very simple but important, pay attenti  │ - │ on!  │ + ╰─│ very simple but important, pay attenti  │ + │ on!  │ ╰───────────────────────────────────────────╯ │ │ │ ╭─────────────────────────────╮ - ╰─│ is it helpful? This  │ - │ is a very long message  │ - │ to check that everything  │ - │  is working correctly  │ + ╰─│ is it helpful? This  │ + │ is a very long message  │ + │ to check that everything  │ + │  is working correctly  │ ╰─────────────────────────────╯ │ │ ╭─────╮ - ╰─│ h │ - │ o │ - │ p │ - │ e │ - │ f │ - │ u │ - │ l │ - │ l │ - │ y │ - │  │ - │ u │ - │ s │ - │ e │ - │ f │ - │ u │ - │ l │ - │  │ + ╰─│ h │ + │ o │ + │ p │ + │ e │ + │ f │ + │ u │ + │ l │ + │ l │ + │ y │ + │  │ + │ u │ + │ s │ + │ e │ + │ f │ + │ u │ + │ l │ ╰─────╯ \ No newline at end of file diff --git a/test/txtfiles/automatic_repr_showme_1.txt b/test/txtfiles/automatic_repr_showme_1.txt index 81f2b1519..787dbf855 100644 --- a/test/txtfiles/automatic_repr_showme_1.txt +++ b/test/txtfiles/automatic_repr_showme_1.txt @@ -10,13 +10,13 @@ Method definition ┌────────────────────────────────────────────────────────────────────┐ │ function tprint(io::IO, x::AbstractString; highlight = true)  │ -│  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ -│ x)  │ +│  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ +│ x)  │ │   │ │  x =  │ │  Measure(x).w <= console_width(io) ? x :  │ -│  string(RenderableText(string(x), width = console_width  │ -│ (io)))  │ +│  string(RenderableText(string(x), width = console_width  │ +│ (io)))  │ │  print(io, x)  │ │ end  │ └────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_1_1.txt b/test/txtfiles/code_highlight_1_1_1.txt index d079c55a5..9fa204459 100644 --- a/test/txtfiles/code_highlight_1_1_1.txt +++ b/test/txtfiles/code_highlight_1_1_1.txt @@ -1,2 +1,2 @@ -❯ 1 import -Term.Colors: \ No newline at end of file +❯ 1 import +Term.Colors: \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_1_1_trunc.txt b/test/txtfiles/code_highlight_1_1_1_trunc.txt index 709534373..acb605628 100644 --- a/test/txtfiles/code_highlight_1_1_1_trunc.txt +++ b/test/txtfiles/code_highlight_1_1_1_trunc.txt @@ -1 +1 @@ -❯ 1 import... \ No newline at end of file +❯ 1 import... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_2_1.txt b/test/txtfiles/code_highlight_1_2_1.txt index 94d19eece..f248b6c21 100644 --- a/test/txtfiles/code_highlight_1_2_1.txt +++ b/test/txtfiles/code_highlight_1_2_1.txt @@ -1,4 +1,4 @@ -❯ 1 import -Term.Colors: - 2  is_name -d_color, \ No newline at end of file +❯ 1 import +Term.Colors: + 2  is_name +d_color, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_2_1_trunc.txt b/test/txtfiles/code_highlight_1_2_1_trunc.txt index e3e374add..4b50d6cd0 100644 --- a/test/txtfiles/code_highlight_1_2_1_trunc.txt +++ b/test/txtfiles/code_highlight_1_2_1_trunc.txt @@ -1,2 +1,2 @@ -❯ 1 import... - 2 ... \ No newline at end of file +❯ 1 import... + 2 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_3_1.txt b/test/txtfiles/code_highlight_1_3_1.txt index 61dcadc29..fc94de090 100644 --- a/test/txtfiles/code_highlight_1_3_1.txt +++ b/test/txtfiles/code_highlight_1_3_1.txt @@ -1,8 +1,8 @@ -❯ 1 import -Term.Colors: - 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, \ No newline at end of file +❯ 1 import +Term.Colors: + 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_3_1_trunc.txt b/test/txtfiles/code_highlight_1_3_1_trunc.txt index b46683383..8b182cd1d 100644 --- a/test/txtfiles/code_highlight_1_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_1_3_1_trunc.txt @@ -1,4 +1,4 @@ -❯ 1 import... - 2 ... - 3 ... - 4 ... \ No newline at end of file +❯ 1 import... + 2 ... + 3 ... + 4 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_4_1.txt b/test/txtfiles/code_highlight_1_4_1.txt index f40141db4..ffa00c983 100644 --- a/test/txtfiles/code_highlight_1_4_1.txt +++ b/test/txtfiles/code_highlight_1_4_1.txt @@ -1,12 +1,12 @@ -❯ 1 import -Term.Colors: - 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, - 5  is_colo -r, - 6  is_back -ground, \ No newline at end of file +❯ 1 import +Term.Colors: + 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, + 5  is_colo +r, + 6  is_back +ground, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_1_4_1_trunc.txt b/test/txtfiles/code_highlight_1_4_1_trunc.txt index 1d56a592e..889b88fba 100644 --- a/test/txtfiles/code_highlight_1_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_1_4_1_trunc.txt @@ -1,6 +1,6 @@ -❯ 1 import... - 2 ... - 3 ... - 4 ... - 5 ... - 6 ... \ No newline at end of file +❯ 1 import... + 2 ... + 3 ... + 4 ... + 5 ... + 6 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_1_1.txt b/test/txtfiles/code_highlight_2_1_1.txt index 6ecb53dfe..3984fde3b 100644 --- a/test/txtfiles/code_highlight_2_1_1.txt +++ b/test/txtfiles/code_highlight_2_1_1.txt @@ -1,2 +1,2 @@ -❯ 2 is_named_co -lor, \ No newline at end of file +❯ 2 is_named_co +lor, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_1_1_trunc.txt b/test/txtfiles/code_highlight_2_1_1_trunc.txt index c35edd3ce..a305d0af6 100644 --- a/test/txtfiles/code_highlight_2_1_1_trunc.txt +++ b/test/txtfiles/code_highlight_2_1_1_trunc.txt @@ -1 +1 @@ -❯ 2 is_named... \ No newline at end of file +❯ 2 is_named... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_2_1.txt b/test/txtfiles/code_highlight_2_2_1.txt index 8362e45e6..ec1decf2a 100644 --- a/test/txtfiles/code_highlight_2_2_1.txt +++ b/test/txtfiles/code_highlight_2_2_1.txt @@ -1,6 +1,6 @@ - 1 import -Term.Colors: -❯ 2  is_name -d_color, - 3  is_rgb_ -color, \ No newline at end of file + 1 import +Term.Colors: +❯ 2  is_name +d_color, + 3  is_rgb_ +color, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_2_1_trunc.txt b/test/txtfiles/code_highlight_2_2_1_trunc.txt index 6291654bc..2d295f5dd 100644 --- a/test/txtfiles/code_highlight_2_2_1_trunc.txt +++ b/test/txtfiles/code_highlight_2_2_1_trunc.txt @@ -1,3 +1,3 @@ - 1 import... -❯ 2 ... - 3 ... \ No newline at end of file + 1 import... +❯ 2 ... + 3 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_3_1.txt b/test/txtfiles/code_highlight_2_3_1.txt index 761380879..21943d376 100644 --- a/test/txtfiles/code_highlight_2_3_1.txt +++ b/test/txtfiles/code_highlight_2_3_1.txt @@ -1,10 +1,10 @@ - 1 import -Term.Colors: -❯ 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, - 5  is_colo -r, \ No newline at end of file + 1 import +Term.Colors: +❯ 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, + 5  is_colo +r, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_3_1_trunc.txt b/test/txtfiles/code_highlight_2_3_1_trunc.txt index b809feb20..6701d73f0 100644 --- a/test/txtfiles/code_highlight_2_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_2_3_1_trunc.txt @@ -1,5 +1,5 @@ - 1 import... -❯ 2 ... - 3 ... - 4 ... - 5 ... \ No newline at end of file + 1 import... +❯ 2 ... + 3 ... + 4 ... + 5 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_4_1.txt b/test/txtfiles/code_highlight_2_4_1.txt index 7632564e4..87a103b24 100644 --- a/test/txtfiles/code_highlight_2_4_1.txt +++ b/test/txtfiles/code_highlight_2_4_1.txt @@ -1,14 +1,14 @@ - 1 import -Term.Colors: -❯ 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, - 5  is_colo -r, - 6  is_back -ground, - 7  get_col -or, \ No newline at end of file + 1 import +Term.Colors: +❯ 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, + 5  is_colo +r, + 6  is_back +ground, + 7  get_col +or, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_2_4_1_trunc.txt b/test/txtfiles/code_highlight_2_4_1_trunc.txt index 7f12a1171..0ca10ca0b 100644 --- a/test/txtfiles/code_highlight_2_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_2_4_1_trunc.txt @@ -1,7 +1,7 @@ - 1 import... -❯ 2 ... - 3 ... - 4 ... - 5 ... - 6 ... - 7 ... \ No newline at end of file + 1 import... +❯ 2 ... + 3 ... + 4 ... + 5 ... + 6 ... + 7 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_2_1.txt b/test/txtfiles/code_highlight_3_2_1.txt index 73b6a901a..484b40457 100644 --- a/test/txtfiles/code_highlight_3_2_1.txt +++ b/test/txtfiles/code_highlight_3_2_1.txt @@ -1,6 +1,6 @@ - 4  is_hex_ -color, -❯ 5  is_colo -r, - 6  is_back -ground, \ No newline at end of file + 4  is_hex_ +color, +❯ 5  is_colo +r, + 6  is_back +ground, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_2_1_trunc.txt b/test/txtfiles/code_highlight_3_2_1_trunc.txt index abda300c9..5e165a360 100644 --- a/test/txtfiles/code_highlight_3_2_1_trunc.txt +++ b/test/txtfiles/code_highlight_3_2_1_trunc.txt @@ -1,3 +1,3 @@ - 4 ... -❯ 5 ... - 6 ... \ No newline at end of file + 4 ... +❯ 5 ... + 6 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_3_1.txt b/test/txtfiles/code_highlight_3_3_1.txt index 1742ad8a6..2ae915c34 100644 --- a/test/txtfiles/code_highlight_3_3_1.txt +++ b/test/txtfiles/code_highlight_3_3_1.txt @@ -1,14 +1,14 @@ - 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, -❯ 5  is_colo -r, - 6  is_back -ground, - 7  get_col -or, - 8  NamedCo -lor, \ No newline at end of file + 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, +❯ 5  is_colo +r, + 6  is_back +ground, + 7  get_col +or, + 8  NamedCo +lor, \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_3_1_trunc.txt b/test/txtfiles/code_highlight_3_3_1_trunc.txt index a79c8d7e1..59f95af7e 100644 --- a/test/txtfiles/code_highlight_3_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_3_3_1_trunc.txt @@ -1,7 +1,7 @@ - 2 ... - 3 ... - 4 ... -❯ 5 ... - 6 ... - 7 ... - 8 ... \ No newline at end of file + 2 ... + 3 ... + 4 ... +❯ 5 ... + 6 ... + 7 ... + 8 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_4_1.txt b/test/txtfiles/code_highlight_3_4_1.txt index d54278753..34d12420b 100644 --- a/test/txtfiles/code_highlight_3_4_1.txt +++ b/test/txtfiles/code_highlight_3_4_1.txt @@ -1,20 +1,20 @@ - 1 import -Term.Colors: - 2  is_name -d_color, - 3  is_rgb_ -color, - 4  is_hex_ -color, -❯ 5  is_colo -r, - 6  is_back -ground, - 7  get_col -or, - 8  NamedCo -lor, - 9  RGBColo -r, - 10  BitCol -or \ No newline at end of file + 1 import +Term.Colors: + 2  is_name +d_color, + 3  is_rgb_ +color, + 4  is_hex_ +color, +❯ 5  is_colo +r, + 6  is_back +ground, + 7  get_col +or, + 8  NamedCo +lor, + 9  RGBColo +r, + 10  BitCol +or \ No newline at end of file diff --git a/test/txtfiles/code_highlight_3_4_1_trunc.txt b/test/txtfiles/code_highlight_3_4_1_trunc.txt index 8b55cf4ac..e713cb8d8 100644 --- a/test/txtfiles/code_highlight_3_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_3_4_1_trunc.txt @@ -1,10 +1,10 @@ - 1 import... - 2 ... - 3 ... - 4 ... -❯ 5 ... - 6 ... - 7 ... - 8 ... - 9 ... - 10 ... \ No newline at end of file + 1 import... + 2 ... + 3 ... + 4 ... +❯ 5 ... + 6 ... + 7 ... + 8 ... + 9 ... + 10 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_1_1.txt b/test/txtfiles/code_highlight_4_1_1.txt index 031a85367..31bea1084 100644 --- a/test/txtfiles/code_highlight_4_1_1.txt +++ b/test/txtfiles/code_highlight_4_1_1.txt @@ -1,2 +1,2 @@ -❯ 90 for hex -in hexes \ No newline at end of file +❯ 90 for hex +in hexes \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_1_1_trunc.txt b/test/txtfiles/code_highlight_4_1_1_trunc.txt index e149ef954..5e4ff16b7 100644 --- a/test/txtfiles/code_highlight_4_1_1_trunc.txt +++ b/test/txtfiles/code_highlight_4_1_1_trunc.txt @@ -1 +1 @@ -❯ 90 for... \ No newline at end of file +❯ 90 for... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_1.txt b/test/txtfiles/code_highlight_4_2_1.txt index a4f7baf77..2116663a1 100644 --- a/test/txtfiles/code_highlight_4_2_1.txt +++ b/test/txtfiles/code_highlight_4_2_1.txt @@ -1,10 +1,10 @@ - 89  hexes -= ["on_#ffffff" -, "on_#000000", - "on_#dada2a", -"on_#123123"] -❯ 90  for -hex in hexes - 91  - @test is_bac -kground(hex) \ No newline at end of file + 89  hexes += ["on_#ffffff" +, "on_#000000", + "on_#dada2a", +"on_#123123"] +❯ 90  for +hex in hexes + 91  + @test is_bac +kground(hex) \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_1_trunc.txt b/test/txtfiles/code_highlight_4_2_1_trunc.txt index 90dd25356..6deb6837c 100644 --- a/test/txtfiles/code_highlight_4_2_1_trunc.txt +++ b/test/txtfiles/code_highlight_4_2_1_trunc.txt @@ -1,3 +1,3 @@ - 89 ... -❯ 90 ... - 91 ... \ No newline at end of file + 89 ... +❯ 90 ... + 91 ... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_2.txt b/test/txtfiles/code_highlight_4_2_2.txt index e2b3ab080..835a46818 100644 --- a/test/txtfiles/code_highlight_4_2_2.txt +++ b/test/txtfiles/code_highlight_4_2_2.txt @@ -1,6 +1,6 @@ - 89  hexes = ["on_#ffffff", -"on_#000000", "on_#dada2a", -"on_#123123"] + 89  hexes = ["on_#ffffff", +"on_#000000", "on_#dada2a", +"on_#123123"] ❯ 90  for hex in hexes - 91  @test is_background( -hex) \ No newline at end of file + 91  @test is_background( +hex) \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_2_trunc.txt b/test/txtfiles/code_highlight_4_2_2_trunc.txt index f57658992..38144203b 100644 --- a/test/txtfiles/code_highlight_4_2_2_trunc.txt +++ b/test/txtfiles/code_highlight_4_2_2_trunc.txt @@ -1,3 +1,3 @@ - 89  hexes = ["on_#ffffff"... + 89  hexes = ["on_#ffffff"... ❯ 90  for hex in hexes - 91  @test is_backgrou... \ No newline at end of file + 91  @test is_backgrou... \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_3.txt b/test/txtfiles/code_highlight_4_2_3.txt index e1b3de3cf..f9b8e9244 100644 --- a/test/txtfiles/code_highlight_4_2_3.txt +++ b/test/txtfiles/code_highlight_4_2_3.txt @@ -1,4 +1,4 @@ - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 -3123"] + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 +3123"] ❯ 90  for hex in hexes 91  @test is_background(hex) \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_2_3_trunc.txt b/test/txtfiles/code_highlight_4_2_3_trunc.txt index a6ffdfc18..ca22ad794 100644 --- a/test/txtfiles/code_highlight_4_2_3_trunc.txt +++ b/test/txtfiles/code_highlight_4_2_3_trunc.txt @@ -1,3 +1,3 @@ - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... ❯ 90  for hex in hexes 91  @test is_background(hex) \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_3_1.txt b/test/txtfiles/code_highlight_4_3_1.txt index 0bb1a8766..474339c0c 100644 --- a/test/txtfiles/code_highlight_4_3_1.txt +++ b/test/txtfiles/code_highlight_4_3_1.txt @@ -1,18 +1,18 @@ 87  end 88  - 89  hexes -= ["on_#ffffff" -, "on_#000000", - "on_#dada2a", -"on_#123123"] -❯ 90  for -hex in hexes - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 89  hexes += ["on_#ffffff" +, "on_#000000", + "on_#dada2a", +"on_#123123"] +❯ 90  for +hex in hexes + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor 93  end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_3_1_trunc.txt b/test/txtfiles/code_highlight_4_3_1_trunc.txt index b5ca96149..42cfb3d3e 100644 --- a/test/txtfiles/code_highlight_4_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_4_3_1_trunc.txt @@ -1,7 +1,7 @@ 87  end 88  - 89 ... -❯ 90 ... - 91 ... - 92 ... + 89 ... +❯ 90 ... + 91 ... + 92 ... 93  end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_3_2.txt b/test/txtfiles/code_highlight_4_3_2.txt index fd8409a88..4ce6a2955 100644 --- a/test/txtfiles/code_highlight_4_3_2.txt +++ b/test/txtfiles/code_highlight_4_3_2.txt @@ -1,11 +1,11 @@ 87  end 88  - 89  hexes = ["on_#ffffff", -"on_#000000", "on_#dada2a", -"on_#123123"] + 89  hexes = ["on_#ffffff", +"on_#000000", "on_#dada2a", +"on_#123123"] ❯ 90  for hex in hexes - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor 93  end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_3_2_trunc.txt b/test/txtfiles/code_highlight_4_3_2_trunc.txt index 8891105bf..1959f88f7 100644 --- a/test/txtfiles/code_highlight_4_3_2_trunc.txt +++ b/test/txtfiles/code_highlight_4_3_2_trunc.txt @@ -1,7 +1,7 @@ 87  end 88  - 89  hexes = ["on_#ffffff"... + 89  hexes = ["on_#ffffff"... ❯ 90  for hex in hexes - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... 93  end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_3_3.txt b/test/txtfiles/code_highlight_4_3_3.txt index 34061b9f4..c8571c3e6 100644 --- a/test/txtfiles/code_highlight_4_3_3.txt +++ b/test/txtfiles/code_highlight_4_3_3.txt @@ -1,7 +1,7 @@ 87  end 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 -3123"] + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 +3123"] ❯ 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_4_3_3_trunc.txt b/test/txtfiles/code_highlight_4_3_3_trunc.txt index 505651e02..6aa08558a 100644 --- a/test/txtfiles/code_highlight_4_3_3_trunc.txt +++ b/test/txtfiles/code_highlight_4_3_3_trunc.txt @@ -1,6 +1,6 @@ 87  end 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... ❯ 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_4_4_1.txt b/test/txtfiles/code_highlight_4_4_1.txt index a28c73204..42c611145 100644 --- a/test/txtfiles/code_highlight_4_4_1.txt +++ b/test/txtfiles/code_highlight_4_4_1.txt @@ -1,27 +1,27 @@ - 85  - @test !is_co -lor(rgb) - 86  - @test get_co -lor(rgb; bg -= true) isa -RGBColor + 85  + @test !is_co +lor(rgb) + 86  + @test get_co +lor(rgb; bg += true) isa +RGBColor 87  end 88  - 89  hexes -= ["on_#ffffff" -, "on_#000000", - "on_#dada2a", -"on_#123123"] -❯ 90  for -hex in hexes - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 89  hexes += ["on_#ffffff" +, "on_#000000", + "on_#dada2a", +"on_#123123"] +❯ 90  for +hex in hexes + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_4_1_trunc.txt b/test/txtfiles/code_highlight_4_4_1_trunc.txt index 019d45230..8a2aaa012 100644 --- a/test/txtfiles/code_highlight_4_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_4_4_1_trunc.txt @@ -1,10 +1,10 @@ - 85 ... - 86 ... + 85 ... + 86 ... 87  end 88  - 89 ... -❯ 90 ... - 91 ... - 92 ... + 89 ... +❯ 90 ... + 91 ... + 92 ... 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_4_2.txt b/test/txtfiles/code_highlight_4_4_2.txt index a413a4b4c..c81fb3330 100644 --- a/test/txtfiles/code_highlight_4_4_2.txt +++ b/test/txtfiles/code_highlight_4_4_2.txt @@ -1,15 +1,15 @@ 85  @test !is_color(rgb) - 86  @test get_color(rgb; - bg = true) isa RGBColor + 86  @test get_color(rgb; + bg = true) isa RGBColor 87  end 88  - 89  hexes = ["on_#ffffff", -"on_#000000", "on_#dada2a", -"on_#123123"] + 89  hexes = ["on_#ffffff", +"on_#000000", "on_#dada2a", +"on_#123123"] ❯ 90  for hex in hexes - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_4_2_trunc.txt b/test/txtfiles/code_highlight_4_4_2_trunc.txt index 8afcab8fb..0016e78ea 100644 --- a/test/txtfiles/code_highlight_4_4_2_trunc.txt +++ b/test/txtfiles/code_highlight_4_4_2_trunc.txt @@ -1,10 +1,10 @@ 85  @test !is_color(rgb) - 86  @test get_color(r... + 86  @test get_color(r... 87  end 88  - 89  hexes = ["on_#ffffff"... + 89  hexes = ["on_#ffffff"... ❯ 90  for hex in hexes - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_4_4_3.txt b/test/txtfiles/code_highlight_4_4_3.txt index 420531fd4..515fa0740 100644 --- a/test/txtfiles/code_highlight_4_4_3.txt +++ b/test/txtfiles/code_highlight_4_4_3.txt @@ -2,8 +2,8 @@ 86  @test get_color(rgb; bg = true) isa RGBColor 87  end 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 -3123"] + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 +3123"] ❯ 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_4_4_3_trunc.txt b/test/txtfiles/code_highlight_4_4_3_trunc.txt index 2ba72a720..1796b871f 100644 --- a/test/txtfiles/code_highlight_4_4_3_trunc.txt +++ b/test/txtfiles/code_highlight_4_4_3_trunc.txt @@ -2,7 +2,7 @@ 86  @test get_color(rgb; bg = true) isa RGBColor 87  end 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... ❯ 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_5_2_1.txt b/test/txtfiles/code_highlight_5_2_1.txt index 2569e0470..9a0b6e4b9 100644 --- a/test/txtfiles/code_highlight_5_2_1.txt +++ b/test/txtfiles/code_highlight_5_2_1.txt @@ -1,7 +1,7 @@ - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_2_1_trunc.txt b/test/txtfiles/code_highlight_5_2_1_trunc.txt index e2f39235f..f0645116b 100644 --- a/test/txtfiles/code_highlight_5_2_1_trunc.txt +++ b/test/txtfiles/code_highlight_5_2_1_trunc.txt @@ -1,3 +1,3 @@ - 92 ... + 92 ... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_2_2.txt b/test/txtfiles/code_highlight_5_2_2.txt index 854bc4e8d..dd01f5e56 100644 --- a/test/txtfiles/code_highlight_5_2_2.txt +++ b/test/txtfiles/code_highlight_5_2_2.txt @@ -1,4 +1,4 @@ - 92  @test get_color(hex; - bg = true) isa RGBColor + 92  @test get_color(hex; + bg = true) isa RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_2_2_trunc.txt b/test/txtfiles/code_highlight_5_2_2_trunc.txt index 9c2b090c7..6d1778de4 100644 --- a/test/txtfiles/code_highlight_5_2_2_trunc.txt +++ b/test/txtfiles/code_highlight_5_2_2_trunc.txt @@ -1,3 +1,3 @@ - 92  @test get_color(h... + 92  @test get_color(h... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_3_1.txt b/test/txtfiles/code_highlight_5_3_1.txt index bbc32a3a2..e2e0cc88d 100644 --- a/test/txtfiles/code_highlight_5_3_1.txt +++ b/test/txtfiles/code_highlight_5_3_1.txt @@ -1,12 +1,12 @@ - 90  for -hex in hexes - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 90  for +hex in hexes + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_3_1_trunc.txt b/test/txtfiles/code_highlight_5_3_1_trunc.txt index c59e3135f..32e22972c 100644 --- a/test/txtfiles/code_highlight_5_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_5_3_1_trunc.txt @@ -1,5 +1,5 @@ - 90 ... - 91 ... - 92 ... + 90 ... + 91 ... + 92 ... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_3_2.txt b/test/txtfiles/code_highlight_5_3_2.txt index 449177789..3ec5bc3d3 100644 --- a/test/txtfiles/code_highlight_5_3_2.txt +++ b/test/txtfiles/code_highlight_5_3_2.txt @@ -1,7 +1,7 @@ 90  for hex in hexes - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_3_2_trunc.txt b/test/txtfiles/code_highlight_5_3_2_trunc.txt index 3b92f8a6d..22ff8542f 100644 --- a/test/txtfiles/code_highlight_5_3_2_trunc.txt +++ b/test/txtfiles/code_highlight_5_3_2_trunc.txt @@ -1,5 +1,5 @@ 90  for hex in hexes - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_4_1.txt b/test/txtfiles/code_highlight_5_4_1.txt index d9afa9b82..b9b533938 100644 --- a/test/txtfiles/code_highlight_5_4_1.txt +++ b/test/txtfiles/code_highlight_5_4_1.txt @@ -1,18 +1,18 @@ 88  - 89  hexes -= ["on_#ffffff" -, "on_#000000", - "on_#dada2a", -"on_#123123"] - 90  for -hex in hexes - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 89  hexes += ["on_#ffffff" +, "on_#000000", + "on_#dada2a", +"on_#123123"] + 90  for +hex in hexes + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_4_1_trunc.txt b/test/txtfiles/code_highlight_5_4_1_trunc.txt index c39d2459e..3fe20b71f 100644 --- a/test/txtfiles/code_highlight_5_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_5_4_1_trunc.txt @@ -1,7 +1,7 @@ 88  - 89 ... - 90 ... - 91 ... - 92 ... + 89 ... + 90 ... + 91 ... + 92 ... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_4_2.txt b/test/txtfiles/code_highlight_5_4_2.txt index 05b2f8a05..f61013996 100644 --- a/test/txtfiles/code_highlight_5_4_2.txt +++ b/test/txtfiles/code_highlight_5_4_2.txt @@ -1,11 +1,11 @@ 88  - 89  hexes = ["on_#ffffff", -"on_#000000", "on_#dada2a", -"on_#123123"] + 89  hexes = ["on_#ffffff", +"on_#000000", "on_#dada2a", +"on_#123123"] 90  for hex in hexes - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_4_2_trunc.txt b/test/txtfiles/code_highlight_5_4_2_trunc.txt index b7bdff3da..f8b7ca6fc 100644 --- a/test/txtfiles/code_highlight_5_4_2_trunc.txt +++ b/test/txtfiles/code_highlight_5_4_2_trunc.txt @@ -1,7 +1,7 @@ 88  - 89  hexes = ["on_#ffffff"... + 89  hexes = ["on_#ffffff"... 90  for hex in hexes - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... ❯ 93  end 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_5_4_3.txt b/test/txtfiles/code_highlight_5_4_3.txt index a3302a402..ee55ebadd 100644 --- a/test/txtfiles/code_highlight_5_4_3.txt +++ b/test/txtfiles/code_highlight_5_4_3.txt @@ -1,6 +1,6 @@ 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 -3123"] + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 +3123"] 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_5_4_3_trunc.txt b/test/txtfiles/code_highlight_5_4_3_trunc.txt index 919ca5e03..47b03c08a 100644 --- a/test/txtfiles/code_highlight_5_4_3_trunc.txt +++ b/test/txtfiles/code_highlight_5_4_3_trunc.txt @@ -1,5 +1,5 @@ 88  - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_6_3_1.txt b/test/txtfiles/code_highlight_6_3_1.txt index af651cb13..ef74f7fda 100644 --- a/test/txtfiles/code_highlight_6_3_1.txt +++ b/test/txtfiles/code_highlight_6_3_1.txt @@ -1,10 +1,10 @@ - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_3_1_trunc.txt b/test/txtfiles/code_highlight_6_3_1_trunc.txt index 8febed765..2aef15c7b 100644 --- a/test/txtfiles/code_highlight_6_3_1_trunc.txt +++ b/test/txtfiles/code_highlight_6_3_1_trunc.txt @@ -1,4 +1,4 @@ - 91 ... - 92 ... + 91 ... + 92 ... 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_3_2.txt b/test/txtfiles/code_highlight_6_3_2.txt index 3559afbb9..26aad287c 100644 --- a/test/txtfiles/code_highlight_6_3_2.txt +++ b/test/txtfiles/code_highlight_6_3_2.txt @@ -1,6 +1,6 @@ - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_3_2_trunc.txt b/test/txtfiles/code_highlight_6_3_2_trunc.txt index 357f786d7..0adc102f9 100644 --- a/test/txtfiles/code_highlight_6_3_2_trunc.txt +++ b/test/txtfiles/code_highlight_6_3_2_trunc.txt @@ -1,4 +1,4 @@ - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_4_1.txt b/test/txtfiles/code_highlight_6_4_1.txt index 9aae1861a..3b8d90b9f 100644 --- a/test/txtfiles/code_highlight_6_4_1.txt +++ b/test/txtfiles/code_highlight_6_4_1.txt @@ -1,17 +1,17 @@ - 89  hexes -= ["on_#ffffff" -, "on_#000000", - "on_#dada2a", -"on_#123123"] - 90  for -hex in hexes - 91  - @test is_bac -kground(hex) - 92  - @test get_co -lor(hex; bg -= true) isa -RGBColor + 89  hexes += ["on_#ffffff" +, "on_#000000", + "on_#dada2a", +"on_#123123"] + 90  for +hex in hexes + 91  + @test is_bac +kground(hex) + 92  + @test get_co +lor(hex; bg += true) isa +RGBColor 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_4_1_trunc.txt b/test/txtfiles/code_highlight_6_4_1_trunc.txt index b58ad453b..4e3d4c446 100644 --- a/test/txtfiles/code_highlight_6_4_1_trunc.txt +++ b/test/txtfiles/code_highlight_6_4_1_trunc.txt @@ -1,6 +1,6 @@ - 89 ... - 90 ... - 91 ... - 92 ... + 89 ... + 90 ... + 91 ... + 92 ... 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_4_2.txt b/test/txtfiles/code_highlight_6_4_2.txt index 054a4077e..252eb6b79 100644 --- a/test/txtfiles/code_highlight_6_4_2.txt +++ b/test/txtfiles/code_highlight_6_4_2.txt @@ -1,10 +1,10 @@ - 89  hexes = ["on_#ffffff", -"on_#000000", "on_#dada2a", -"on_#123123"] + 89  hexes = ["on_#ffffff", +"on_#000000", "on_#dada2a", +"on_#123123"] 90  for hex in hexes - 91  @test is_background( -hex) - 92  @test get_color(hex; - bg = true) isa RGBColor + 91  @test is_background( +hex) + 92  @test get_color(hex; + bg = true) isa RGBColor 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_4_2_trunc.txt b/test/txtfiles/code_highlight_6_4_2_trunc.txt index 1cc97d68e..93cd67af3 100644 --- a/test/txtfiles/code_highlight_6_4_2_trunc.txt +++ b/test/txtfiles/code_highlight_6_4_2_trunc.txt @@ -1,6 +1,6 @@ - 89  hexes = ["on_#ffffff"... + 89  hexes = ["on_#ffffff"... 90  for hex in hexes - 91  @test is_backgrou... - 92  @test get_color(h... + 91  @test is_backgrou... + 92  @test get_color(h... 93  end ❯ 94 end \ No newline at end of file diff --git a/test/txtfiles/code_highlight_6_4_3.txt b/test/txtfiles/code_highlight_6_4_3.txt index 5a23547e5..10f0bdd4b 100644 --- a/test/txtfiles/code_highlight_6_4_3.txt +++ b/test/txtfiles/code_highlight_6_4_3.txt @@ -1,5 +1,5 @@ - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 -3123"] + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a", "on_#12 +3123"] 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/code_highlight_6_4_3_trunc.txt b/test/txtfiles/code_highlight_6_4_3_trunc.txt index 16899970c..47cb432e4 100644 --- a/test/txtfiles/code_highlight_6_4_3_trunc.txt +++ b/test/txtfiles/code_highlight_6_4_3_trunc.txt @@ -1,4 +1,4 @@ - 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... + 89  hexes = ["on_#ffffff", "on_#000000", "on_#dada2a",... 90  for hex in hexes 91  @test is_background(hex) 92  @test get_color(hex; bg = true) isa RGBColor diff --git a/test/txtfiles/dendo_expr_8.txt b/test/txtfiles/dendo_expr_8.txt index 3b28f6e6a..4b42b3dc3 100644 --- a/test/txtfiles/dendo_expr_8.txt +++ b/test/txtfiles/dendo_expr_8.txt @@ -1,6 +1,6 @@ call: print  ┌──────┴─────┐  - print  lstrip(... + print  lstrip(...  ⋀   ┴  call: lstrip diff --git a/test/txtfiles/link_pad_1_1.txt b/test/txtfiles/link_pad_1_1.txt index 5e574fac7..49cbd3b36 100644 --- a/test/txtfiles/link_pad_1_1.txt +++ b/test/txtfiles/link_pad_1_1.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; diff --git a/test/txtfiles/link_pad_1_2.txt b/test/txtfiles/link_pad_1_2.txt index 5e574fac7..49cbd3b36 100644 --- a/test/txtfiles/link_pad_1_2.txt +++ b/test/txtfiles/link_pad_1_2.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; diff --git a/test/txtfiles/link_pad_1_3.txt b/test/txtfiles/link_pad_1_3.txt index 5e574fac7..49cbd3b36 100644 --- a/test/txtfiles/link_pad_1_3.txt +++ b/test/txtfiles/link_pad_1_3.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; diff --git a/test/txtfiles/link_pad_2_1.txt b/test/txtfiles/link_pad_2_1.txt index fc9e6fc68..86e58f5c3 100644 --- a/test/txtfiles/link_pad_2_1.txt +++ b/test/txtfiles/link_pad_2_1.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_pad_2_2.txt b/test/txtfiles/link_pad_2_2.txt index fc9e6fc68..86e58f5c3 100644 --- a/test/txtfiles/link_pad_2_2.txt +++ b/test/txtfiles/link_pad_2_2.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_pad_2_3.txt b/test/txtfiles/link_pad_2_3.txt index fc9e6fc68..86e58f5c3 100644 --- a/test/txtfiles/link_pad_2_3.txt +++ b/test/txtfiles/link_pad_2_3.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_pad_3_1.txt b/test/txtfiles/link_pad_3_1.txt index e2f989106..8a494224e 100644 --- a/test/txtfiles/link_pad_3_1.txt +++ b/test/txtfiles/link_pad_3_1.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_pad_3_2.txt b/test/txtfiles/link_pad_3_2.txt index e2f989106..8a494224e 100644 --- a/test/txtfiles/link_pad_3_2.txt +++ b/test/txtfiles/link_pad_3_2.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_pad_3_3.txt b/test/txtfiles/link_pad_3_3.txt index e2f989106..8a494224e 100644 --- a/test/txtfiles/link_pad_3_3.txt +++ b/test/txtfiles/link_pad_3_3.txt @@ -1 +1 @@ - ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ + ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; diff --git a/test/txtfiles/link_panel_1_1_1.txt b/test/txtfiles/link_panel_1_1_1.txt index 287daae9a..09073a87c 100644 --- a/test/txtfiles/link_panel_1_1_1.txt +++ b/test/txtfiles/link_panel_1_1_1.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ -╰─────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ +╰─────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_1_2.txt b/test/txtfiles/link_panel_1_1_2.txt index bcaddf598..c755c0570 100644 --- a/test/txtfiles/link_panel_1_1_2.txt +++ b/test/txtfiles/link_panel_1_1_2.txt @@ -1,4 +1,4 @@ -╭─────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ -│ abcd │ -╰─────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; │ +│ abcd │ +╰─────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_1_3.txt b/test/txtfiles/link_panel_1_1_3.txt index ab3d10a0d..18c19ad20 100644 --- a/test/txtfiles/link_panel_1_1_3.txt +++ b/test/txtfiles/link_panel_1_1_3.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\abcd │ -╰─────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;abcd │ +╰─────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_1_4.txt b/test/txtfiles/link_panel_1_1_4.txt index 6ac2545bf..c3d08369f 100644 --- a/test/txtfiles/link_panel_1_1_4.txt +++ b/test/txtfiles/link_panel_1_1_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_1_5.txt b/test/txtfiles/link_panel_1_1_5.txt index 914b0e99e..cc767f6d9 100644 --- a/test/txtfiles/link_panel_1_1_5.txt +++ b/test/txtfiles/link_panel_1_1_5.txt @@ -1,6 +1,6 @@ -╭──────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ -│ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ │ -│ ╰────────────────────────────────────────────────╯ │ -╰──────────────────────────────────────────────────────╯ +╭───────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; │ +│ ╭────────────────────────────────────────────────╮ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ │ +│ ╰────────────────────────────────────────────────╯ │ +╰───────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_2_1.txt b/test/txtfiles/link_panel_1_2_1.txt index 96a700620..8ca6c9268 100644 --- a/test/txtfiles/link_panel_1_2_1.txt +++ b/test/txtfiles/link_panel_1_2_1.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl ]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_2_2.txt b/test/txtfiles/link_panel_1_2_2.txt index 8d6421869..e36762fc7 100644 --- a/test/txtfiles/link_panel_1_2_2.txt +++ b/test/txtfiles/link_panel_1_2_2.txt @@ -1,4 +1,4 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; │ │ abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_2_3.txt b/test/txtfiles/link_panel_1_2_3.txt index 6d42ae7c9..3c2be3462 100644 --- a/test/txtfiles/link_panel_1_2_3.txt +++ b/test/txtfiles/link_panel_1_2_3.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\abcd │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_2_4.txt b/test/txtfiles/link_panel_1_2_4.txt index 6ac2545bf..c3d08369f 100644 --- a/test/txtfiles/link_panel_1_2_4.txt +++ b/test/txtfiles/link_panel_1_2_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_1_2_5.txt b/test/txtfiles/link_panel_1_2_5.txt index fbc0109ab..d031bc54b 100644 --- a/test/txtfiles/link_panel_1_2_5.txt +++ b/test/txtfiles/link_panel_1_2_5.txt @@ -1,6 +1,6 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;; │ │ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\...Term.jl/src/_tables.jl]8;;\ │ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl]8;;\ │ │ │ ╰────────────────────────────────────────────────╯ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_1_1.txt b/test/txtfiles/link_panel_2_1_1.txt index 695d054b0..6da0b2b49 100644 --- a/test/txtfiles/link_panel_2_1_1.txt +++ b/test/txtfiles/link_panel_2_1_1.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -╰─────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ +╰─────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_1_2.txt b/test/txtfiles/link_panel_2_1_2.txt index af1b3d71d..436a55f3f 100644 --- a/test/txtfiles/link_panel_2_1_2.txt +++ b/test/txtfiles/link_panel_2_1_2.txt @@ -1,4 +1,4 @@ -╭─────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -│ abcd │ -╰─────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ +│ abcd │ +╰─────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_1_3.txt b/test/txtfiles/link_panel_2_1_3.txt index 7dabf3024..6037bc5c0 100644 --- a/test/txtfiles/link_panel_2_1_3.txt +++ b/test/txtfiles/link_panel_2_1_3.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\abcd │ -╰─────────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;abcd │ +╰─────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_1_4.txt b/test/txtfiles/link_panel_2_1_4.txt index 40b283a71..f70214214 100644 --- a/test/txtfiles/link_panel_2_1_4.txt +++ b/test/txtfiles/link_panel_2_1_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_1_5.txt b/test/txtfiles/link_panel_2_1_5.txt index 0368aefee..9e4ba6d8a 100644 --- a/test/txtfiles/link_panel_2_1_5.txt +++ b/test/txtfiles/link_panel_2_1_5.txt @@ -1,6 +1,6 @@ -╭──────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -│ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ │ -│ ╰────────────────────────────────────────────────╯ │ -╰──────────────────────────────────────────────────────╯ +╭───────────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ +│ ╭────────────────────────────────────────────────╮ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ │ +│ ╰────────────────────────────────────────────────╯ │ +╰───────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_2_1.txt b/test/txtfiles/link_panel_2_2_1.txt index 18c4b3a89..9f38cc424 100644 --- a/test/txtfiles/link_panel_2_2_1.txt +++ b/test/txtfiles/link_panel_2_2_1.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234 ]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_2_2.txt b/test/txtfiles/link_panel_2_2_2.txt index d21f761fa..2e45235df 100644 --- a/test/txtfiles/link_panel_2_2_2.txt +++ b/test/txtfiles/link_panel_2_2_2.txt @@ -1,4 +1,4 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ │ abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_2_3.txt b/test/txtfiles/link_panel_2_2_3.txt index 5284f2b2f..50158a75a 100644 --- a/test/txtfiles/link_panel_2_2_3.txt +++ b/test/txtfiles/link_panel_2_2_3.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\abcd │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_2_4.txt b/test/txtfiles/link_panel_2_2_4.txt index 40b283a71..f70214214 100644 --- a/test/txtfiles/link_panel_2_2_4.txt +++ b/test/txtfiles/link_panel_2_2_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_2_2_5.txt b/test/txtfiles/link_panel_2_2_5.txt index 72510730d..2b1705375 100644 --- a/test/txtfiles/link_panel_2_2_5.txt +++ b/test/txtfiles/link_panel_2_2_5.txt @@ -1,6 +1,6 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ │ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ │ │ ╰────────────────────────────────────────────────╯ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_1_1.txt b/test/txtfiles/link_panel_3_1_1.txt index f0847444c..da9423810 100644 --- a/test/txtfiles/link_panel_3_1_1.txt +++ b/test/txtfiles/link_panel_3_1_1.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -╰─────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ +╰─────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_1_2.txt b/test/txtfiles/link_panel_3_1_2.txt index 56e45f7cb..23d67226e 100644 --- a/test/txtfiles/link_panel_3_1_2.txt +++ b/test/txtfiles/link_panel_3_1_2.txt @@ -1,4 +1,4 @@ -╭─────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -│ abcd │ -╰─────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ +│ abcd │ +╰─────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_1_3.txt b/test/txtfiles/link_panel_3_1_3.txt index 2643a31f2..d3e83af46 100644 --- a/test/txtfiles/link_panel_3_1_3.txt +++ b/test/txtfiles/link_panel_3_1_3.txt @@ -1,3 +1,3 @@ -╭─────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\abcd │ -╰─────────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;abcd │ +╰─────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_1_4.txt b/test/txtfiles/link_panel_3_1_4.txt index da77d0d9c..7e7c63274 100644 --- a/test/txtfiles/link_panel_3_1_4.txt +++ b/test/txtfiles/link_panel_3_1_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_1_5.txt b/test/txtfiles/link_panel_3_1_5.txt index 0c8f1d100..e101f902e 100644 --- a/test/txtfiles/link_panel_3_1_5.txt +++ b/test/txtfiles/link_panel_3_1_5.txt @@ -1,6 +1,6 @@ -╭──────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ -│ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ │ -│ ╰────────────────────────────────────────────────╯ │ -╰──────────────────────────────────────────────────────╯ +╭───────────────────────────────────────────────────────────────────────────╮ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ +│ ╭────────────────────────────────────────────────╮ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ │ +│ ╰────────────────────────────────────────────────╯ │ +╰───────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_2_1.txt b/test/txtfiles/link_panel_3_2_1.txt index 95e9da211..a1532675f 100644 --- a/test/txtfiles/link_panel_3_2_1.txt +++ b/test/txtfiles/link_panel_3_2_1.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234 ]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_2_2.txt b/test/txtfiles/link_panel_3_2_2.txt index 4b22d8615..204de25ac 100644 --- a/test/txtfiles/link_panel_3_2_2.txt +++ b/test/txtfiles/link_panel_3_2_2.txt @@ -1,4 +1,4 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ │ abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_2_3.txt b/test/txtfiles/link_panel_3_2_3.txt index df6a840b9..d67928e67 100644 --- a/test/txtfiles/link_panel_3_2_3.txt +++ b/test/txtfiles/link_panel_3_2_3.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\abcd │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;abcd │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_2_4.txt b/test/txtfiles/link_panel_3_2_4.txt index da77d0d9c..7e7c63274 100644 --- a/test/txtfiles/link_panel_3_2_4.txt +++ b/test/txtfiles/link_panel_3_2_4.txt @@ -1,3 +1,3 @@ ╭────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ ╰────────────────────────────────────────────────╯ diff --git a/test/txtfiles/link_panel_3_2_5.txt b/test/txtfiles/link_panel_3_2_5.txt index 86471b644..0d6a70dac 100644 --- a/test/txtfiles/link_panel_3_2_5.txt +++ b/test/txtfiles/link_panel_3_2_5.txt @@ -1,6 +1,6 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ +│ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;; │ │ ╭────────────────────────────────────────────────╮ │ -│ │ ]8;;/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\...Term.jl/src/_tables.jl 234]8;;\ │ │ +│ │ ]8;;file:///Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl#234\/Users/federicoclaudi/Documents/Github/Term.jl/src/_tables.jl:234]8;;\ │ │ │ ╰────────────────────────────────────────────────╯ │ ╰──────────────────────────────────────────────────────────────────────────────╯ diff --git a/test/txtfiles/markdown_3.txt b/test/txtfiles/markdown_3.txt index 20eec8e95..0eba8574d 100644 --- a/test/txtfiles/markdown_3.txt +++ b/test/txtfiles/markdown_3.txt @@ -1,16 +1,16 @@ -This is an example of markdown content rendered in Term.jl. -You can use markdown syntax to make words {bold}bold{/bold} and {italic}italic{/italic} -or insert {#FFF59D italic}`{/#FFF59D italic}literals{#FFF59D italic}`{/#FFF59D italic}. +This is an example of markdown content rendered in Term.jl. +You can use markdown syntax to make words {bold}bold{/bold} and {italic}italic{/italic} +or insert {#FFF59D italic}`{/#FFF59D italic}literals{#FFF59D italic}`{/#FFF59D italic}. -You markdown can include in-line latex {#FFF59D italic}ŁaTeX frac{{1}}{{2}}{/#FFF59D italic} and -maths in a new line too: +You markdown can include in-line latex {#FFF59D italic}ŁaTeX frac{{1}}{{2}}{/#FFF59D italic} and +maths in a new line too: - {#FFF59D italic}f(a) = \frac{1}{2\pi}\int_{0}^{2\pi} (\alpha+R\cos(\theta))d\theta{/#FFF59D italic}{/0}{/1} + {#FFF59D italic}f(a) = \frac{1}{2\pi}\int_{0}^{2\pi} (\alpha+R\cos(\theta))d\theta{/#FFF59D italic}{/0}{/1}  -You can also have links: {white bold}Julia{/white bold} {dim}(http://www.julialang.org){/dim} -and footnotes {#9aacdb}[1]{/#9aacdb} for your content {#9aacdb}[named]{/#9aacdb}. +You can also have links: {white bold}Julia{/white bold} {dim}(http://www.julialang.org){/dim} +and footnotes {#9aacdb}[1]{/#9aacdb} for your content {#9aacdb}[named]{/#9aacdb}. And, of course, you can show some code too: @@ -24,13 +24,13 @@ And, of course, you can show some code too: You can use "quotes" to highlight a section: - > “Multi-line quotes can be helpful to make a paragram - ┃ stand out, so that users - ┃ won't miss it! You can use other inline syntax in - ┃ you `quotes` too.” + > “Multi-line quotes can be helpful to make a paragram + ┃ stand out, so that users + ┃ won't miss it! You can use other inline syntax in + ┃ you `quotes` too.” -but if you really need to grab someone's attention, use -admonitions: +but if you really need to grab someone's attention, use +admonitions: ╭──── Note ────────────────────────────────────────╮ │ You can use different levels │ @@ -45,9 +45,9 @@ admonitions: ╰──────────────────────────────────────────────────╯ ╭──── Wow! ────────────────────────────────────────╮ - │ Turns out that admonitions can be pretty │ - │ useful! │ - │ What will you use them for? │ + │ Turns out that admonitions can be pretty │ + │ useful! │ + │ What will you use them for? │ ╰──────────────────────────────────────────────────╯ ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ @@ -70,11 +70,11 @@ and ordered lists too: ╭──── Tables ──────────────────────────────────────╮ - │ You can use the Markdown table syntax (https: │ - │ //www │ - │ .markdownguide.org/extended-sy │ - │ ntax/#tables) to insert tables - Term.jl will │ - │ convert them to Table object! │ + │ You can use the Markdown table syntax (https: │ + │ //www │ + │ .markdownguide.org/extended-sy │ + │ ntax/#tables) to insert tables - Term.jl will │ + │ convert them to Table object! │ ╰──────────────────────────────────────────────────╯ ╭───────────┬──────────────┬────────────╮ @@ -91,5 +91,5 @@ This is where you print the content of your foot notes: [1]: Numbered footnote text. -[note]: Named footnote text containing several toplevel -elements. \ No newline at end of file +[note]: Named footnote text containing several toplevel +elements. \ No newline at end of file diff --git a/test/txtfiles/mts_repr.txt b/test/txtfiles/mts_repr.txt index e9c684bfb..af4d08173 100644 --- a/test/txtfiles/mts_repr.txt +++ b/test/txtfiles/mts_repr.txt @@ -1,10 +1,10 @@ ╭─────────────────────────────────────────────────────────────╮ -│  x::String  aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa...   │ -│  y::Array   [0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0...   │ +│  x::String  aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa...   │ +│  y::Array   [0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0...   │ │  z::Int64   3   │ -│    ╭─────────────────────────────────────────...  │ -│  a::Panel  │...   │ -│    ╰─────────────────────────────────────────...  │ -│  c::String  b b bb b bb b bb b bb b bb b bb b bb...   │ +│    ╭─────────────────────────────────────────...  │ +│  a::Panel  │...   │ +│    ╰─────────────────────────────────────────...  │ +│  c::String  b b bb b bb b bb b bb b bb b bb b bb...   │ │   │ ╰─────────────────────────────────────────── MyTestStruct3 ───╯ diff --git a/test/txtfiles/nested_tags_reshape_1_1.txt b/test/txtfiles/nested_tags_reshape_1_1.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_1.txt +++ b/test/txtfiles/nested_tags_reshape_1_1.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_1_1_reverse.txt b/test/txtfiles/nested_tags_reshape_1_1_reverse.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_1_1_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_1_2.txt b/test/txtfiles/nested_tags_reshape_1_2.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_2.txt +++ b/test/txtfiles/nested_tags_reshape_1_2.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_1_2_reverse.txt b/test/txtfiles/nested_tags_reshape_1_2_reverse.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_1_2_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_1_3.txt b/test/txtfiles/nested_tags_reshape_1_3.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_3.txt +++ b/test/txtfiles/nested_tags_reshape_1_3.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_1_3_reverse.txt b/test/txtfiles/nested_tags_reshape_1_3_reverse.txt index 65d55af23..036562f24 100644 --- a/test/txtfiles/nested_tags_reshape_1_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_1_3_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_1.txt b/test/txtfiles/nested_tags_reshape_2_1.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_1.txt +++ b/test/txtfiles/nested_tags_reshape_2_1.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_1_reverse.txt b/test/txtfiles/nested_tags_reshape_2_1_reverse.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_2_1_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_2.txt b/test/txtfiles/nested_tags_reshape_2_2.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_2.txt +++ b/test/txtfiles/nested_tags_reshape_2_2.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_2_reverse.txt b/test/txtfiles/nested_tags_reshape_2_2_reverse.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_2_2_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_3.txt b/test/txtfiles/nested_tags_reshape_2_3.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_3.txt +++ b/test/txtfiles/nested_tags_reshape_2_3.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_2_3_reverse.txt b/test/txtfiles/nested_tags_reshape_2_3_reverse.txt index a04a4847d..6216673a8 100644 --- a/test/txtfiles/nested_tags_reshape_2_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_2_3_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa dad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa dad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_1.txt b/test/txtfiles/nested_tags_reshape_3_1.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_1.txt +++ b/test/txtfiles/nested_tags_reshape_3_1.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_1_reverse.txt b/test/txtfiles/nested_tags_reshape_3_1_reverse.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_3_1_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_2.txt b/test/txtfiles/nested_tags_reshape_3_2.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_2.txt +++ b/test/txtfiles/nested_tags_reshape_3_2.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_2_reverse.txt b/test/txtfiles/nested_tags_reshape_3_2_reverse.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_3_2_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_3.txt b/test/txtfiles/nested_tags_reshape_3_3.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_3.txt +++ b/test/txtfiles/nested_tags_reshape_3_3.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_3_3_reverse.txt b/test/txtfiles/nested_tags_reshape_3_3_reverse.txt index fbd17b63d..4a0b71f97 100644 --- a/test/txtfiles/nested_tags_reshape_3_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_3_3_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_1.txt b/test/txtfiles/nested_tags_reshape_4_1.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_1.txt +++ b/test/txtfiles/nested_tags_reshape_4_1.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_1_reverse.txt b/test/txtfiles/nested_tags_reshape_4_1_reverse.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_4_1_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_2.txt b/test/txtfiles/nested_tags_reshape_4_2.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_2.txt +++ b/test/txtfiles/nested_tags_reshape_4_2.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_2_reverse.txt b/test/txtfiles/nested_tags_reshape_4_2_reverse.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_4_2_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_3.txt b/test/txtfiles/nested_tags_reshape_4_3.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_3.txt +++ b/test/txtfiles/nested_tags_reshape_4_3.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_4_3_reverse.txt b/test/txtfiles/nested_tags_reshape_4_3_reverse.txt index a2f371297..04c1acb66 100644 --- a/test/txtfiles/nested_tags_reshape_4_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_4_3_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad  -asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad  +asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_1.txt b/test/txtfiles/nested_tags_reshape_5_1.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_1.txt +++ b/test/txtfiles/nested_tags_reshape_5_1.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_1_reverse.txt b/test/txtfiles/nested_tags_reshape_5_1_reverse.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_5_1_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_2.txt b/test/txtfiles/nested_tags_reshape_5_2.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_2.txt +++ b/test/txtfiles/nested_tags_reshape_5_2.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_2_reverse.txt b/test/txtfiles/nested_tags_reshape_5_2_reverse.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_5_2_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_3.txt b/test/txtfiles/nested_tags_reshape_5_3.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_3.txt +++ b/test/txtfiles/nested_tags_reshape_5_3.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_5_3_reverse.txt b/test/txtfiles/nested_tags_reshape_5_3_reverse.txt index b5231b231..301415e0b 100644 --- a/test/txtfiles/nested_tags_reshape_5_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_5_3_reverse.txt @@ -1,3 +1,3 @@ -adasd ad sa dsa ad  -sd d ads ad da dad asad - asdsa ddfsf ad a  \ No newline at end of file +adasd ad sa dsa ad  +sd d ads ad da dad asad + asdsa ddfsf ad a  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_1.txt b/test/txtfiles/nested_tags_reshape_6_1.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_1.txt +++ b/test/txtfiles/nested_tags_reshape_6_1.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_1_reverse.txt b/test/txtfiles/nested_tags_reshape_6_1_reverse.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_1_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_6_1_reverse.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_2.txt b/test/txtfiles/nested_tags_reshape_6_2.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_2.txt +++ b/test/txtfiles/nested_tags_reshape_6_2.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_2_reverse.txt b/test/txtfiles/nested_tags_reshape_6_2_reverse.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_2_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_6_2_reverse.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_3.txt b/test/txtfiles/nested_tags_reshape_6_3.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_3.txt +++ b/test/txtfiles/nested_tags_reshape_6_3.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/nested_tags_reshape_6_3_reverse.txt b/test/txtfiles/nested_tags_reshape_6_3_reverse.txt index d5d8b1a63..e97b674b9 100644 --- a/test/txtfiles/nested_tags_reshape_6_3_reverse.txt +++ b/test/txtfiles/nested_tags_reshape_6_3_reverse.txt @@ -1,7 +1,7 @@ - pink pink bold  pink -bold blue  pink bold - pink  pink on blue - just on blue  NOW SIMPLE - WHITE  red red red - white white  underline -underline  \ No newline at end of file + pink pink bold  pink +bold blue  pink bold + pink  pink on blue + just on blue  NOW SIMPLE + WHITE  red red red + white white  underline +underline  \ No newline at end of file diff --git a/test/txtfiles/panels_layout_macro.txt b/test/txtfiles/panels_layout_macro.txt index 26aca855d..aa962c307 100644 --- a/test/txtfiles/panels_layout_macro.txt +++ b/test/txtfiles/panels_layout_macro.txt @@ -9,9 +9,9 @@ │ │ ╰──────────────────────────────────────────────────────────────────╯ │ │ │ ╰────────────────────────────────────────────────────────────────────────╯ │ │ ╭────────────────────────────────────────────────────────────────────────╮ │ -│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ -│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ -│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ +│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ +│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ +│ │ inner2 inner2 inner2 inner2 inner2 inner2 inner2 │ │ │ ╰────────────────────────────────────────────────────────────────────────╯ │ │ test │ │ adasdasda │ diff --git a/test/txtfiles/pbar_cols_style_1.txt b/test/txtfiles/pbar_cols_style_1.txt new file mode 100644 index 000000000..62ef92942 --- /dev/null +++ b/test/txtfiles/pbar_cols_style_1.txt @@ -0,0 +1 @@ +Running... ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_2.txt b/test/txtfiles/pbar_cols_style_2.txt new file mode 100644 index 000000000..e02241074 --- /dev/null +++ b/test/txtfiles/pbar_cols_style_2.txt @@ -0,0 +1 @@ +Running... ● ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ ● 10/10 100% \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_3.txt b/test/txtfiles/pbar_cols_style_3.txt new file mode 100644 index 000000000..d0fd50031 --- /dev/null +++ b/test/txtfiles/pbar_cols_style_3.txt @@ -0,0 +1 @@ +Running...   ( ● )   10 \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_4.txt b/test/txtfiles/pbar_cols_style_4.txt new file mode 100644 index 000000000..73421fe7b --- /dev/null +++ b/test/txtfiles/pbar_cols_style_4.txt @@ -0,0 +1 @@ +Running... ● ━━━━━━━━━━ ● 10/10 100% ● elapsed: 219ms remaining: 0.0ms \ No newline at end of file diff --git a/test/txtfiles/pbar_customization.txt b/test/txtfiles/pbar_customization.txt new file mode 100644 index 000000000..97896a0bc --- /dev/null +++ b/test/txtfiles/pbar_customization.txt @@ -0,0 +1 @@ +nothing \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_1.txt b/test/txtfiles/rend_text_shape_1.txt index 703b1e519..092b7d540 100644 --- a/test/txtfiles/rend_text_shape_1.txt +++ b/test/txtfiles/rend_text_shape_1.txt @@ -1,63 +1,63 @@ -Lorem -ipsum -dolor -sit -amet, -consectet -ur adipis -cing -elit, -sed -do eiusmo -d tempor -incididun -t ut -labore -et dolore - magna -aliqua. -Ut enim -ad minim -veniam, -quis -nostrud -exercitat -ion -ullamco -laboris -nisi -ut aliqui -p ex -ea commod -o consequ -at. -Duis -aute -irure -dolor -in repreh -enderit -in volupt -ate -velit -esse -cillum -dolore -eu fugiat - nulla -pariatur. - Excepteu -r sint -occaecat -cupidatat - non -proident, - sunt -in culpa -qui -officia -deserunt -mollit -anim -id est -laborum. \ No newline at end of file +Lorem +ipsum +dolor +sit +amet, +consectet +ur adipis +cing +elit, +sed +do eiusmo +d tempor +incididun +t ut +labore +et dolore + magna +aliqua. +Ut enim +ad minim +veniam, +quis +nostrud +exercitat +ion +ullamco +laboris +nisi +ut aliqui +p ex +ea commod +o consequ +at. +Duis +aute +irure +dolor +in repreh +enderit +in volupt +ate +velit +esse +cillum +dolore +eu fugiat + nulla +pariatur. + Excepteu +r sint +occaecat +cupidatat + non +proident, + sunt +in culpa +qui +officia +deserunt +mollit +anim +id est +laborum. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_2.txt b/test/txtfiles/rend_text_shape_2.txt index 6c490abd9..2b60b0880 100644 --- a/test/txtfiles/rend_text_shape_2.txt +++ b/test/txtfiles/rend_text_shape_2.txt @@ -1,52 +1,52 @@ -Lorem -ipsum -dolor -sit amet, -consectetur - adipiscing - elit, -sed do -eiusmod -tempor -incididunt -ut labore -et dolore -magna -aliqua. -Ut enim -ad minim -veniam, -quis nostru -d exercitat -ion ullamco - laboris -nisi ut -aliquip -ex ea -commodo -consequat. -Duis aute -irure -dolor -in reprehen -derit -in voluptat -e velit -esse cillum - dolore -eu fugiat -nulla -pariatur. -Excepteur -sint occaec -at cupidata -t non -proident, -sunt in -culpa -qui officia - deserunt -mollit -anim id -est laborum -. \ No newline at end of file +Lorem +ipsum +dolor +sit amet, +consectetur + adipiscing + elit, +sed do +eiusmod +tempor +incididunt +ut labore +et dolore +magna +aliqua. +Ut enim +ad minim +veniam, +quis nostru +d exercitat +ion ullamco + laboris +nisi ut +aliquip +ex ea +commodo +consequat. +Duis aute +irure +dolor +in reprehen +derit +in voluptat +e velit +esse cillum + dolore +eu fugiat +nulla +pariatur. +Excepteur +sint occaec +at cupidata +t non +proident, +sunt in +culpa +qui officia + deserunt +mollit +anim id +est laborum +. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_3.txt b/test/txtfiles/rend_text_shape_3.txt index 0ace1bc4b..65f25258e 100644 --- a/test/txtfiles/rend_text_shape_3.txt +++ b/test/txtfiles/rend_text_shape_3.txt @@ -1,37 +1,37 @@ -Lorem ipsum -dolor sit -amet, consecte -tur adipiscing - elit, sed -do eiusmod -tempor incidid -unt ut labore -et dolore -magna aliqua. -Ut enim ad -minim veniam, -quis nostrud -exercitation -ullamco labori -s nisi ut -aliquip ex -ea commodo -consequat. -Duis aute -irure dolor -in reprehender -it in voluptat -e velit esse -cillum dolore -eu fugiat -nulla pariatur -. Excepteur -sint occaecat -cupidatat -non proident, -sunt in culpa -qui officia -deserunt -mollit anim -id est laborum -. \ No newline at end of file +Lorem ipsum +dolor sit +amet, consecte +tur adipiscing + elit, sed +do eiusmod +tempor incidid +unt ut labore +et dolore +magna aliqua. +Ut enim ad +minim veniam, +quis nostrud +exercitation +ullamco labori +s nisi ut +aliquip ex +ea commodo +consequat. +Duis aute +irure dolor +in reprehender +it in voluptat +e velit esse +cillum dolore +eu fugiat +nulla pariatur +. Excepteur +sint occaecat +cupidatat +non proident, +sunt in culpa +qui officia +deserunt +mollit anim +id est laborum +. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_4.txt b/test/txtfiles/rend_text_shape_4.txt index d95a1025d..2d68101f9 100644 --- a/test/txtfiles/rend_text_shape_4.txt +++ b/test/txtfiles/rend_text_shape_4.txt @@ -1,30 +1,30 @@ -Lorem ipsum -dolor sit amet, -consectetur -adipiscing elit, -sed do eiusmod -tempor incididunt - ut labore et -dolore magna -aliqua. Ut enim -ad minim veniam, -quis nostrud -exercitation -ullamco laboris -nisi ut aliquip -ex ea commodo -consequat. Duis -aute irure dolor -in reprehenderit -in voluptate -velit esse cillum - dolore eu fugiat - nulla pariatur. -Excepteur sint -occaecat cupidata -t non proident, -sunt in culpa -qui officia -deserunt mollit -anim id est -laborum. \ No newline at end of file +Lorem ipsum +dolor sit amet, +consectetur +adipiscing elit, +sed do eiusmod +tempor incididunt + ut labore et +dolore magna +aliqua. Ut enim +ad minim veniam, +quis nostrud +exercitation +ullamco laboris +nisi ut aliquip +ex ea commodo +consequat. Duis +aute irure dolor +in reprehenderit +in voluptate +velit esse cillum + dolore eu fugiat + nulla pariatur. +Excepteur sint +occaecat cupidata +t non proident, +sunt in culpa +qui officia +deserunt mollit +anim id est +laborum. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_5.txt b/test/txtfiles/rend_text_shape_5.txt index 380488eb6..cc1969ec4 100644 --- a/test/txtfiles/rend_text_shape_5.txt +++ b/test/txtfiles/rend_text_shape_5.txt @@ -1,22 +1,22 @@ -Lorem ipsum dolor -sit amet, consectetur -adipiscing elit, -sed do eiusmod tempor -incididunt ut labore -et dolore magna aliqua -. Ut enim ad minim -veniam, quis nostrud -exercitation ullamco -laboris nisi ut aliqui -p ex ea commodo conseq -uat. Duis aute irure -dolor in reprehenderit - in voluptate velit -esse cillum dolore -eu fugiat nulla pariat -ur. Excepteur sint -occaecat cupidatat -non proident, sunt -in culpa qui officia -deserunt mollit anim -id est laborum. \ No newline at end of file +Lorem ipsum dolor +sit amet, consectetur +adipiscing elit, +sed do eiusmod tempor +incididunt ut labore +et dolore magna aliqua +. Ut enim ad minim +veniam, quis nostrud +exercitation ullamco +laboris nisi ut aliqui +p ex ea commodo conseq +uat. Duis aute irure +dolor in reprehenderit + in voluptate velit +esse cillum dolore +eu fugiat nulla pariat +ur. Excepteur sint +occaecat cupidatat +non proident, sunt +in culpa qui officia +deserunt mollit anim +id est laborum. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_6.txt b/test/txtfiles/rend_text_shape_6.txt index f2a118a09..d0e378d4e 100644 --- a/test/txtfiles/rend_text_shape_6.txt +++ b/test/txtfiles/rend_text_shape_6.txt @@ -1,20 +1,20 @@ -Lorem ipsum dolor sit -amet, consectetur adipis -cing elit, sed do eiusmo -d tempor incididunt -ut labore et dolore -magna aliqua. Ut enim -ad minim veniam, quis -nostrud exercitation -ullamco laboris nisi -ut aliquip ex ea commodo - consequat. Duis aute -irure dolor in reprehend -erit in voluptate velit -esse cillum dolore -eu fugiat nulla pariatur -. Excepteur sint occaeca -t cupidatat non proident -, sunt in culpa qui -officia deserunt mollit -anim id est laborum. \ No newline at end of file +Lorem ipsum dolor sit +amet, consectetur adipis +cing elit, sed do eiusmo +d tempor incididunt +ut labore et dolore +magna aliqua. Ut enim +ad minim veniam, quis +nostrud exercitation +ullamco laboris nisi +ut aliquip ex ea commodo + consequat. Duis aute +irure dolor in reprehend +erit in voluptate velit +esse cillum dolore +eu fugiat nulla pariatur +. Excepteur sint occaeca +t cupidatat non proident +, sunt in culpa qui +officia deserunt mollit +anim id est laborum. \ No newline at end of file diff --git a/test/txtfiles/rend_text_shape_7.txt b/test/txtfiles/rend_text_shape_7.txt index 4a12bdaca..832b0987d 100644 --- a/test/txtfiles/rend_text_shape_7.txt +++ b/test/txtfiles/rend_text_shape_7.txt @@ -1,8 +1,8 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit, -sed do eiusmod tempor incididunt ut labore et dolore magna -aliqua. Ut enim ad minim veniam, quis nostrud exercitation -ullamco laboris nisi ut aliquip ex ea commodo consequat. -Duis aute irure dolor in reprehenderit in voluptate velit -esse cillum dolore eu fugiat nulla pariatur. Excepteur -sint occaecat cupidatat non proident, sunt in culpa qui -officia deserunt mollit anim id est laborum. \ No newline at end of file +Lorem ipsum dolor sit amet, consectetur adipiscing elit, +sed do eiusmod tempor incididunt ut labore et dolore magna +aliqua. Ut enim ad minim veniam, quis nostrud exercitation +ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit +esse cillum dolore eu fugiat nulla pariatur. Excepteur +sint occaecat cupidatat non proident, sunt in culpa qui +officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/test/txtfiles/renderable_text_1.txt b/test/txtfiles/renderable_text_1.txt index e75b36edc..cfb5957af 100644 --- a/test/txtfiles/renderable_text_1.txt +++ b/test/txtfiles/renderable_text_1.txt @@ -1,4 +1,4 @@ - Lorem ipsum dolor sit amet, - consectetur adipiscing elit, - sed do eiusmod tempor incidid - unt ut labore \ No newline at end of file + Lorem ipsum dolor sit amet, + consectetur adipiscing elit, + sed do eiusmod tempor incidid + unt ut labore \ No newline at end of file diff --git a/test/txtfiles/renderable_text_2.txt b/test/txtfiles/renderable_text_2.txt index 39c5914ff..88b52ce17 100644 --- a/test/txtfiles/renderable_text_2.txt +++ b/test/txtfiles/renderable_text_2.txt @@ -1,4 +1,4 @@ - Lorem ipsum dolor sit amet,  - consectetur adipiscing elit,  -sed do eiusmod tempor incidid  - unt ut labore  \ No newline at end of file + Lorem ipsum dolor sit amet,  + consectetur adipiscing elit,  +sed do eiusmod tempor incidid  + unt ut labore  \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_1_1.txt b/test/txtfiles/reshaped_code_1_1.txt index 9e42e4052..462d1848c 100644 --- a/test/txtfiles/reshaped_code_1_1.txt +++ b/test/txtfiles/reshaped_code_1_1.txt @@ -1,4 +1,4 @@ -Table(data::Matrix{{Float64}}; -kwargs::Base.Pairs{Symbol, -Union{{}}, Tuple{{}}, NamedTuple -{(), Tuple{{}}}}) \ No newline at end of file +Table(data::Matrix{{Float64}}; +kwargs::Base.Pairs{Symbol, +Union{{}}, Tuple{{}}, NamedTuple +{(), Tuple{{}}}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_1_2.txt b/test/txtfiles/reshaped_code_1_2.txt index d83fb1e2c..39ac3d57d 100644 --- a/test/txtfiles/reshaped_code_1_2.txt +++ b/test/txtfiles/reshaped_code_1_2.txt @@ -1,2 +1,2 @@ -Table(data::Matrix{{Float64}}; kwargs::Base.Pairs{Symbol, Union{{ -}}, Tuple{{}}, NamedTuple{(), Tuple{{}}}}) \ No newline at end of file +Table(data::Matrix{{Float64}}; kwargs::Base.Pairs{Symbol, Union{{ +}}, Tuple{{}}, NamedTuple{(), Tuple{{}}}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_1_3.txt b/test/txtfiles/reshaped_code_1_3.txt index afc233501..9883ee99a 100644 --- a/test/txtfiles/reshaped_code_1_3.txt +++ b/test/txtfiles/reshaped_code_1_3.txt @@ -1,2 +1,2 @@ -Table(data::Matrix{{Float64}}; kwargs::Base.Pairs{Symbol, Union{{}}, Tuple{{}}, NamedTup -le{(), Tuple{{}}}}) \ No newline at end of file +Table(data::Matrix{{Float64}}; kwargs::Base.Pairs{Symbol, Union{{}}, Tuple{{}}, NamedTup +le{(), Tuple{{}}}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_2_1.txt b/test/txtfiles/reshaped_code_2_1.txt index e87357720..c7e3ad1ac 100644 --- a/test/txtfiles/reshaped_code_2_1.txt +++ b/test/txtfiles/reshaped_code_2_1.txt @@ -1,2 +1,2 @@ -{{}}}, Tuple{{}}, NamedTuple{(), - Tuple{{}}}})Table \ No newline at end of file +{{}}}, Tuple{{}}, NamedTuple{(), + Tuple{{}}}})Table \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_3_1.txt b/test/txtfiles/reshaped_code_3_1.txt index a85d12fef..07837378f 100644 --- a/test/txtfiles/reshaped_code_3_1.txt +++ b/test/txtfiles/reshaped_code_3_1.txt @@ -1,12 +1,12 @@ -Table(tb::Tables.MatrixTable{Mat -rix{{Float64}}}; box::Symbol, -style::String, hpad::Int64, -vpad::Int64, vertical_justify::S -ymbol, show_header::Bool, header -::Nothing, header_style::String, - header_justify::Nothing, column -s_style::String, columns_justify -::Symbol, columns_widths::Nothin -g, footer::Nothing, footer_style -::String, footer_justify::Symbol -, compact::Bool) \ No newline at end of file +Table(tb::Tables.MatrixTable{Mat +rix{{Float64}}}; box::Symbol, +style::String, hpad::Int64, +vpad::Int64, vertical_justify::S +ymbol, show_header::Bool, header +::Nothing, header_style::String, + header_justify::Nothing, column +s_style::String, columns_justify +::Symbol, columns_widths::Nothin +g, footer::Nothing, footer_style +::String, footer_justify::Symbol +, compact::Bool) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_3_2.txt b/test/txtfiles/reshaped_code_3_2.txt index b2e90d6d8..cf1948a66 100644 --- a/test/txtfiles/reshaped_code_3_2.txt +++ b/test/txtfiles/reshaped_code_3_2.txt @@ -1,6 +1,6 @@ -Table(tb::Tables.MatrixTable{Matrix{{Float64}}}; box::Symbol, -style::String, hpad::Int64, vpad::Int64, vertical_justify::Symbol -, show_header::Bool, header::Nothing, header_style::String, -header_justify::Nothing, columns_style::String, columns_justify:: -Symbol, columns_widths::Nothing, footer::Nothing, footer_style::S -tring, footer_justify::Symbol, compact::Bool) \ No newline at end of file +Table(tb::Tables.MatrixTable{Matrix{{Float64}}}; box::Symbol, +style::String, hpad::Int64, vpad::Int64, vertical_justify::Symbol +, show_header::Bool, header::Nothing, header_style::String, +header_justify::Nothing, columns_style::String, columns_justify:: +Symbol, columns_widths::Nothing, footer::Nothing, footer_style::S +tring, footer_justify::Symbol, compact::Bool) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_3_3.txt b/test/txtfiles/reshaped_code_3_3.txt index a8158002e..fe1135b74 100644 --- a/test/txtfiles/reshaped_code_3_3.txt +++ b/test/txtfiles/reshaped_code_3_3.txt @@ -1,5 +1,5 @@ -Table(tb::Tables.MatrixTable{Matrix{{Float64}}}; box::Symbol, style::String, hpad::Int64 -, vpad::Int64, vertical_justify::Symbol, show_header::Bool, header::Nothing, header_styl -e::String, header_justify::Nothing, columns_style::String, columns_justify::Symbol, -columns_widths::Nothing, footer::Nothing, footer_style::String, footer_justify::Symbol, -compact::Bool) \ No newline at end of file +Table(tb::Tables.MatrixTable{Matrix{{Float64}}}; box::Symbol, style::String, hpad::Int64 +, vpad::Int64, vertical_justify::Symbol, show_header::Bool, header::Nothing, header_styl +e::String, header_justify::Nothing, columns_style::String, columns_justify::Symbol, +columns_widths::Nothing, footer::Nothing, footer_style::String, footer_justify::Symbol, +compact::Bool) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_4_1.txt b/test/txtfiles/reshaped_code_4_1.txt index 8a5860a8e..2e6b32456 100644 --- a/test/txtfiles/reshaped_code_4_1.txt +++ b/test/txtfiles/reshaped_code_4_1.txt @@ -1,10 +1,10 @@ -calc_columns_widths(N_cols::Int6 -4, N_rows::Int64, columns_widths -::Nothing, show_header::Bool, -header::Tuple{{String, String, -String}}, tb::Tables.MatrixTable -{Matrix{{Float64}}}, sch::Tables -.Schema{(:Column1, :Column2, -:Column3), Tuple{{Float64, -Float64, Float64}}}, footer::Not -hing, hpad::Vector{{Int64}}) \ No newline at end of file +calc_columns_widths(N_cols::Int6 +4, N_rows::Int64, columns_widths +::Nothing, show_header::Bool, +header::Tuple{{String, String, +String}}, tb::Tables.MatrixTable +{Matrix{{Float64}}}, sch::Tables +.Schema{(:Column1, :Column2, +:Column3), Tuple{{Float64, +Float64, Float64}}}, footer::Not +hing, hpad::Vector{{Int64}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_4_2.txt b/test/txtfiles/reshaped_code_4_2.txt index 006a3497e..8e7491649 100644 --- a/test/txtfiles/reshaped_code_4_2.txt +++ b/test/txtfiles/reshaped_code_4_2.txt @@ -1,5 +1,5 @@ -calc_columns_widths(N_cols::Int64, N_rows::Int64, columns_widths: -:Nothing, show_header::Bool, header::Tuple{{String, String, -String}}, tb::Tables.MatrixTable{Matrix{{Float64}}}, sch::Tables. -Schema{(:Column1, :Column2, :Column3), Tuple{{Float64, Float64, -Float64}}}, footer::Nothing, hpad::Vector{{Int64}}) \ No newline at end of file +calc_columns_widths(N_cols::Int64, N_rows::Int64, columns_widths: +:Nothing, show_header::Bool, header::Tuple{{String, String, +String}}, tb::Tables.MatrixTable{Matrix{{Float64}}}, sch::Tables. +Schema{(:Column1, :Column2, :Column3), Tuple{{Float64, Float64, +Float64}}}, footer::Nothing, hpad::Vector{{Int64}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_4_3.txt b/test/txtfiles/reshaped_code_4_3.txt index e737c0fc0..32ce9a432 100644 --- a/test/txtfiles/reshaped_code_4_3.txt +++ b/test/txtfiles/reshaped_code_4_3.txt @@ -1,4 +1,4 @@ -calc_columns_widths(N_cols::Int64, N_rows::Int64, columns_widths::Nothing, show_header:: -Bool, header::Tuple{{String, String, String}}, tb::Tables.MatrixTable{Matrix{{Float64}}} -, sch::Tables.Schema{(:Column1, :Column2, :Column3), Tuple{{Float64, Float64, Float64}}} -, footer::Nothing, hpad::Vector{{Int64}}) \ No newline at end of file +calc_columns_widths(N_cols::Int64, N_rows::Int64, columns_widths::Nothing, show_header:: +Bool, header::Tuple{{String, String, String}}, tb::Tables.MatrixTable{Matrix{{Float64}}} +, sch::Tables.Schema{(:Column1, :Column2, :Column3), Tuple{{Float64, Float64, Float64}}} +, footer::Nothing, hpad::Vector{{Int64}}) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_5_1.txt b/test/txtfiles/reshaped_code_5_1.txt index 0dc525401..7f5c63c22 100644 --- a/test/txtfiles/reshaped_code_5_1.txt +++ b/test/txtfiles/reshaped_code_5_1.txt @@ -1,3 +1,3 @@ -(::Term.Tables.var"#1#3"{Tables. -MatrixTable{Matrix{{Float64}}}}) -(c::Symbol) \ No newline at end of file +(::Term.Tables.var"#1#3"{Tables. +MatrixTable{Matrix{{Float64}}}}) +(c::Symbol) \ No newline at end of file diff --git a/test/txtfiles/reshaped_code_5_2.txt b/test/txtfiles/reshaped_code_5_2.txt index c6196382c..9f19f6f8d 100644 --- a/test/txtfiles/reshaped_code_5_2.txt +++ b/test/txtfiles/reshaped_code_5_2.txt @@ -1,2 +1,2 @@ -(::Term.Tables.var"#1#3"{Tables.MatrixTable{Matrix{{Float64}}}})( -c::Symbol) \ No newline at end of file +(::Term.Tables.var"#1#3"{Tables.MatrixTable{Matrix{{Float64}}}})( +c::Symbol) \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_1.txt b/test/txtfiles/reshaped_rend_with_markup_1.txt index 210237ad4..bc48ca9c9 100644 --- a/test/txtfiles/reshaped_rend_with_markup_1.txt +++ b/test/txtfiles/reshaped_rend_with_markup_1.txt @@ -1,7 +1,7 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_2.txt b/test/txtfiles/reshaped_rend_with_markup_2.txt index 210237ad4..bc48ca9c9 100644 --- a/test/txtfiles/reshaped_rend_with_markup_2.txt +++ b/test/txtfiles/reshaped_rend_with_markup_2.txt @@ -1,7 +1,7 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_3.txt b/test/txtfiles/reshaped_rend_with_markup_3.txt index 27fb7e3b0..a05ad6e14 100644 --- a/test/txtfiles/reshaped_rend_with_markup_3.txt +++ b/test/txtfiles/reshaped_rend_with_markup_3.txt @@ -1,12 +1,12 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  NOW SIMPLE  adasd │ -│ aads a asd ads a dasiud │ -│ h asjdnasdiuasda  │ -│ asdnaisudnadaiuda │ -│ sjduiabdiabd aduas │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  NOW SIMPLE  adasd │ +│ aads a asd ads a dasiud │ +│ h asjdnasdiuasda  │ +│ asdnaisudnadaiuda │ +│ sjduiabdiabd aduas │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_4.txt b/test/txtfiles/reshaped_rend_with_markup_4.txt index 27fb7e3b0..a05ad6e14 100644 --- a/test/txtfiles/reshaped_rend_with_markup_4.txt +++ b/test/txtfiles/reshaped_rend_with_markup_4.txt @@ -1,12 +1,12 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  NOW SIMPLE  adasd │ -│ aads a asd ads a dasiud │ -│ h asjdnasdiuasda  │ -│ asdnaisudnadaiuda │ -│ sjduiabdiabd aduas │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  NOW SIMPLE  adasd │ +│ aads a asd ads a dasiud │ +│ h asjdnasdiuasda  │ +│ asdnaisudnadaiuda │ +│ sjduiabdiabd aduas │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_5.txt b/test/txtfiles/reshaped_rend_with_markup_5.txt index 8cd71405f..d90d9de63 100644 --- a/test/txtfiles/reshaped_rend_with_markup_5.txt +++ b/test/txtfiles/reshaped_rend_with_markup_5.txt @@ -1,12 +1,12 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  NOW SIMPLE  adasd │ -│ aads a asd ads a dasiud │ -│ h asjdnasdiuasda  │ -│ asdnaisudnadaiuda │ -│ sjduiabdiabd aduas │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  NOW SIMPLE  adasd │ +│ aads a asd ads a dasiud │ +│ h asjdnasdiuasda  │ +│ asdnaisudnadaiuda │ +│ sjduiabdiabd aduas │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_rend_with_markup_6.txt b/test/txtfiles/reshaped_rend_with_markup_6.txt index 8cd71405f..d90d9de63 100644 --- a/test/txtfiles/reshaped_rend_with_markup_6.txt +++ b/test/txtfiles/reshaped_rend_with_markup_6.txt @@ -1,12 +1,12 @@ ╭────────────────────────────╮ -│ dasda asda dadasdaaadas │ -│ daddad asd ad ad ad │ -│ asdadadada ad as sad │ -│ ad adaad adas sd ads │ -│  NOW SIMPLE  adasd │ -│ aads a asd ads a dasiud │ -│ h asjdnasdiuasda  │ -│ asdnaisudnadaiuda │ -│ sjduiabdiabd aduas │ -│  │ +│ dasda asda dadasdaaadas │ +│ daddad asd ad ad ad │ +│ asdadadada ad as sad │ +│ ad adaad adas sd ads │ +│  NOW SIMPLE  adasd │ +│ aads a asd ads a dasiud │ +│ h asjdnasdiuasda  │ +│ asdnaisudnadaiuda │ +│ sjduiabdiabd aduas │ +│  │ ╰────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_1.txt b/test/txtfiles/reshaped_text_1.txt index 95b4477ac..d7f897a4e 100644 --- a/test/txtfiles/reshaped_text_1.txt +++ b/test/txtfiles/reshaped_text_1.txt @@ -1,5 +1,4 @@ -Lorem ipsum dolor sit amet, -consectetur adipiscing elit, -sed do eiusmod tempor incididunt -ut labore et dolore magna aliqua. - \ No newline at end of file +Lorem ipsum dolor sit amet, +consectetur adipiscing elit, +sed do eiusmod tempor incididunt +ut labore et dolore magna aliqua. \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_10.txt b/test/txtfiles/reshaped_text_10.txt index 01c13ccc6..fac437825 100644 --- a/test/txtfiles/reshaped_text_10.txt +++ b/test/txtfiles/reshaped_text_10.txt @@ -1,4 +1,3 @@ -┌────────────abcde────┬────────── -── ────┬────────abcde fghi─────── -─┬────────────────┬────────────── - \ No newline at end of file +┌────────────abcde────┬────────── +── ────┬────────abcde fghi─────── +─┬────────────────┬────────────── \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_11.txt b/test/txtfiles/reshaped_text_11.txt index da30ce0d3..183995532 100644 --- a/test/txtfiles/reshaped_text_11.txt +++ b/test/txtfiles/reshaped_text_11.txt @@ -1,4 +1,3 @@ -┌─────────{red}───ab{/red}cde────┬──────{green}────{/green} -{green}── ────┬────────abcde fghi{/green}─────── -─┬────────────────┬────────────── - \ No newline at end of file +┌─────────{red}───ab{/red}cde────┬──────{green}────{/green} +{green}── ────┬────────abcde fghi{/green}─────── +─┬────────────────┬────────────── \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_12.txt b/test/txtfiles/reshaped_text_12.txt index beaf852b7..00a3d6423 100644 --- a/test/txtfiles/reshaped_text_12.txt +++ b/test/txtfiles/reshaped_text_12.txt @@ -1,3 +1,3 @@ -┌──────────{red}────{/red}──┬{blue bold}───────────────{/blue bold} -{blue bold}─┬──{/blue bold}──────────────┬────────────── -──┬──────────────end \ No newline at end of file +┌──────────{red}────{/red}──┬{blue bold}───────────────{/blue bold} +{blue bold}─┬──{/blue bold}──────────────┬────────────── +──┬──────────────end \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_13.txt b/test/txtfiles/reshaped_text_13.txt index 7b7212d7a..56297f731 100644 --- a/test/txtfiles/reshaped_text_13.txt +++ b/test/txtfiles/reshaped_text_13.txt @@ -1,4 +1,4 @@ -................................. -................................. -................................. -. \ No newline at end of file +................................. +................................. +................................. +. \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_14.txt b/test/txtfiles/reshaped_text_14.txt index 4762367ef..dcbf81588 100644 --- a/test/txtfiles/reshaped_text_14.txt +++ b/test/txtfiles/reshaped_text_14.txt @@ -1,3 +1,3 @@ -.{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}..... -{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|{/red} -{red}||{/red}.....{red}|||{/red}.... \ No newline at end of file +.{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}..... +{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|||{/red}.....{red}|{/red} +{red}||{/red}.....{red}|||{/red}.... \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_15.txt b/test/txtfiles/reshaped_text_15.txt index af1e3ae70..1ead280c8 100644 --- a/test/txtfiles/reshaped_text_15.txt +++ b/test/txtfiles/reshaped_text_15.txt @@ -1,3 +1,3 @@ -.|||.....|||.....|||.....|||..... -|||.....|||.....|||.....|||.....| -||.....|||.... \ No newline at end of file +.|||.....|||.....|||.....|||..... +|||.....|||.....|||.....|||.....| +||.....|||.... \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_2.txt b/test/txtfiles/reshaped_text_2.txt index c0db40909..bc88bc21b 100644 --- a/test/txtfiles/reshaped_text_2.txt +++ b/test/txtfiles/reshaped_text_2.txt @@ -1,5 +1,4 @@ -Lorem {red}ipsum dolor sit {underline}amet,{/underline}{/red} -{red}{underline}consectetur{/underline} adipiscing elit,{/red} -{red}{/red}{blue}sed do eiusmod tempor incididunt{/blue} -ut labore et dolore magna aliqua. - \ No newline at end of file +Lorem {red}ipsum dolor sit {underline}amet,{/underline}{/red} +{red}{underline}consectetur{/underline} adipiscing elit,{/red} +{red}{/red}{blue}sed do eiusmod tempor incididunt{/blue} +ut labore et dolore magna aliqua. \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_3.txt b/test/txtfiles/reshaped_text_3.txt index 054f9d0b6..6bde4a576 100644 --- a/test/txtfiles/reshaped_text_3.txt +++ b/test/txtfiles/reshaped_text_3.txt @@ -1,4 +1,4 @@ -Lorem{red}ipsumdolorsit{underline}amet, consectet{/underline}{/red} -{red}{underline}ur{/underline} adipiscing elit, {/red}seddoeiusmo{blue}dt{/blue} -{blue}emporincididunt{/blue}ut labore et -dolore magna aliqua. \ No newline at end of file +Lorem{red}ipsumdolorsit{underline}amet, consectet{/underline}{/red} +{red}{underline}ur{/underline} adipiscing elit, {/red}seddoeiusmo{blue}dt{/blue} +{blue}emporincididunt{/blue}ut labore et +dolore magna aliqua. \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_4.txt b/test/txtfiles/reshaped_text_4.txt index b4d898987..6ae96a9dd 100644 --- a/test/txtfiles/reshaped_text_4.txt +++ b/test/txtfiles/reshaped_text_4.txt @@ -1,6 +1,6 @@ -ต้าอ่วยวาทกรรมอาว์เซี้ยว กระดี๊กระด๊า -ช็อปซาดิสต์โมจิดีพาร์ตเมนต์ อินดอร์วิว -สี่แยกมาร์กจ๊อกกี้ โซนี่บัตเตอร์ฮันนีมูน -ยาวีแพลนหงวนสคริปต์ แจ็กพ็อตต่อรองโทรโข -่งยากูซ่ารุมบ้า บอมบ์เบอร์รีวีเจดีพาร์ทเมนท์ -บอยคอตต์เฟอร์รี่บึมมาราธอน \ No newline at end of file +ต้าอ่วยวาทกรรมอาว์เซี้ยว กระดี๊กระด๊า +ช็อปซาดิสต์โมจิดีพาร์ตเมนต์ อินดอร์วิว +สี่แยกมาร์กจ๊อกกี้ โซนี่บัตเตอร์ฮันนีมูน +ยาวีแพลนหงวนสคริปต์ แจ็กพ็อตต่อรองโทรโข +่งยากูซ่ารุมบ้า บอมบ์เบอร์รีวีเจดีพาร์ทเมนท์ +บอยคอตต์เฟอร์รี่บึมมาราธอน \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_5.txt b/test/txtfiles/reshaped_text_5.txt index 6b05c1251..37519632e 100644 --- a/test/txtfiles/reshaped_text_5.txt +++ b/test/txtfiles/reshaped_text_5.txt @@ -1,6 +1,6 @@ -ต้าอ่วยวาท{red}กรรมอาว์เซี้ยว กระดี๊กระด๊า{/red} -{red}{/red}ช็อปซาดิสต์โมจิดีพาร์ตเม{blue underline}นต์ อินดอร์วิว{/blue underline} -{blue underline}สี่แยกมาร์กจ๊อกกี้ โซนี่บัตเต{/blue underline}อร์ฮันนีมูน -ยาวีแพลนหงวนสคริปต์ แจ็กพ็อตต่อรองโทรโข -่งยากูซ่ารุมบ้า บอมบ์เบอร์รีวีเจดีพาร์ทเมนท์ -บอยคอตต์เฟอร์รี่บึมมาราธอน \ No newline at end of file +ต้าอ่วยวาท{red}กรรมอาว์เซี้ยว กระดี๊กระด๊า{/red} +{red}{/red}ช็อปซาดิสต์โมจิดีพาร์ตเม{blue underline}นต์ อินดอร์วิว{/blue underline} +{blue underline}สี่แยกมาร์กจ๊อกกี้ โซนี่บัตเต{/blue underline}อร์ฮันนีมูน +ยาวีแพลนหงวนสคริปต์ แจ็กพ็อตต่อรองโทรโข +่งยากูซ่ารุมบ้า บอมบ์เบอร์รีวีเจดีพาร์ทเมนท์ +บอยคอตต์เฟอร์รี่บึมมาราธอน \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_6.txt b/test/txtfiles/reshaped_text_6.txt index dcffef1f4..dd4ecdd93 100644 --- a/test/txtfiles/reshaped_text_6.txt +++ b/test/txtfiles/reshaped_text_6.txt @@ -1,3 +1,3 @@ -국가유공자·상이군경 및 전몰군경의 - 유가족은 법률이 정하는 바에 -의하여 \ No newline at end of file +국가유공자·상이군경 및 전몰군경의 + 유가족은 법률이 정하는 바에 +의하여 \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_7.txt b/test/txtfiles/reshaped_text_7.txt index 61fe08b79..59dc9f7b7 100644 --- a/test/txtfiles/reshaped_text_7.txt +++ b/test/txtfiles/reshaped_text_7.txt @@ -1,3 +1,3 @@ -국{red}가유공자·상이군{bold}경 및 전{/bold}몰군경의{/red} -{red} 유{/red}가족은 법률이 정하는 바에 -의하여 \ No newline at end of file +국{red}가유공자·상이군{bold}경 및 전{/bold}몰군경의{/red} +{red} 유{/red}가족은 법률이 정하는 바에 +의하여 \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_8.txt b/test/txtfiles/reshaped_text_8.txt index 06ad0384d..57d4f3c6b 100644 --- a/test/txtfiles/reshaped_text_8.txt +++ b/test/txtfiles/reshaped_text_8.txt @@ -1,5 +1,5 @@ -朗眠裕安無際集正聞進士健音社野件草 -売規作独特認権価官家複入豚末告設悟 -自職遠氷育教載最週場仕踪持白炎組特 -曲強真雅立覧自価宰身訴側善論住理案 -者券真犯著避銀楽験館稿告 \ No newline at end of file +朗眠裕安無際集正聞進士健音社野件草 +売規作独特認権価官家複入豚末告設悟 +自職遠氷育教載最週場仕踪持白炎組特 +曲強真雅立覧自価宰身訴側善論住理案 +者券真犯著避銀楽験館稿告 \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_9.txt b/test/txtfiles/reshaped_text_9.txt index 4b0d7ff35..b5dcea749 100644 --- a/test/txtfiles/reshaped_text_9.txt +++ b/test/txtfiles/reshaped_text_9.txt @@ -1,3 +1,3 @@ -┌────────────────┬─────────────── -─┬────────────────┬────────────── -──┬────────────── \ No newline at end of file +┌────────────────┬─────────────── +─┬────────────────┬────────────── +──┬────────────── \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_1.txt b/test/txtfiles/reshaped_text_markuo_1_1.txt index 5688bf686..f925b01eb 100644 --- a/test/txtfiles/reshaped_text_markuo_1_1.txt +++ b/test/txtfiles/reshaped_text_markuo_1_1.txt @@ -1,4 +1,4 @@ -{red}dasda asda dadasda{green}aadasdad{/green}dad{/red} -{red}asd ad ad ad asdad{bold}adada ad{/bold}{/red} -{red}{bold}as sad ad ada{/red}ad adas sd ads{/bold} -{bold}{/bold} \ No newline at end of file +{red}dasda asda dadasda{green}aadasdad{/green}dad{/red} +{red}asd ad ad ad asdad{bold}adada ad{/bold}{/red} +{red}{bold}as sad ad ada{/red}ad adas sd ads{/bold} +{bold}{/bold} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_2.txt b/test/txtfiles/reshaped_text_markuo_1_2.txt index c16acfc3e..6eafbd480 100644 --- a/test/txtfiles/reshaped_text_markuo_1_2.txt +++ b/test/txtfiles/reshaped_text_markuo_1_2.txt @@ -1,2 +1,2 @@ -{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad {/blue}da dad {/green} asdsa dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad {/blue}da dad {/green} asdsa dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_3.txt b/test/txtfiles/reshaped_text_markuo_1_3.txt index c9dd991d2..4df8b3600 100644 --- a/test/txtfiles/reshaped_text_markuo_1_3.txt +++ b/test/txtfiles/reshaped_text_markuo_1_3.txt @@ -1,2 +1,2 @@ -{red}adasd ad sa dsa{bold} ad {blue} sd d ads{/blue}{/bold}{/red} -{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{bold} ad {blue} sd d ads{/blue}{/bold}{/red} +{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_4.txt b/test/txtfiles/reshaped_text_markuo_1_4.txt index ec64aeb16..4f654c9dc 100644 --- a/test/txtfiles/reshaped_text_markuo_1_4.txt +++ b/test/txtfiles/reshaped_text_markuo_1_4.txt @@ -1,3 +1,3 @@ -{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad da dad {/green} asdsa ddfsf {/blue}ad a{/red} -{red}{/red} \ No newline at end of file +{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad da dad {/green} asdsa ddfsf {/blue}ad a{/red} +{red}{/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_5.txt b/test/txtfiles/reshaped_text_markuo_1_5.txt index af62169ac..a08355efb 100644 --- a/test/txtfiles/reshaped_text_markuo_1_5.txt +++ b/test/txtfiles/reshaped_text_markuo_1_5.txt @@ -1,3 +1,3 @@ -{on_red}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_red} -{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa ddfsf ad a{/on_red} -{on_red}{/on_red} \ No newline at end of file +{on_red}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_red} +{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa ddfsf ad a{/on_red} +{on_red}{/on_red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_6.txt b/test/txtfiles/reshaped_text_markuo_1_6.txt index b2912d0da..93fc6ba61 100644 --- a/test/txtfiles/reshaped_text_markuo_1_6.txt +++ b/test/txtfiles/reshaped_text_markuo_1_6.txt @@ -1,3 +1,3 @@ -{on_(25, 25, 25)}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} -{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad {/green} asdsa ddfsf{/on_(25, 25, 25)} -{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file +{on_(25, 25, 25)}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} +{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad {/green} asdsa ddfsf{/on_(25, 25, 25)} +{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_1_7.txt b/test/txtfiles/reshaped_text_markuo_1_7.txt index 12dd7d682..08b199cf3 100644 --- a/test/txtfiles/reshaped_text_markuo_1_7.txt +++ b/test/txtfiles/reshaped_text_markuo_1_7.txt @@ -1,6 +1,6 @@ -{(220, 180, 150)} pink {bold}pink bold {dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} -{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold {/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} -{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on blue {/on_(25, 55, 100)} NOW -SIMPLE WHITE {red} red red red {/red} -white white {underline} underline underline{/underline} -{underline} {/underline} \ No newline at end of file +{(220, 180, 150)} pink {bold}pink bold {dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} +{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold {/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} +{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on blue {/on_(25, 55, 100)} NOW +SIMPLE WHITE {red} red red red {/red} +white white {underline} underline underline{/underline} +{underline} {/underline} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_1.txt b/test/txtfiles/reshaped_text_markuo_2_1.txt index 5688bf686..f925b01eb 100644 --- a/test/txtfiles/reshaped_text_markuo_2_1.txt +++ b/test/txtfiles/reshaped_text_markuo_2_1.txt @@ -1,4 +1,4 @@ -{red}dasda asda dadasda{green}aadasdad{/green}dad{/red} -{red}asd ad ad ad asdad{bold}adada ad{/bold}{/red} -{red}{bold}as sad ad ada{/red}ad adas sd ads{/bold} -{bold}{/bold} \ No newline at end of file +{red}dasda asda dadasda{green}aadasdad{/green}dad{/red} +{red}asd ad ad ad asdad{bold}adada ad{/bold}{/red} +{red}{bold}as sad ad ada{/red}ad adas sd ads{/bold} +{bold}{/bold} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_2.txt b/test/txtfiles/reshaped_text_markuo_2_2.txt index c16acfc3e..6eafbd480 100644 --- a/test/txtfiles/reshaped_text_markuo_2_2.txt +++ b/test/txtfiles/reshaped_text_markuo_2_2.txt @@ -1,2 +1,2 @@ -{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad {/blue}da dad {/green} asdsa dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad {/blue}da dad {/green} asdsa dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_3.txt b/test/txtfiles/reshaped_text_markuo_2_3.txt index c9dd991d2..4df8b3600 100644 --- a/test/txtfiles/reshaped_text_markuo_2_3.txt +++ b/test/txtfiles/reshaped_text_markuo_2_3.txt @@ -1,2 +1,2 @@ -{red}adasd ad sa dsa{bold} ad {blue} sd d ads{/blue}{/bold}{/red} -{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{bold} ad {blue} sd d ads{/blue}{/bold}{/red} +{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_4.txt b/test/txtfiles/reshaped_text_markuo_2_4.txt index ec64aeb16..4f654c9dc 100644 --- a/test/txtfiles/reshaped_text_markuo_2_4.txt +++ b/test/txtfiles/reshaped_text_markuo_2_4.txt @@ -1,3 +1,3 @@ -{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad da dad {/green} asdsa ddfsf {/blue}ad a{/red} -{red}{/red} \ No newline at end of file +{red}adasd ad sa dsa{green} ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad da dad {/green} asdsa ddfsf {/blue}ad a{/red} +{red}{/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_5.txt b/test/txtfiles/reshaped_text_markuo_2_5.txt index af62169ac..a08355efb 100644 --- a/test/txtfiles/reshaped_text_markuo_2_5.txt +++ b/test/txtfiles/reshaped_text_markuo_2_5.txt @@ -1,3 +1,3 @@ -{on_red}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_red} -{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa ddfsf ad a{/on_red} -{on_red}{/on_red} \ No newline at end of file +{on_red}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_red} +{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa ddfsf ad a{/on_red} +{on_red}{/on_red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_6.txt b/test/txtfiles/reshaped_text_markuo_2_6.txt index b2912d0da..93fc6ba61 100644 --- a/test/txtfiles/reshaped_text_markuo_2_6.txt +++ b/test/txtfiles/reshaped_text_markuo_2_6.txt @@ -1,3 +1,3 @@ -{on_(25, 25, 25)}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} -{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad {/green} asdsa ddfsf{/on_(25, 25, 25)} -{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file +{on_(25, 25, 25)}adasd ad sa dsa{green} ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} +{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad {/green} asdsa ddfsf{/on_(25, 25, 25)} +{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_2_7.txt b/test/txtfiles/reshaped_text_markuo_2_7.txt index 12dd7d682..08b199cf3 100644 --- a/test/txtfiles/reshaped_text_markuo_2_7.txt +++ b/test/txtfiles/reshaped_text_markuo_2_7.txt @@ -1,6 +1,6 @@ -{(220, 180, 150)} pink {bold}pink bold {dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} -{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold {/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} -{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on blue {/on_(25, 55, 100)} NOW -SIMPLE WHITE {red} red red red {/red} -white white {underline} underline underline{/underline} -{underline} {/underline} \ No newline at end of file +{(220, 180, 150)} pink {bold}pink bold {dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} +{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold {/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} +{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on blue {/on_(25, 55, 100)} NOW +SIMPLE WHITE {red} red red red {/red} +white white {underline} underline underline{/underline} +{underline} {/underline} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_1.txt b/test/txtfiles/reshaped_text_markuo_3_1.txt index bcbcc0cd1..aa3c818ac 100644 --- a/test/txtfiles/reshaped_text_markuo_3_1.txt +++ b/test/txtfiles/reshaped_text_markuo_3_1.txt @@ -1,7 +1,7 @@ -{red}dasda asda dadasda{green}aa{/green}{/red} -{red}{green}dasdad{/green}dad{/red} -{red}asd ad ad ad asdad{bold}ad{/bold}{/red} -{red}{bold}ada ad{/bold}{/red} -{red}{bold}as sad ad ada{/red}ad{/bold} -{bold}adas sd ads{/bold} -{bold}{/bold} \ No newline at end of file +{red}dasda asda dadasda{green}aa{/green}{/red} +{red}{green}dasdad{/green}dad{/red} +{red}asd ad ad ad asdad{bold}ad{/bold}{/red} +{red}{bold}ada ad{/bold}{/red} +{red}{bold}as sad ad ada{/red}ad{/bold} +{bold}adas sd ads{/bold} +{bold}{/bold} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_2.txt b/test/txtfiles/reshaped_text_markuo_3_2.txt index c513b6ca5..0bd6a7c8d 100644 --- a/test/txtfiles/reshaped_text_markuo_3_2.txt +++ b/test/txtfiles/reshaped_text_markuo_3_2.txt @@ -1,4 +1,4 @@ -{red}adasd ad sa dsa{green}{/green}{/red} -{red}{green}ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad {/blue}da dad {/green} asdsa{/red} -{red}dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{green}{/green}{/red} +{red}{green}ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad {/blue}da dad {/green} asdsa{/red} +{red}dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_3.txt b/test/txtfiles/reshaped_text_markuo_3_3.txt index f1e5057d8..0585982ff 100644 --- a/test/txtfiles/reshaped_text_markuo_3_3.txt +++ b/test/txtfiles/reshaped_text_markuo_3_3.txt @@ -1,4 +1,4 @@ -{red}adasd ad sa dsa{bold}{/bold}{/red} -{red}{bold}ad {blue} sd d ads{/blue}{/bold}{/red} -{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa{/red} -{red}dad a {/red} \ No newline at end of file +{red}adasd ad sa dsa{bold}{/bold}{/red} +{red}{bold}ad {blue} sd d ads{/blue}{/bold}{/red} +{red}{bold}{blue}ad {/blue}da dad {/bold} asdsa{/red} +{red}dad a {/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_4.txt b/test/txtfiles/reshaped_text_markuo_3_4.txt index c11306925..0303fd579 100644 --- a/test/txtfiles/reshaped_text_markuo_3_4.txt +++ b/test/txtfiles/reshaped_text_markuo_3_4.txt @@ -1,5 +1,5 @@ -{red}adasd ad sa dsa{green}{/green}{/red} -{red}{green}ad {blue} sd d ads{/blue}{/green}{/red} -{red}{green}{blue}ad da dad {/green} asdsa{/blue}{/red} -{red}{blue}ddfsf {/blue}ad a{/red} -{red}{/red} \ No newline at end of file +{red}adasd ad sa dsa{green}{/green}{/red} +{red}{green}ad {blue} sd d ads{/blue}{/green}{/red} +{red}{green}{blue}ad da dad {/green} asdsa{/blue}{/red} +{red}{blue}ddfsf {/blue}ad a{/red} +{red}{/red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_5.txt b/test/txtfiles/reshaped_text_markuo_3_5.txt index a58d61108..03a1c02e4 100644 --- a/test/txtfiles/reshaped_text_markuo_3_5.txt +++ b/test/txtfiles/reshaped_text_markuo_3_5.txt @@ -1,5 +1,5 @@ -{on_red}adasd ad sa dsa{green}{/green}{/on_red} -{on_red}{green}ad {on_black} sd d ads{/on_black}{/green}{/on_red} -{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa{/on_red} -{on_red}ddfsf ad a{/on_red} -{on_red}{/on_red} \ No newline at end of file +{on_red}adasd ad sa dsa{green}{/green}{/on_red} +{on_red}{green}ad {on_black} sd d ads{/on_black}{/green}{/on_red} +{on_red}{green}{on_black}ad da{/on_black} dad {/green} asdsa{/on_red} +{on_red}ddfsf ad a{/on_red} +{on_red}{/on_red} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_6.txt b/test/txtfiles/reshaped_text_markuo_3_6.txt index 4b38d97b5..5bd7367d1 100644 --- a/test/txtfiles/reshaped_text_markuo_3_6.txt +++ b/test/txtfiles/reshaped_text_markuo_3_6.txt @@ -1,5 +1,5 @@ -{on_(25, 25, 25)}adasd ad sa dsa{green}{/green}{/on_(25, 25, 25)} -{on_(25, 25, 25)}{green}ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} -{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad{/green}{/on_(25, 25, 25)} -{on_(25, 25, 25)}{green}{/green} asdsa ddfsf{/on_(25, 25, 25)} -{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file +{on_(25, 25, 25)}adasd ad sa dsa{green}{/green}{/on_(25, 25, 25)} +{on_(25, 25, 25)}{green}ad {on_black} sd d ads{/on_black}{/green}{/on_(25, 25, 25)} +{on_(25, 25, 25)}{green}{on_black}ad da{/on_black} {white}dad{/white} asad{/green}{/on_(25, 25, 25)} +{on_(25, 25, 25)}{green}{/green} asdsa ddfsf{/on_(25, 25, 25)} +{on_(25, 25, 25)}ad a {/on_(25, 25, 25)} \ No newline at end of file diff --git a/test/txtfiles/reshaped_text_markuo_3_7.txt b/test/txtfiles/reshaped_text_markuo_3_7.txt index 21a30199a..05775b196 100644 --- a/test/txtfiles/reshaped_text_markuo_3_7.txt +++ b/test/txtfiles/reshaped_text_markuo_3_7.txt @@ -1,11 +1,11 @@ -{(220, 180, 150)} pink {bold}pink bold{/bold}{/(220, 180, 150)} -{(220, 180, 150)}{bold}{dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} -{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold{/bold}{/(220, 180, 150)} -{(220, 180, 150)}{bold}{/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} -{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on{/on_(25, 55, 100)} -{on_(25, 55, 100)}blue {/on_(25, 55, 100)} NOW -SIMPLE WHITE {red} red{/red} -{red}red red {/red} -white white {underline} underli{/underline} -{underline}ne underline{/underline} -{underline} {/underline} \ No newline at end of file +{(220, 180, 150)} pink {bold}pink bold{/bold}{/(220, 180, 150)} +{(220, 180, 150)}{bold}{dodger_blue2} pink bold{/dodger_blue2}{/bold}{/(220, 180, 150)} +{(220, 180, 150)}{bold}{dodger_blue2}blue {/dodger_blue2} pink bold{/bold}{/(220, 180, 150)} +{(220, 180, 150)}{bold}{/bold} pink {on_(25, 55, 100)} pink{/on_(25, 55, 100)}{/(220, 180, 150)} +{(220, 180, 150)}{on_(25, 55, 100)}on blue {/(220, 180, 150)} just on{/on_(25, 55, 100)} +{on_(25, 55, 100)}blue {/on_(25, 55, 100)} NOW +SIMPLE WHITE {red} red{/red} +{red}red red {/red} +white white {underline} underli{/underline} +{underline}ne underline{/underline} +{underline} {/underline} \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_3_1.txt b/test/txtfiles/small_panel_title_5_3_1.txt index 93d141d20..6c0fb1160 100644 --- a/test/txtfiles/small_panel_title_5_3_1.txt +++ b/test/txtfiles/small_panel_title_5_3_1.txt @@ -1,3 +1,3 @@ -╭── a... ──╮ +╭── a... ──╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_3_2.txt b/test/txtfiles/small_panel_title_5_3_2.txt index 93d141d20..6c0fb1160 100644 --- a/test/txtfiles/small_panel_title_5_3_2.txt +++ b/test/txtfiles/small_panel_title_5_3_2.txt @@ -1,3 +1,3 @@ -╭── a... ──╮ +╭── a... ──╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_3_3.txt b/test/txtfiles/small_panel_title_5_3_3.txt index 9066433de..d46436226 100644 --- a/test/txtfiles/small_panel_title_5_3_3.txt +++ b/test/txtfiles/small_panel_title_5_3_3.txt @@ -1,3 +1,3 @@ -╭─ a... ───╮ +╭─ a... ───╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_4_1.txt b/test/txtfiles/small_panel_title_5_4_1.txt index 93d141d20..6c0fb1160 100644 --- a/test/txtfiles/small_panel_title_5_4_1.txt +++ b/test/txtfiles/small_panel_title_5_4_1.txt @@ -1,3 +1,3 @@ -╭── a... ──╮ +╭── a... ──╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_4_2.txt b/test/txtfiles/small_panel_title_5_4_2.txt index 93d141d20..6c0fb1160 100644 --- a/test/txtfiles/small_panel_title_5_4_2.txt +++ b/test/txtfiles/small_panel_title_5_4_2.txt @@ -1,3 +1,3 @@ -╭── a... ──╮ +╭── a... ──╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_5_4_3.txt b/test/txtfiles/small_panel_title_5_4_3.txt index 9066433de..d46436226 100644 --- a/test/txtfiles/small_panel_title_5_4_3.txt +++ b/test/txtfiles/small_panel_title_5_4_3.txt @@ -1,3 +1,3 @@ -╭─ a... ───╮ +╭─ a... ───╮ │ │ ╰──────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_3_1.txt b/test/txtfiles/small_panel_title_6_3_1.txt index 7d5ae28ed..6ea8be838 100644 --- a/test/txtfiles/small_panel_title_6_3_1.txt +++ b/test/txtfiles/small_panel_title_6_3_1.txt @@ -1,3 +1,3 @@ -╭──── a... ─╮ +╭──── a... ─╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_3_2.txt b/test/txtfiles/small_panel_title_6_3_2.txt index 57d5a2acf..d90a377cd 100644 --- a/test/txtfiles/small_panel_title_6_3_2.txt +++ b/test/txtfiles/small_panel_title_6_3_2.txt @@ -1,3 +1,3 @@ -╭── a... ───╮ +╭── a... ───╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_3_3.txt b/test/txtfiles/small_panel_title_6_3_3.txt index 57d5a2acf..d90a377cd 100644 --- a/test/txtfiles/small_panel_title_6_3_3.txt +++ b/test/txtfiles/small_panel_title_6_3_3.txt @@ -1,3 +1,3 @@ -╭── a... ───╮ +╭── a... ───╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_4_1.txt b/test/txtfiles/small_panel_title_6_4_1.txt index 7d5ae28ed..6ea8be838 100644 --- a/test/txtfiles/small_panel_title_6_4_1.txt +++ b/test/txtfiles/small_panel_title_6_4_1.txt @@ -1,3 +1,3 @@ -╭──── a... ─╮ +╭──── a... ─╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_4_2.txt b/test/txtfiles/small_panel_title_6_4_2.txt index 57d5a2acf..d90a377cd 100644 --- a/test/txtfiles/small_panel_title_6_4_2.txt +++ b/test/txtfiles/small_panel_title_6_4_2.txt @@ -1,3 +1,3 @@ -╭── a... ───╮ +╭── a... ───╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_6_4_3.txt b/test/txtfiles/small_panel_title_6_4_3.txt index 57d5a2acf..d90a377cd 100644 --- a/test/txtfiles/small_panel_title_6_4_3.txt +++ b/test/txtfiles/small_panel_title_6_4_3.txt @@ -1,3 +1,3 @@ -╭── a... ───╮ +╭── a... ───╮ │ │ ╰───────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_3_1.txt b/test/txtfiles/small_panel_title_7_3_1.txt index c8e3df330..040492e7a 100644 --- a/test/txtfiles/small_panel_title_7_3_1.txt +++ b/test/txtfiles/small_panel_title_7_3_1.txt @@ -1,3 +1,3 @@ -╭──── a... ──╮ +╭──── a... ──╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_3_2.txt b/test/txtfiles/small_panel_title_7_3_2.txt index bb21c0f0d..42eecc81e 100644 --- a/test/txtfiles/small_panel_title_7_3_2.txt +++ b/test/txtfiles/small_panel_title_7_3_2.txt @@ -1,3 +1,3 @@ -╭─── a... ───╮ +╭─── a... ───╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_3_3.txt b/test/txtfiles/small_panel_title_7_3_3.txt index bb21c0f0d..42eecc81e 100644 --- a/test/txtfiles/small_panel_title_7_3_3.txt +++ b/test/txtfiles/small_panel_title_7_3_3.txt @@ -1,3 +1,3 @@ -╭─── a... ───╮ +╭─── a... ───╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_4_1.txt b/test/txtfiles/small_panel_title_7_4_1.txt index c8e3df330..040492e7a 100644 --- a/test/txtfiles/small_panel_title_7_4_1.txt +++ b/test/txtfiles/small_panel_title_7_4_1.txt @@ -1,3 +1,3 @@ -╭──── a... ──╮ +╭──── a... ──╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_4_2.txt b/test/txtfiles/small_panel_title_7_4_2.txt index bb21c0f0d..42eecc81e 100644 --- a/test/txtfiles/small_panel_title_7_4_2.txt +++ b/test/txtfiles/small_panel_title_7_4_2.txt @@ -1,3 +1,3 @@ -╭─── a... ───╮ +╭─── a... ───╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_7_4_3.txt b/test/txtfiles/small_panel_title_7_4_3.txt index bb21c0f0d..42eecc81e 100644 --- a/test/txtfiles/small_panel_title_7_4_3.txt +++ b/test/txtfiles/small_panel_title_7_4_3.txt @@ -1,3 +1,3 @@ -╭─── a... ───╮ +╭─── a... ───╮ │ │ ╰────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_3_1.txt b/test/txtfiles/small_panel_title_8_3_1.txt index 684a08766..bb4e1a88a 100644 --- a/test/txtfiles/small_panel_title_8_3_1.txt +++ b/test/txtfiles/small_panel_title_8_3_1.txt @@ -1,3 +1,3 @@ -╭──── a... ───╮ +╭──── a... ───╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_3_2.txt b/test/txtfiles/small_panel_title_8_3_2.txt index 0bd5e9f8d..3be643e3e 100644 --- a/test/txtfiles/small_panel_title_8_3_2.txt +++ b/test/txtfiles/small_panel_title_8_3_2.txt @@ -1,3 +1,3 @@ -╭─── a... ────╮ +╭─── a... ────╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_3_3.txt b/test/txtfiles/small_panel_title_8_3_3.txt index 684a08766..bb4e1a88a 100644 --- a/test/txtfiles/small_panel_title_8_3_3.txt +++ b/test/txtfiles/small_panel_title_8_3_3.txt @@ -1,3 +1,3 @@ -╭──── a... ───╮ +╭──── a... ───╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_4_1.txt b/test/txtfiles/small_panel_title_8_4_1.txt index 684a08766..bb4e1a88a 100644 --- a/test/txtfiles/small_panel_title_8_4_1.txt +++ b/test/txtfiles/small_panel_title_8_4_1.txt @@ -1,3 +1,3 @@ -╭──── a... ───╮ +╭──── a... ───╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_4_2.txt b/test/txtfiles/small_panel_title_8_4_2.txt index 0bd5e9f8d..3be643e3e 100644 --- a/test/txtfiles/small_panel_title_8_4_2.txt +++ b/test/txtfiles/small_panel_title_8_4_2.txt @@ -1,3 +1,3 @@ -╭─── a... ────╮ +╭─── a... ────╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/small_panel_title_8_4_3.txt b/test/txtfiles/small_panel_title_8_4_3.txt index 684a08766..bb4e1a88a 100644 --- a/test/txtfiles/small_panel_title_8_4_3.txt +++ b/test/txtfiles/small_panel_title_8_4_3.txt @@ -1,3 +1,3 @@ -╭──── a... ───╮ +╭──── a... ───╮ │ │ ╰─────────────╯ \ No newline at end of file diff --git a/test/txtfiles/str_trunc_1.txt b/test/txtfiles/str_trunc_1.txt index 9996ad3fa..c979a7fb5 100644 --- a/test/txtfiles/str_trunc_1.txt +++ b/test/txtfiles/str_trunc_1.txt @@ -1,4 +1,4 @@ -Lorem... - consecte... -tempor... - magna... \ No newline at end of file +Lorem... + consecte... +tempor... + magna... \ No newline at end of file diff --git a/test/txtfiles/str_trunc_3.txt b/test/txtfiles/str_trunc_3.txt index 08d3430f6..91d788fa9 100644 --- a/test/txtfiles/str_trunc_3.txt +++ b/test/txtfiles/str_trunc_3.txt @@ -1,4 +1,4 @@ Lorem ipsum dolor sit amet, - consectetur adipiscing... -tempor incididunt ut labore... + consectetur adipiscing... +tempor incididunt ut labore... magna aliqua. \ No newline at end of file diff --git a/test/txtfiles/table_7.txt b/test/txtfiles/table_7.txt index cd098b599..699c21bdf 100644 --- a/test/txtfiles/table_7.txt +++ b/test/txtfiles/table_7.txt @@ -1,15 +1,15 @@   -  Column1   Co...   Co...   +  Column1   Co...   Co...    ─────────────────────────────────────────  -  1   1.0   10...   +  1   1.0   10...     -  2   1.0   10...   +  2   1.0   10...     -  3   1.0   10...   +  3   1.0   10...     -  4   1.0   10...   +  4   1.0   10...     -  5   1.0   10...   +  5   1.0   10...    ─────────────────────────────────────────  -  couldn't apply   co...   co...   +  couldn't apply   co...   co...     \ No newline at end of file diff --git a/test/txtfiles/table_8.txt b/test/txtfiles/table_8.txt index da243d29b..6686b28ff 100644 --- a/test/txtfiles/table_8.txt +++ b/test/txtfiles/table_8.txt @@ -1,13 +1,13 @@  ╷ ╷    Column1 │ Column2 │ Column3   ╺━━━━━━━━━━━━┿━━━━━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━╸ -  0.79855... │ 0.003... │ 0.5023663197115882   +  0.79855... │ 0.003... │ 0.5023663197115882   ╶────────────┼──────────┼──────────────────────╴ -  0.95965... │ 0.468... │ 0.38987016627250015   +  0.95965... │ 0.468... │ 0.38987016627250015   ╶────────────┼──────────┼──────────────────────╴ -  0.32684... │ 0.360... │ 0.9474887990061425   +  0.32684... │ 0.360... │ 0.9474887990061425   ╶────────────┼──────────┼──────────────────────╴ -  0.98503... │ 0.954... │ 0.3554115446908739   +  0.98503... │ 0.954... │ 0.3554115446908739   ╶────────────┼──────────┼──────────────────────╴ -  0.67459... │ 0.130... │ 0.8356019600603017   +  0.67459... │ 0.130... │ 0.8356019600603017    ╵ ╵  \ No newline at end of file diff --git a/test/txtfiles/termshow_1.txt b/test/txtfiles/termshow_1.txt index 469636c96..487875941 100644 --- a/test/txtfiles/termshow_1.txt +++ b/test/txtfiles/termshow_1.txt @@ -5,4 +5,4 @@ │   (3)   3   │ │   │ │ │ -╰──────── 3... ───╯ +╰──────── 3... ───╯ diff --git a/test/txtfiles/tree_1_1_1.txt b/test/txtfiles/tree_1_1_1.txt index 93dcdd555..ef3d52f35 100644 --- a/test/txtfiles/tree_1_1_1.txt +++ b/test/txtfiles/tree_1_1_1.txt @@ -1,8 +1,8 @@ tree_1_1_1 - └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd -fd ⇒ Dict("n1" => 1, "n2" => 2) - - ├─ n1 ⇒ 1 - - └─ n2 ⇒ 2 + └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd +fd ⇒ Dict("n1" => 1, "n2" => 2) + + ├─ n1 ⇒ 1 + + └─ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_1_1_4.txt b/test/txtfiles/tree_1_1_4.txt index f33e67e18..1d461c4c9 100644 --- a/test/txtfiles/tree_1_1_4.txt +++ b/test/txtfiles/tree_1_1_4.txt @@ -2,22 +2,22 @@ ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ├─ aleaf ⇒ unbeliefable - └─ leaflet ⇒ level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3 + └─ leaflet ⇒ level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_1_1_5.txt b/test/txtfiles/tree_1_1_5.txt index effe7a727..a9912fe8e 100644 --- a/test/txtfiles/tree_1_1_5.txt +++ b/test/txtfiles/tree_1_1_5.txt @@ -2,17 +2,17 @@ ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) ├─ adict ⇒ Dict("x" => 2) │ └─ x ⇒ 2 ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") ├─ sodeep ⇒ Dict("a" => 4) │ └─ a ⇒ 4 ├─ aleaf ⇒ unbeliefable diff --git a/test/txtfiles/tree_1_1_9.txt b/test/txtfiles/tree_1_1_9.txt index 40d610988..8a0afb2d4 100644 --- a/test/txtfiles/tree_1_1_9.txt +++ b/test/txtfiles/tree_1_1_9.txt @@ -1,22 +1,22 @@ tree_1_1_9 ├─ 1 ⇒ 1 - ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] │ ├─ 1 ⇒ 2 │ ├─ 2 ⇒ [3, 4] │ │ ├─ 1 ⇒ 3 │ │ └─ 2 ⇒ 4 - │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaa + │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaa ├─ 3 ⇒ c - └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ├─ 2 ⇒ a ├─ 1 ⇒ ok ├─ a ⇒ 2 diff --git a/test/txtfiles/tree_1_2_1.txt b/test/txtfiles/tree_1_2_1.txt index 13a36ceb8..6abf17791 100644 --- a/test/txtfiles/tree_1_2_1.txt +++ b/test/txtfiles/tree_1_2_1.txt @@ -1,8 +1,8 @@ tree_1_2_1 - ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf -sdfd ⇒ Dict("n1" => 1, "n2" => 2) - - ┣━━━ n1 ⇒ 1 - - ┗━━━ n2 ⇒ 2 + ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf +sdfd ⇒ Dict("n1" => 1, "n2" => 2) + + ┣━━━ n1 ⇒ 1 + + ┗━━━ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_1_2_4.txt b/test/txtfiles/tree_1_2_4.txt index a4909ef89..2b3e351f6 100644 --- a/test/txtfiles/tree_1_2_4.txt +++ b/test/txtfiles/tree_1_2_4.txt @@ -2,25 +2,25 @@ ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ┣━━━ aleaf ⇒ unbeliefable - ┗━━━ leaflet ⇒ level 3level 3level 3level 3level -3level - 3level 3level 3level 3level 3level -3level - 3level 3level 3level 3level 3level -3level - 3level 3level 3 + ┗━━━ leaflet ⇒ level 3level 3level 3level 3level +3level + 3level 3level 3level 3level 3level +3level + 3level 3level 3level 3level 3level +3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_1_2_5.txt b/test/txtfiles/tree_1_2_5.txt index 74f585aad..a25e56e7e 100644 --- a/test/txtfiles/tree_1_2_5.txt +++ b/test/txtfiles/tree_1_2_5.txt @@ -2,17 +2,17 @@ ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) ┣━━━ adict ⇒ Dict("x" => 2) ┃ ┗━━━ x ⇒ 2 ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") ┣━━━ sodeep ⇒ Dict("a" => 4) ┃ ┗━━━ a ⇒ 4 ┣━━━ aleaf ⇒ unbeliefable diff --git a/test/txtfiles/tree_1_2_9.txt b/test/txtfiles/tree_1_2_9.txt index 73dbdd289..3aba1c537 100644 --- a/test/txtfiles/tree_1_2_9.txt +++ b/test/txtfiles/tree_1_2_9.txt @@ -1,22 +1,22 @@ tree_1_2_9 ┣━━━ 1 ⇒ 1 - ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] ┃ ┣━━━ 1 ⇒ 2 ┃ ┣━━━ 2 ⇒ [3, 4] ┃ ┃ ┣━━━ 1 ⇒ 3 ┃ ┃ ┗━━━ 2 ⇒ 4 - ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaa + ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaa ┣━━━ 3 ⇒ c - ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ┣━━━ 2 ⇒ a ┣━━━ 1 ⇒ ok ┣━━━ a ⇒ 2 diff --git a/test/txtfiles/tree_1_3_1.txt b/test/txtfiles/tree_1_3_1.txt index 52b2cb9c9..1eef58d2d 100644 --- a/test/txtfiles/tree_1_3_1.txt +++ b/test/txtfiles/tree_1_3_1.txt @@ -1,8 +1,8 @@ tree_1_3_1 - `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds -fsdfd => Dict("n1" => 1, "n2" => 2) - - +---- n1 => 1 - - `---- n2 => 2 + `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds +fsdfd => Dict("n1" => 1, "n2" => 2) + + +---- n1 => 1 + + `---- n2 => 2 \ No newline at end of file diff --git a/test/txtfiles/tree_1_3_4.txt b/test/txtfiles/tree_1_3_4.txt index ce22da3cb..a35b442d5 100644 --- a/test/txtfiles/tree_1_3_4.txt +++ b/test/txtfiles/tree_1_3_4.txt @@ -2,25 +2,25 @@ +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a | `---- n2 => 2 - `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) +---- n3 => 3 +---- n2 => Int64 - `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") +---- aleaf => unbeliefable - `---- leaflet => level 3level 3level 3level -3level 3level - 3level 3level 3level 3level 3level - 3level - 3level 3level 3level 3level 3level - 3level - 3level 3level 3 + `---- leaflet => level 3level 3level 3level +3level 3level + 3level 3level 3level 3level 3level + 3level + 3level 3level 3level 3level 3level + 3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_1_3_5.txt b/test/txtfiles/tree_1_3_5.txt index c0de41189..0838a874a 100644 --- a/test/txtfiles/tree_1_3_5.txt +++ b/test/txtfiles/tree_1_3_5.txt @@ -2,17 +2,17 @@ +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a | `---- n2 => 2 - `---- nested => Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + `---- nested => Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) +---- adict => Dict("x" => 2) | `---- x => 2 +---- n3 => 3 +---- n2 => Int64 - `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") +---- sodeep => Dict("a" => 4) | `---- a => 4 +---- aleaf => unbeliefable diff --git a/test/txtfiles/tree_1_3_9.txt b/test/txtfiles/tree_1_3_9.txt index d078d9fbe..d3ace3066 100644 --- a/test/txtfiles/tree_1_3_9.txt +++ b/test/txtfiles/tree_1_3_9.txt @@ -1,22 +1,22 @@ tree_1_3_9 +---- 1 => 1 - +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] | +---- 1 => 2 | +---- 2 => [3, 4] | | +---- 1 => 3 | | `---- 2 => 4 - | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaa + | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaa +---- 3 => c - `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) +---- 2 => a +---- 1 => ok +---- a => 2 diff --git a/test/txtfiles/tree_2_1_1.txt b/test/txtfiles/tree_2_1_1.txt index 387e503f8..a02a6a4c5 100644 --- a/test/txtfiles/tree_2_1_1.txt +++ b/test/txtfiles/tree_2_1_1.txt @@ -1,8 +1,8 @@ tree_2_1_1 - └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd -fd ⇒ Dict("n1" => 1, "n2" => 2) - - ├─ n1 ⇒ 1 - - └─ n2 ⇒ 2 + └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd +fd ⇒ Dict("n1" => 1, "n2" => 2) + + ├─ n1 ⇒ 1 + + └─ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_4.txt b/test/txtfiles/tree_2_1_4.txt index fa1a3c155..fc27b7f43 100644 --- a/test/txtfiles/tree_2_1_4.txt +++ b/test/txtfiles/tree_2_1_4.txt @@ -2,22 +2,22 @@ ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ├─ aleaf ⇒ unbeliefable - └─ leaflet ⇒ level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3 + └─ leaflet ⇒ level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_5.txt b/test/txtfiles/tree_2_1_5.txt index a908c3001..e63a51bcd 100644 --- a/test/txtfiles/tree_2_1_5.txt +++ b/test/txtfiles/tree_2_1_5.txt @@ -2,17 +2,17 @@ ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) ├─ adict ⇒ Dict("x" => 2) │ └─ x ⇒ 2 ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") ├─ sodeep ⇒ Dict("a" => 4) │ └─ a ⇒ 4 ├─ aleaf ⇒ unbeliefable diff --git a/test/txtfiles/tree_2_1_9.txt b/test/txtfiles/tree_2_1_9.txt index cb38525ce..4d4e223a6 100644 --- a/test/txtfiles/tree_2_1_9.txt +++ b/test/txtfiles/tree_2_1_9.txt @@ -1,22 +1,22 @@ tree_2_1_9 ├─ 1 ⇒ 1 - ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] │ ├─ 1 ⇒ 2 │ ├─ 2 ⇒ [3, 4] │ │ ├─ 1 ⇒ 3 │ │ └─ 2 ⇒ 4 - │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - │ aaaaaaaaaaaaaaaaaaaaaaaa + │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + │ aaaaaaaaaaaaaaaaaaaaaaaa ├─ 3 ⇒ c - └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ├─ 2 ⇒ a ├─ 1 ⇒ ok ├─ a ⇒ 2 diff --git a/test/txtfiles/tree_2_2_1.txt b/test/txtfiles/tree_2_2_1.txt index c4bdf7203..6ff008b6e 100644 --- a/test/txtfiles/tree_2_2_1.txt +++ b/test/txtfiles/tree_2_2_1.txt @@ -1,8 +1,8 @@ tree_2_2_1 - ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf -sdfd ⇒ Dict("n1" => 1, "n2" => 2) - - ┣━━━ n1 ⇒ 1 - - ┗━━━ n2 ⇒ 2 + ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf +sdfd ⇒ Dict("n1" => 1, "n2" => 2) + + ┣━━━ n1 ⇒ 1 + + ┗━━━ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_4.txt b/test/txtfiles/tree_2_2_4.txt index cedf1f448..8b2a36d10 100644 --- a/test/txtfiles/tree_2_2_4.txt +++ b/test/txtfiles/tree_2_2_4.txt @@ -2,25 +2,25 @@ ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ┣━━━ aleaf ⇒ unbeliefable - ┗━━━ leaflet ⇒ level 3level 3level 3level 3level -3level - 3level 3level 3level 3level 3level -3level - 3level 3level 3level 3level 3level -3level - 3level 3level 3 + ┗━━━ leaflet ⇒ level 3level 3level 3level 3level +3level + 3level 3level 3level 3level 3level +3level + 3level 3level 3level 3level 3level +3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_5.txt b/test/txtfiles/tree_2_2_5.txt index b1b5987f3..1963bba4d 100644 --- a/test/txtfiles/tree_2_2_5.txt +++ b/test/txtfiles/tree_2_2_5.txt @@ -2,17 +2,17 @@ ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) ┣━━━ adict ⇒ Dict("x" => 2) ┃ ┗━━━ x ⇒ 2 ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") ┣━━━ sodeep ⇒ Dict("a" => 4) ┃ ┗━━━ a ⇒ 4 ┣━━━ aleaf ⇒ unbeliefable diff --git a/test/txtfiles/tree_2_2_9.txt b/test/txtfiles/tree_2_2_9.txt index 7ce15be9b..1e2d7e5dc 100644 --- a/test/txtfiles/tree_2_2_9.txt +++ b/test/txtfiles/tree_2_2_9.txt @@ -1,22 +1,22 @@ tree_2_2_9 ┣━━━ 1 ⇒ 1 - ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] ┃ ┣━━━ 1 ⇒ 2 ┃ ┣━━━ 2 ⇒ [3, 4] ┃ ┃ ┣━━━ 1 ⇒ 3 ┃ ┃ ┗━━━ 2 ⇒ 4 - ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ┃ aaaaaaaaaaaaaaaaaaaaaaaa + ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┃ aaaaaaaaaaaaaaaaaaaaaaaa ┣━━━ 3 ⇒ c - ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ┣━━━ 2 ⇒ a ┣━━━ 1 ⇒ ok ┣━━━ a ⇒ 2 diff --git a/test/txtfiles/tree_2_3_1.txt b/test/txtfiles/tree_2_3_1.txt index 894c2b3a9..1ae773aab 100644 --- a/test/txtfiles/tree_2_3_1.txt +++ b/test/txtfiles/tree_2_3_1.txt @@ -1,8 +1,8 @@ tree_2_3_1 - `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds -fsdfd => Dict("n1" => 1, "n2" => 2) - - +---- n1 => 1 - - `---- n2 => 2 + `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds +fsdfd => Dict("n1" => 1, "n2" => 2) + + +---- n1 => 1 + + `---- n2 => 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_4.txt b/test/txtfiles/tree_2_3_4.txt index 74e1e656b..b5e65bdcd 100644 --- a/test/txtfiles/tree_2_3_4.txt +++ b/test/txtfiles/tree_2_3_4.txt @@ -2,25 +2,25 @@ +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a | `---- n2 => 2 - `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) + `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" + => Dict("aleaf" => "unbeliefable", "leaflet" +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) +---- n3 => 3 +---- n2 => Int64 - `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") +---- aleaf => unbeliefable - `---- leaflet => level 3level 3level 3level -3level 3level - 3level 3level 3level 3level 3level - 3level - 3level 3level 3level 3level 3level - 3level - 3level 3level 3 + `---- leaflet => level 3level 3level 3level +3level 3level + 3level 3level 3level 3level 3level + 3level + 3level 3level 3level 3level 3level + 3level + 3level 3level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_5.txt b/test/txtfiles/tree_2_3_5.txt index c60e8b576..26be47a4f 100644 --- a/test/txtfiles/tree_2_3_5.txt +++ b/test/txtfiles/tree_2_3_5.txt @@ -2,17 +2,17 @@ +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a | `---- n2 => 2 - `---- nested => Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) + `---- nested => Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) +---- adict => Dict("x" => 2) | `---- x => 2 +---- n3 => 3 +---- n2 => Int64 - `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") + `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" + => "unbeliefable", "leaflet" => "level + 3") +---- sodeep => Dict("a" => 4) | `---- a => 4 +---- aleaf => unbeliefable diff --git a/test/txtfiles/tree_2_3_9.txt b/test/txtfiles/tree_2_3_9.txt index b30846e54..e7407e822 100644 --- a/test/txtfiles/tree_2_3_9.txt +++ b/test/txtfiles/tree_2_3_9.txt @@ -1,22 +1,22 @@ tree_2_3_9 +---- 1 => 1 - +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] | +---- 1 => 2 | +---- 2 => [3, 4] | | +---- 1 => 3 | | `---- 2 => 4 - | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - | aaaaaaaaaaaaaaaaaaaaaaaa + | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + | aaaaaaaaaaaaaaaaaaaaaaaa +---- 3 => c - `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) +---- 2 => a +---- 1 => ok +---- a => 2 diff --git a/test/txtfiles/trim_renderables_1.txt b/test/txtfiles/trim_renderables_1.txt index 9f15da429..ead164037 100644 --- a/test/txtfiles/trim_renderables_1.txt +++ b/test/txtfiles/trim_renderables_1.txt @@ -1,28 +1,27 @@ -aa bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bbaa bbaa bbaa bbaa -bb - \ No newline at end of file +aa bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bbaa bbaa bbaa bbaa +bb \ No newline at end of file diff --git a/test/txtfiles/trim_renderables_2.txt b/test/txtfiles/trim_renderables_2.txt index 75bcaf648..297a3ca1e 100644 --- a/test/txtfiles/trim_renderables_2.txt +++ b/test/txtfiles/trim_renderables_2.txt @@ -1,10 +1,10 @@ -╭─────────────────────... -│ aa bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bbaa... -│ bbaa bbaa bb... -╰─────────────────────... \ No newline at end of file +╭─────────────────────... +│ aa bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bbaa... +│ bbaa bbaa bb... +╰─────────────────────... \ No newline at end of file diff --git a/test/txtfiles/widget_gal_1_1_1_b.txt b/test/txtfiles/widget_gal_1_1_1_b.txt index e94c2d834..912124d75 100644 --- a/test/txtfiles/widget_gal_1_1_1_b.txt +++ b/test/txtfiles/widget_gal_1_1_1_b.txt @@ -2,18 +2,18 @@ │ │ │ ╭──────────────────────────────────────────────────╮ │ │ │ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa│ │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ │ │   │ │ │ ╰──────────────────────────── Lines: 1:12 of 14 ───╯ │ │ │ diff --git a/test/txtfiles/widget_gal_1_1_2_b.txt b/test/txtfiles/widget_gal_1_1_2_b.txt index 830fd8fc5..cafb23aac 100644 --- a/test/txtfiles/widget_gal_1_1_2_b.txt +++ b/test/txtfiles/widget_gal_1_1_2_b.txt @@ -1,20 +1,20 @@ ╭──────────────────────────────────────────────────────╮ │ │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│    │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│   │ │   │ │ │ │ │ │ │ │  ... content omitted ...  │ -╰──────────────────────────────── Lines: 1:13 of 13 ───╯ \ No newline at end of file +╰──────────────────────────────── Lines: 1:12 of 12 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_gal_1_2_1_b.txt b/test/txtfiles/widget_gal_1_2_1_b.txt index a2bb49d0c..63df2c709 100644 --- a/test/txtfiles/widget_gal_1_2_1_b.txt +++ b/test/txtfiles/widget_gal_1_2_1_b.txt @@ -2,20 +2,20 @@ │ │ │ ╭──────────────────────────────────────────────────╮ │ │ │ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aa   │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aa   │ │ │ │   │ │ │ │   │ │ │ │   │ │ diff --git a/test/txtfiles/widget_gal_1_2_2_b.txt b/test/txtfiles/widget_gal_1_2_2_b.txt index f9ec117af..ee1d98143 100644 --- a/test/txtfiles/widget_gal_1_2_2_b.txt +++ b/test/txtfiles/widget_gal_1_2_2_b.txt @@ -1,18 +1,18 @@ ╭──────────────────────────────────────────────────────╮ │ │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│    │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│   │ │   │ │   │ │   │ @@ -37,4 +37,4 @@ │ │ │ │ │ │ │  ... content omitted ...  │ -╰──────────────────────────────── Lines: 1:13 of 13 ───╯ \ No newline at end of file +╰──────────────────────────────── Lines: 1:12 of 12 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_gal_2_1_1_b.txt b/test/txtfiles/widget_gal_2_1_1_b.txt index 266fea8d4..219b41ff7 100644 --- a/test/txtfiles/widget_gal_2_1_1_b.txt +++ b/test/txtfiles/widget_gal_2_1_1_b.txt @@ -2,15 +2,15 @@ │ │ │ ╭──────────────────────────────────────────────────────────────────────────╮ │ │ │ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   │ │ │ │   │ │ │ │ │ │ │ │ │ │ │ │ diff --git a/test/txtfiles/widget_gal_2_1_2_b.txt b/test/txtfiles/widget_gal_2_1_2_b.txt index 95a899450..99a3e5559 100644 --- a/test/txtfiles/widget_gal_2_1_2_b.txt +++ b/test/txtfiles/widget_gal_2_1_2_b.txt @@ -1,14 +1,14 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ │ │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaa   │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaa   │ │   │ │   │ │   │ diff --git a/test/txtfiles/widget_gal_2_2_1_b.txt b/test/txtfiles/widget_gal_2_2_1_b.txt index e84dc9ea7..7aeb0e8ed 100644 --- a/test/txtfiles/widget_gal_2_2_1_b.txt +++ b/test/txtfiles/widget_gal_2_2_1_b.txt @@ -2,15 +2,15 @@ │ │ │ ╭──────────────────────────────────────────────────────────────────────────╮ │ │ │ │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ -│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ │ +│ │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   │ │ │ │   │ │ │ │   │ │ │ │   │ │ diff --git a/test/txtfiles/widget_gal_2_2_2_b.txt b/test/txtfiles/widget_gal_2_2_2_b.txt index f7fb42223..86da985bb 100644 --- a/test/txtfiles/widget_gal_2_2_2_b.txt +++ b/test/txtfiles/widget_gal_2_2_2_b.txt @@ -1,14 +1,14 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ │ │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ -│ aaaaaaaa   │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa  │ +│ aaaaaaaa   │ │   │ │   │ │   │ diff --git a/test/txtfiles/widget_pager_1_1_1.txt b/test/txtfiles/widget_pager_1_1_1.txt index e06559935..f994c4336 100644 --- a/test/txtfiles/widget_pager_1_1_1.txt +++ b/test/txtfiles/widget_pager_1_1_1.txt @@ -1,20 +1,20 @@ ╭──── test ──────────────────╮ │ │ -│ voluptate velit esse   │ -│ cillum dolore eu fugiat   │ -│ nulla pariatur. Excepteu  │ -│ r sint occaecat cupidata  │ -│ t non proident, sunt   │ -│ in culpa qui officia   │ -│ deserun   │ -│ mollit anim id est   │ -│ laborum.Lorem ipsum   │ -│ dolor sit amet, consecte  │ -│ tur adipiscing elit,   │ -│ sed do eiusmod tempor   │ -│ incididunt ut labore │ │ -│ et dolore magna aliqua. │ │ -│ Ut enim ad minim veniam,│ │ -│ quis nostrud exercitati│ │ +│ voluptate velit esse   │ +│ cillum dolore eu fugiat   │ +│ nulla pariatur. Excepteu  │ +│ r sint occaecat cupidata  │ +│ t non proident, sunt   │ +│ in culpa qui officia   │ +│ deserun   │ +│ mollit anim id est   │ +│ laborum.Lorem ipsum   │ +│ dolor sit amet, consecte  │ +│ tur adipiscing elit,   │ +│ sed do eiusmod tempor   │ +│ incididunt ut labore │ │ +│ et dolore magna aliqua. │ │ +│ Ut enim ad minim veniam,│ │ +│ quis nostrud exercitati│ │ │  ... content omitted ...  │ -╰────────────── Lines:... ───╯ \ No newline at end of file +╰────────────── Lines:... ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_1_1_2.txt b/test/txtfiles/widget_pager_1_1_2.txt index 92dc5e1fb..148a9503e 100644 --- a/test/txtfiles/widget_pager_1_1_2.txt +++ b/test/txtfiles/widget_pager_1_1_2.txt @@ -1,20 +1,20 @@ ╭──── test ──────────────────╮ │ │ -│ Excepteu  │   │ -│ │ r sint occaecat   │ -│ cupidata  │   │ -│ │ t non proident,   │ -│ sunt   │ │ │ -│ │ in culpa qui officia │ │ -│   │ │ │ -│ │ deserun │ │ -│   │ │ │ -│ │ mollit anim id │ │ -│ est   │   │ -│ │ laborum.Lorem ipsum   │ -│   │   │ -│ │ dolor sit amet,   │ -│ consecte  │   │ -│ │ tur adipiscing elit,   │ +│ Excepteu  │   │ +│ │ r sint occaecat   │ +│ cupidata  │   │ +│ │ t non proident,   │ +│ sunt   │ │ │ +│ │ in culpa qui officia │ │ +│   │ │ │ +│ │ deserun │ │ +│   │ │ │ +│ │ mollit anim id │ │ +│ est   │   │ +│ │ laborum.Lorem ipsum   │ +│   │   │ +│ │ dolor sit amet,   │ +│ consecte  │   │ +│ │ tur adipiscing elit,   │ │   │ -╰────────────── Lines:... ───╯ \ No newline at end of file +╰────────────── Lines:... ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_1_2_1.txt b/test/txtfiles/widget_pager_1_2_1.txt index bfdc3ac46..928766ea1 100644 --- a/test/txtfiles/widget_pager_1_2_1.txt +++ b/test/txtfiles/widget_pager_1_2_1.txt @@ -1,40 +1,40 @@ ╭──── test ──────────────────╮ │ │ -│ ╭──── test ─────────────  │ -│ ─────╮   │ -│ │   │ -│ │   │ -│ │ Excepteu  │   │ -│   │ │ │ -│ │ │ r sint occaecat │ │ -│   │ │ │ -│ │ cupidata  │ │ │ -│   │ │ │ -│ │ │ t non proident, │ │ -│   │   │ -│ │ sunt   │   │ -│ │ │   │ -│ │ │ in culpa qui   │ -│ officia │ │   │ -│ │   │   │ -│ │ │   │ -│ │ │ deserun   │ -│ │ │   │ -│ │   │   │ -│ │ │   │ -│ │ │ mollit anim   │ -│ id │ │   │ -│ │ est   │   │ -│   │   │ -│ │ │ laborum.Lorem   │ -│ ipsum   │   │ -│ │   │   │ -│   │   │ -│ │ │ dolor sit amet,   │ -│   │   │ -│ │ consecte  │   │ -│   │   │ -│ │ │ tur adipiscing   │ -│ elit,   │   │ +│ ╭──── test ─────────────  │ +│ ─────╮   │ +│ │   │ +│ │   │ +│ │ Excepteu  │   │ +│   │ │ │ +│ │ │ r sint occaecat │ │ +│   │ │ │ +│ │ cupidata  │ │ │ +│   │ │ │ +│ │ │ t non proident, │ │ +│   │   │ +│ │ sunt   │   │ +│ │ │   │ +│ │ │ in culpa qui   │ +│ officia │ │   │ +│ │   │   │ +│ │ │   │ +│ │ │ deserun   │ +│ │ │   │ +│ │   │   │ +│ │ │   │ +│ │ │ mollit anim   │ +│ id │ │   │ +│ │ est   │   │ +│   │   │ +│ │ │ laborum.Lorem   │ +│ ipsum   │   │ +│ │   │   │ +│   │   │ +│ │ │ dolor sit amet,   │ +│   │   │ +│ │ consecte  │   │ +│   │   │ +│ │ │ tur adipiscing   │ +│ elit,   │   │ │   │ ╰────── Lines: 1:36 of 40 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_1_2_2.txt b/test/txtfiles/widget_pager_1_2_2.txt index 2b21e70d7..94f4aa19c 100644 --- a/test/txtfiles/widget_pager_1_2_2.txt +++ b/test/txtfiles/widget_pager_1_2_2.txt @@ -1,40 +1,40 @@ ╭──── test ──────────────────╮ │ │ -│   │   │ -│ │ │   │ -│   │   │ -│ │ │ Excepteu  │   │ -│   │   │ -│ │   │   │ -│ │ │ │ │ -│ │ │ │ r sint occaecat│ │ -│  │ │ │ │ -│ │   │ │ │ -│ │ │ │ │ -│ │ │ cupidata  │ │ │ -│ │ │   │ -│ │   │   │ -│ │ │   │ -│ │ │ │ t non proident,  │ -│  │ │   │ -│ │   │   │ -│   │   │ -│ │ │ sunt   │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ in culpa qui   │ -│   │   │ -│ │ officia │ │   │ -│   │   │ -│ │ │   │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ deserun   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │   │   │ +│   │   │ +│ │ │   │ +│   │   │ +│ │ │ Excepteu  │   │ +│   │   │ +│ │   │   │ +│ │ │ │ │ +│ │ │ │ r sint occaecat│ │ +│ │ │ │ │ +│ │   │ │ │ +│ │ │ │ │ +│ │ │ cupidata  │ │ │ +│ │ │   │ +│ │   │   │ +│ │ │   │ +│ │ │ │ t non proident,  │ +│ │ │   │ +│ │   │   │ +│   │   │ +│ │ │ sunt   │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ in culpa qui   │ +│   │   │ +│ │ officia │ │   │ +│   │   │ +│ │ │   │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ deserun   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │   │   │ │   │ -╰────────────── Lines:... ───╯ \ No newline at end of file +╰────────────── Lines:... ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_2_1_1.txt b/test/txtfiles/widget_pager_2_1_1.txt index ab9d9423d..ed6f104cb 100644 --- a/test/txtfiles/widget_pager_2_1_1.txt +++ b/test/txtfiles/widget_pager_2_1_1.txt @@ -1,20 +1,20 @@ ╭──── test ────────────────────────────────────────────────╮ │ │ -│ │ │ │ │ r sint occaecat│ │   │ -│ │  │ │ │ │   │ -│ │ │   │ │ │   │ -│ │ │ │ │ │   │ -│ │ │ │ cupidata  │ │ │ │ │ -│ │ │ │   │ │ │ -│ │ │   │   │ │ │ -│ │ │ │   │ │ │ -│ │ │ │ │ t non proident,  │ │ │ -│ │  │ │   │ │ │ -│ │ │   │   │   │ -│ │   │   │   │ -│ │ │ │ sunt   │   │   │ -│ │   │   │   │ -│ │ │ │ │   │   │ -│ │   │   │   │ +│ │ │ │ │ r sint occaecat│ │   │ +│ │ │ │ │ │   │ +│ │ │   │ │ │   │ +│ │ │ │ │ │   │ +│ │ │ │ cupidata  │ │ │ │ │ +│ │ │ │   │ │ │ +│ │ │   │   │ │ │ +│ │ │ │   │ │ │ +│ │ │ │ │ t non proident,  │ │ │ +│ │ │ │   │ │ │ +│ │ │   │   │   │ +│ │   │   │   │ +│ │ │ │ sunt   │   │   │ +│ │   │   │   │ +│ │ │ │ │   │   │ +│ │   │   │   │ │   │ ╰─────────────────────────────────── Lines: 10:25 of 40 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_2_1_2.txt b/test/txtfiles/widget_pager_2_1_2.txt index b4790c9aa..1db103e0a 100644 --- a/test/txtfiles/widget_pager_2_1_2.txt +++ b/test/txtfiles/widget_pager_2_1_2.txt @@ -1,20 +1,20 @@ ╭──── test ────────────────────────────────────────────────╮ │ │ -│   │   │ -│ │ │ │ │ │ │   │ -│   │   │ -│ │ │ │ │ cupidata  │ │ │   │ -│ │ │ │ │ -│ │ │ │ │   │ │ │ -│ │ │ │ │ -│ │ │ │   │   │ │ │ -│ │ │ │ │ -│ │ │ │ │   │ │ │ -│ │ │   │ -│ │ │ │ │ │ t non proident,  │   │ -│ │ │   │ -│ │ │  │ │   │   │ -│ │ │   │ -│ │ │ │   │   │   │ +│   │   │ +│ │ │ │ │ │ │   │ +│   │   │ +│ │ │ │ │ cupidata  │ │ │   │ +│ │ │ │ │ +│ │ │ │ │   │ │ │ +│ │ │ │ │ +│ │ │ │   │   │ │ │ +│ │ │ │ │ +│ │ │ │ │   │ │ │ +│ │ │   │ +│ │ │ │ │ │ t non proident,  │   │ +│ │ │   │ +│ │ │ │ │   │   │ +│ │ │   │ +│ │ │ │   │   │   │ │   │ ╰─────────────────────────────────── Lines: 10:25 of 40 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_2_2_1.txt b/test/txtfiles/widget_pager_2_2_1.txt index cea0f2884..ed0a67825 100644 --- a/test/txtfiles/widget_pager_2_2_1.txt +++ b/test/txtfiles/widget_pager_2_2_1.txt @@ -1,40 +1,40 @@ ╭──── test ────────────────────────────────────────────────╮ │ │ -│ ╭──── test ───────────────────────────────────────────  │ -│ ─────╮   │ -│ │   │ -│ │   │ -│ │   │   │ -│   │ │ │ -│ │ │ │ │ │ │ │ │ │ -│   │ │ │ -│ │   │ │ │ -│   │ │ │ -│ │ │ │ │ │ cupidata  │ │ │ │ │ -│   │   │ -│ │ │ │   │ -│ │ │   │ -│ │ │ │ │ │   │   │ -│ │ │   │ -│ │ │ │   │ -│ │ │   │ -│ │ │ │ │   │   │   │ -│ │ │   │ -│ │ │ │   │ -│ │ │   │ -│ │ │ │ │ │   │   │ -│ │ │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │ │ │ t non proident,  │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │  │ │   │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │   │   │   │ -│   │   │ +│ ╭──── test ───────────────────────────────────────────  │ +│ ─────╮   │ +│ │   │ +│ │   │ +│ │   │   │ +│   │ │ │ +│ │ │ │ │ │ │ │ │ │ +│   │ │ │ +│ │   │ │ │ +│   │ │ │ +│ │ │ │ │ │ cupidata  │ │ │ │ │ +│   │   │ +│ │ │ │   │ +│ │ │   │ +│ │ │ │ │ │   │   │ +│ │ │   │ +│ │ │ │   │ +│ │ │   │ +│ │ │ │ │   │   │   │ +│ │ │   │ +│ │ │ │   │ +│ │ │   │ +│ │ │ │ │ │   │   │ +│ │ │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │ │ │ t non proident,  │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │ │   │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │   │   │   │ +│   │   │ │   │ ╰──────────────────────────────────── Lines: 1:36 of 40 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_pager_2_2_2.txt b/test/txtfiles/widget_pager_2_2_2.txt index 8b2a03716..7e23ac689 100644 --- a/test/txtfiles/widget_pager_2_2_2.txt +++ b/test/txtfiles/widget_pager_2_2_2.txt @@ -1,40 +1,40 @@ ╭──── test ────────────────────────────────────────────────╮ │ │ -│   │   │ -│ │ │   │ -│   │   │ -│ │ │   │   │ -│   │   │ -│ │   │   │ -│ │ │ │ │ -│ │ │ │ │ │ │ │ │ │ │ -│ │ │ │ │ -│ │   │ │ │ -│ │ │ │ │ -│ │ │   │ │ │ -│ │ │   │ -│ │   │   │ -│ │ │   │ -│ │ │ │ │ │ │ cupidata  │ │ │   │ -│ │ │   │ -│ │   │   │ -│   │   │ -│ │ │ │ │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │ │ │   │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │ │   │   │   │ -│   │   │ -│ │ │ │   │ -│   │   │ -│ │ │ │ │   │ +│   │   │ +│ │ │   │ +│   │   │ +│ │ │   │   │ +│   │   │ +│ │   │   │ +│ │ │ │ │ +│ │ │ │ │ │ │ │ │ │ │ +│ │ │ │ │ +│ │   │ │ │ +│ │ │ │ │ +│ │ │   │ │ │ +│ │ │   │ +│ │   │   │ +│ │ │   │ +│ │ │ │ │ │ │ cupidata  │ │ │   │ +│ │ │   │ +│ │   │   │ +│   │   │ +│ │ │ │ │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │ │ │   │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │ │   │   │   │ +│   │   │ +│ │ │ │   │ +│   │   │ +│ │ │ │ │   │ │   │ ╰─────────────────────────────────── Lines: 10:45 of 80 ───╯ \ No newline at end of file diff --git a/test/txtfiles/widget_simplemenu_2_2_1.txt b/test/txtfiles/widget_simplemenu_2_2_1.txt index 8c4778e35..760d49eaf 100644 --- a/test/txtfiles/widget_simplemenu_2_2_1.txt +++ b/test/txtfiles/widget_simplemenu_2_2_1.txt @@ -1,2 +1,2 @@ -one two three -      \ No newline at end of file +one two three +      \ No newline at end of file diff --git a/test/txtfiles/widget_simplemenu_2_2_1_b.txt b/test/txtfiles/widget_simplemenu_2_2_1_b.txt index 048376745..9cad1c800 100644 --- a/test/txtfiles/widget_simplemenu_2_2_1_b.txt +++ b/test/txtfiles/widget_simplemenu_2_2_1_b.txt @@ -1,2 +1,2 @@ -one two three -      \ No newline at end of file +one two three +      \ No newline at end of file diff --git a/test/txtfiles/widget_simplemenu_2_2_2.txt b/test/txtfiles/widget_simplemenu_2_2_2.txt index 4f73514cf..3ef542305 100644 --- a/test/txtfiles/widget_simplemenu_2_2_2.txt +++ b/test/txtfiles/widget_simplemenu_2_2_2.txt @@ -1,2 +1,2 @@ -one two three -      \ No newline at end of file +one two three +      \ No newline at end of file diff --git a/test/txtfiles/widget_simplemenu_2_2_2_b.txt b/test/txtfiles/widget_simplemenu_2_2_2_b.txt index 0c9719c6b..da37fbbb4 100644 --- a/test/txtfiles/widget_simplemenu_2_2_2_b.txt +++ b/test/txtfiles/widget_simplemenu_2_2_2_b.txt @@ -1,2 +1,2 @@ -one two three -      \ No newline at end of file +one two three +      \ No newline at end of file diff --git a/test/txtfiles/widget_text_2_1.txt b/test/txtfiles/widget_text_2_1.txt index 686224680..e542d8c7f 100644 --- a/test/txtfiles/widget_text_2_1.txt +++ b/test/txtfiles/widget_text_2_1.txt @@ -1,3 +1,3 @@ ╭──────────────────────────────────────────────────────────────────────────────╮ -│ This is long testThis is long testThis is long testThis is long │ +│ This is long testThis is long testThis is long testThis is long │ ╰──────────────────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/widget_text_2_2.txt b/test/txtfiles/widget_text_2_2.txt index 8b90b5792..f879dbaef 100644 --- a/test/txtfiles/widget_text_2_2.txt +++ b/test/txtfiles/widget_text_2_2.txt @@ -1,7 +1,7 @@ -│This is long testThis is long testThis is long testThis is long testTh -│is is long testThis is long testThis is long testThis is long testThis -│ is long testThis is long testThis is long testThis is long testThis -│is long testThis is long testThis is long testThis is long testThis -│is long testThis is long testThis is long testThis is long testThis -│is long testThis is long testThis is long testThis is long testThis -│is long test \ No newline at end of file +│This is long testThis is long testThis is long testThis is long testTh +│is is long testThis is long testThis is long testThis is long testThis +│ is long testThis is long testThis is long testThis is long testThis +│is long testThis is long testThis is long testThis is long testThis +│is long testThis is long testThis is long testThis is long testThis +│is long testThis is long testThis is long testThis is long testThis +│is long test \ No newline at end of file From eca5bdf8c5edf1d9f8f78c69d26bf271a3b53b9d Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:26:31 -0500 Subject: [PATCH 07/18] docs fix --- docs/src/adv/progressbars.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/src/adv/progressbars.md b/docs/src/adv/progressbars.md index b6302dae8..d8d8338fa 100644 --- a/docs/src/adv/progressbars.md +++ b/docs/src/adv/progressbars.md @@ -177,6 +177,35 @@ end what's that `cols_kwargs`? You can use that to pass additional parameters to each columns, e.g. to set its style. + +You can also pass a `cols_kwargs` argument to `addjob!` to set the column style for individual jobs! +```@example prog + +pbar = ProgressBar(; expand = true, columns=:detailed, colors="#ffffff", + columns_kwargs = Dict( + :ProgressColumn => Dict(:completed_char => '█', :remaining_char => '░'), + ) +) +job = addjob!(pbar; N = 10, description="Test") + +job2 = addjob!( + pbar; + N = 10, + description="Test2", + columns_kwargs = Dict( + :ProgressColumn => Dict(:completed_char => 'x', :remaining_char => '_'), + ) +) + +with(pbar) do + for i in 1:10 + update!(job) + update!(job2) + sleep(0.01) + end +end +``` + ### Custom columns If there some kind of information that you want to display and Term doesn't have a column for it, just make your own! From 567db9e912ae11558339a6528058cdf7ed506ff9 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:31:56 -0500 Subject: [PATCH 08/18] bump --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index c2f9c7a35..8d38787fe 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -16,7 +16,7 @@ const TIMEROUTPUT = TimerOutputs.TimerOutput() import Term.Consoles: Console, enable, disable Term.DEBUG_ON[] = false -const TEST_DEBUG_MODE = true # renderables are saved as strings +const TEST_DEBUG_MODE = false # renderables are saved as strings const TEST_CONSOLE_WIDTH = 80 const IS_WIN = Sys.iswindows() con = Console(TEST_CONSOLE_WIDTH) From 9d2da1e3e8c830191a8f9c64a103291e75952d85 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:39:36 -0500 Subject: [PATCH 09/18] bump --- test/15_test_progress.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index 0fa7f00a4..53ab51b22 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -87,7 +87,7 @@ end end start!(pbar) - IS_WIN || @compare_to_string render(job) "pbar_cols_style_$i" + (IS_WIN || colinfo == :detailed) || @compare_to_string render(job) "pbar_cols_style_$i" end mycols = From b17406e32b5a41a199198357fe632c15a2afed4a Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:48:41 -0500 Subject: [PATCH 10/18] fmt --- test/15_test_progress.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index 53ab51b22..5867ceb9e 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -87,7 +87,8 @@ end end start!(pbar) - (IS_WIN || colinfo == :detailed) || @compare_to_string render(job) "pbar_cols_style_$i" + (IS_WIN || colinfo == :detailed) || + @compare_to_string render(job) "pbar_cols_style_$i" end mycols = From 8be4f0a19ffc8ea016526487fbbfcf0bc4676293 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 21:50:17 -0500 Subject: [PATCH 11/18] removed unused function --- src/_utils.jl | 14 -------------- test/15_test_progress.jl | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/_utils.jl b/src/_utils.jl index c5d0ce1a5..21b3cb70f 100644 --- a/src/_utils.jl +++ b/src/_utils.jl @@ -1,17 +1,3 @@ - -""" -Get a path up to the last three directories. -""" -function get_relative_path(file_path::AbstractString) - # Use the splitdir() function to split the file path into its individual components - components = splitpath(file_path) - return if length(components) > 2 - joinpath(components[(end - 2):end]...) - else - file_path - end -end - rint(x) = (Int ∘ round)(x) fint(x) = (Int ∘ floor)(x) cint(x) = (Int ∘ ceil)(x) diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index 5867ceb9e..cdfb245c7 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -97,7 +97,7 @@ end :DescriptionColumn => Dict(:style => "red"), :TextColumn => Dict(:text => "test"), ) - pbar = ProgressBar(; columns_kwargs = colkwargs) + pbar = ProgressBar(; columns = mycols, columns_kwargs = colkwargs) job = addjob!(pbar; N = 10) @test job.columns[1].segments[1].text == "\e[31mRunning...\e[39m" end From 4d48253fc11af43ca69082f5d58db39e40b97c53 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Sun, 19 Feb 2023 22:06:44 -0500 Subject: [PATCH 12/18] CI fix --- test/15_test_progress.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/15_test_progress.jl b/test/15_test_progress.jl index cdfb245c7..cedc2a81a 100644 --- a/test/15_test_progress.jl +++ b/test/15_test_progress.jl @@ -87,7 +87,7 @@ end end start!(pbar) - (IS_WIN || colinfo == :detailed) || + (IS_WIN || colinfo ∉ (:detailed, :spinner)) || @compare_to_string render(job) "pbar_cols_style_$i" end From 8e59e8accc0d99f2fda0260e8480369dacc8a659 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Mon, 20 Feb 2023 21:39:11 -0500 Subject: [PATCH 13/18] fixed problem with long file paths in errors --- src/_errors.jl | 1 + src/errors.jl | 3 ++- src/link.jl | 2 +- src/progress.jl | 5 ++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/_errors.jl b/src/_errors.jl index 4e5779331..55a4fdbb0 100644 --- a/src/_errors.jl +++ b/src/_errors.jl @@ -220,6 +220,7 @@ function add_stack_frame!( source_file = RenderableText( string(frame.file) * ":$(frame.line)"; style = "underline dim", + width=ctx.func_name_w, ) _out = func_line / source_file else diff --git a/src/errors.jl b/src/errors.jl index 601f8a208..c3517ff5b 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -123,7 +123,8 @@ function install_term_stacktrace(; io, hLine( ctx.out_w, - "{default bold $(ctx.theme.err_errmsg)}$ename{/default bold $(ctx.theme.err_errmsg)}"; + "{defaul + t bold $(ctx.theme.err_errmsg)}$ename{/default bold $(ctx.theme.err_errmsg)}"; style = "dim $(ctx.theme.err_errmsg)", ), ) diff --git a/src/link.jl b/src/link.jl index d770b4270..5a09aec0a 100644 --- a/src/link.jl +++ b/src/link.jl @@ -8,7 +8,7 @@ import ..Renderables: RenderableText, AbstractRenderable import ..Renderables import ..Layout: pad import Term: - get_relative_path, textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi + textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi import Term export Link diff --git a/src/progress.jl b/src/progress.jl index 24d6d7b58..c6d322666 100644 --- a/src/progress.jl +++ b/src/progress.jl @@ -352,6 +352,7 @@ function addjob!( pbar.paused = true id = isnothing(id) ? length(pbar.jobs) + 1 : id kwargs = merge(pbar.columns_kwargs, columns_kwargs) + job = ProgressJob(id, N, description, pbar.columns, pbar.width, kwargs, transient) # start job @@ -675,6 +676,7 @@ function foreachprogress( n = _getn(iter), transient = true, parallel = false, + columns_kwargs = Dict(), kwargs..., ) task = nothing @@ -687,9 +689,10 @@ function foreachprogress( start!(pbar) task = Threads.@spawn _startrenderloop(pbar) end + return # The job tracks the iteration through `iter` - job = addjob!(pbar; N = n, transient, kwargs...) + job = addjob!(pbar; N = n, transient=transient, columns_kwargs=columns_kwargs, kwargs...) if parallel Threads.@threads for elem in iter f(elem) From 084deab18413813f24ee4d02d7d429d883060a08 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Mon, 20 Feb 2023 21:53:31 -0500 Subject: [PATCH 14/18] bump --- src/errors.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/errors.jl b/src/errors.jl index c3517ff5b..601f8a208 100644 --- a/src/errors.jl +++ b/src/errors.jl @@ -123,8 +123,7 @@ function install_term_stacktrace(; io, hLine( ctx.out_w, - "{defaul - t bold $(ctx.theme.err_errmsg)}$ename{/default bold $(ctx.theme.err_errmsg)}"; + "{default bold $(ctx.theme.err_errmsg)}$ename{/default bold $(ctx.theme.err_errmsg)}"; style = "dim $(ctx.theme.err_errmsg)", ), ) From 9987968ae043230733f0d3a5b44fb452e9b2522f Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Fri, 17 Mar 2023 20:15:12 -0400 Subject: [PATCH 15/18] fixed panel text background color issue --- src/logs.jl | 6 +++--- src/markdown.jl | 2 +- src/panels.jl | 10 +++++++--- src/renderables.jl | 6 +++--- test/08_test_panel.jl | 10 ++++++++-- test/txtfiles/automatic_repr_showme_1.txt | 20 +++++++++---------- test/txtfiles/markdown_3.txt | 6 +++--- test/txtfiles/panel_background_1.txt | 3 +++ test/txtfiles/panel_background_2.txt | 7 +++++++ test/txtfiles/panel_styling_1.txt | 3 +++ test/txtfiles/renderable_text_2.txt | 8 ++++---- test/txtfiles/repr_rocket_struct.txt | 10 +++++----- .../txtfiles/widget_buttonsmenu_1_1_1_(1).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_1_(2).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_1_1_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_1_2_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_2_(1).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_2_(2).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_2_1_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_1_2_2_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_1_2_1_(1).txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_1_(2).txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_1_1_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_1_2_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_2_(1).txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_2_(2).txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_2_1_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_1_2_2_2_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_2_1_1_(1).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_1_(2).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_1_1_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_1_2_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_2_(1).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_2_(2).txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_2_1_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_1_2_2_b.txt | 6 +++--- .../txtfiles/widget_buttonsmenu_2_2_1_(1).txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_1_(2).txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_1_1_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_1_2_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_2_(1).txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_2_(2).txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_2_1_b.txt | 2 +- .../txtfiles/widget_buttonsmenu_2_2_2_2_b.txt | 2 +- test/txtfiles/widget_gal_1_1_1.txt | 2 +- test/txtfiles/widget_gal_1_2_1.txt | 2 +- test/txtfiles/widget_gal_2_1_1.txt | 2 +- test/txtfiles/widget_gal_2_2_1.txt | 2 +- 48 files changed, 125 insertions(+), 102 deletions(-) create mode 100644 test/txtfiles/panel_background_1.txt create mode 100644 test/txtfiles/panel_background_2.txt create mode 100644 test/txtfiles/panel_styling_1.txt diff --git a/src/logs.jl b/src/logs.jl index f3f62aec7..ba03b4072 100644 --- a/src/logs.jl +++ b/src/logs.jl @@ -182,7 +182,7 @@ Create string display for a log message value. function log_value_display end function log_value_display(x::AbstractArray) - a = highlight(str_trunc(string(x), 100); ignore_ansi = true) + a = highlight(str_trunc(string(x), 1000); ignore_ansi = true) s = foldl((a, b) -> a * " × " * b, string.(size(x))) b = highlight("{bold dim}Size: $(s){/bold dim}"; ignore_ansi = true) @@ -190,8 +190,8 @@ function log_value_display(x::AbstractArray) end log_value_display(x::AbstractDict) = - highlight(str_trunc(string(x), 100); ignore_ansi = true) -log_value_display(x) = highlight(str_trunc(string(x), 100);) + highlight(str_trunc(string(x), 1000); ignore_ansi = true) +log_value_display(x) = highlight(str_trunc(string(x), 1000);) """ handle_message(logger::TermLogger, lvl, msg, _mod, group, id, file, line; kwargs...) diff --git a/src/markdown.jl b/src/markdown.jl index b41a6d070..abc5243a9 100644 --- a/src/markdown.jl +++ b/src/markdown.jl @@ -176,7 +176,7 @@ function parse_md( "{$(theme.md_code)}`{/$(theme.md_code)}" else panel = Panel( - syntax; + RenderableText(syntax; style="on_$(theme.md_codeblock_bg)"); style = "white on_$(theme.md_codeblock_bg)", box = :SQUARE, subtitle = length(code.language) > 0 ? code.language : nothing, diff --git a/src/panels.jl b/src/panels.jl index e33072dc9..629825932 100644 --- a/src/panels.jl +++ b/src/panels.jl @@ -192,7 +192,10 @@ content_as_renderable( justify::Symbol, background::Union{String,Nothing}, )::RenderableText = - RenderableText(content, width = width - Δw, background = background, justify = justify) + RenderableText(content; width = width - Δw, + background = background, + justify = justify + ) """ @@ -225,7 +228,7 @@ function Panel( Δh = padding.top + padding.bottom # create content - # @info "panel fit" width height Δw Δh + # @info "panel fit" width height Δw Δh background content = content_as_renderable(content, width, Δw, justify, background) # estimate panel size @@ -282,7 +285,7 @@ function Panel( content = content_as_renderable(content, width, Δw, justify, background) height = something(height, content.measure.h + Δh + 2) panel_measure = Measure(height, width) - # @info "panel nofit" width Δw Δh height panel_measure + # @info "panel nofit" width Δw Δh height panel_measure background content.measure # if the content is too tall, exclude some lines if content.measure.h > height - Δh - 2 @@ -292,6 +295,7 @@ function Panel( style = "dim", width = content.measure.w, justify = :center, + background=background, ) segments = if lines_to_drop < content.measure.h diff --git a/src/renderables.jl b/src/renderables.jl index 0c495b486..0777a054a 100644 --- a/src/renderables.jl +++ b/src/renderables.jl @@ -143,8 +143,8 @@ function RenderableText( text = apply_style(text) style = isnothing(style) ? "" : style - background = isnothing(background) ? "" : get_bg_color(background) - style = style * background + # background = isnothing(background) ? "" : get_bg_color(background) + # style = style * background style_init, style_finish = get_style_codes(MarkupStyle(style)) @@ -168,7 +168,7 @@ function RenderableText( rt else text = join_lines([seg.text for seg in rt.segments]) - RenderableText(text; style = style, width = width) + RenderableText(text; style = style, width = width, kwargs...) end end diff --git a/test/08_test_panel.jl b/test/08_test_panel.jl index c097c649f..6cebf519a 100644 --- a/test/08_test_panel.jl +++ b/test/08_test_panel.jl @@ -312,6 +312,7 @@ end end end + @testset "\e[34mPanel - padding" begin p = Panel("°"^24; padding = (4, 4, 2, 2), fit = false) @testpanel(p, 7, default_width()) @@ -321,6 +322,10 @@ end end @testset "\e[34mPanel - background" begin + p = Panel(RenderableText("testste"; style="white on_red", background="on_blue", width=25); background="green") + IS_WIN || @compare_to_string p "panel_background_1" + + p = Panel(apply_style( """ asasd @@ -331,8 +336,9 @@ ads "on_blue", ); background = "on_red", fit = true) - @test string(p) == - "\e[0m\e[22m╭──────────────────────╮\e[22m\e[0m\n\e[22m│\e[22m\e[41m \e[49m\e[41m\e[44m asasd\e[49m\e[41m \e[49m\e[49m\e[41m \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m \e[49m\e[41m\e[44masdasadas\e[49m\e[41m \e[49m\e[49m\e[41m \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m \e[49m\e[41m\e[44masdsasdasdsadasdsa\e[49m\e[49m\e[41m \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m \e[49m\e[41m\e[44mads\e[49m\e[41m \e[49m\e[49m\e[41m \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m \e[49m\e[41m\e[44m \e[49m\e[41m \e[49m\e[49m\e[41m \e[49m\e[22m│\e[22m\n\e[0m\e[22m╰──────────────────────╯\e[22m\e[0m\e[0m" + + IS_WIN || @compare_to_string p "panel_background_2" + end @testset "\e[34mPANEL - UnicodePlots" begin diff --git a/test/txtfiles/automatic_repr_showme_1.txt b/test/txtfiles/automatic_repr_showme_1.txt index 787dbf855..acec76b90 100644 --- a/test/txtfiles/automatic_repr_showme_1.txt +++ b/test/txtfiles/automatic_repr_showme_1.txt @@ -9,14 +9,14 @@ Method definition ┌────────────────────────────────────────────────────────────────────┐ -│ function tprint(io::IO, x::AbstractString; highlight = true)  │ -│  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ -│ x)  │ -│   │ -│  x =  │ -│  Measure(x).w <= console_width(io) ? x :  │ -│  string(RenderableText(string(x), width = console_width  │ -│ (io)))  │ -│  print(io, x)  │ -│ end  │ +│ function tprint(io::IO, x::AbstractString; highlight = true)   │ +│  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ +│ x)   │ +│    │ +│  x =   │ +│  Measure(x).w <= console_width(io) ? x :   │ +│  string(RenderableText(string(x), width = console_width  │ +│ (io)))   │ +│  print(io, x)   │ +│ end   │ └────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/markdown_3.txt b/test/txtfiles/markdown_3.txt index 0eba8574d..63726b70d 100644 --- a/test/txtfiles/markdown_3.txt +++ b/test/txtfiles/markdown_3.txt @@ -15,9 +15,9 @@ and footnotes {#9aacdb}[1]{/#9aacdb} for your content {#9aacdb}[named]{/#9aacdb} And, of course, you can show some code too: ┌──────────────────────────────────────────────┐ - │ function say_hi(x)  │ - │  print("Hellow World")  │ - │ end  │ + │ function say_hi(x)   │ + │  print("Hellow World")  │ + │ end   │ └──────────────────────────────────── julia ───┘ ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ diff --git a/test/txtfiles/panel_background_1.txt b/test/txtfiles/panel_background_1.txt new file mode 100644 index 000000000..29b0dcfa1 --- /dev/null +++ b/test/txtfiles/panel_background_1.txt @@ -0,0 +1,3 @@ +╭──────────────────────────────────────────────────────────────────────────────╮ +│ testste   │ +╰──────────────────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/panel_background_2.txt b/test/txtfiles/panel_background_2.txt new file mode 100644 index 000000000..c810b5073 --- /dev/null +++ b/test/txtfiles/panel_background_2.txt @@ -0,0 +1,7 @@ +╭──────────────────────╮ +│  asasd  │ +│ asdasadas  │ +│ asdsasdasdsadasdsa │ +│ ads  │ +│    │ +╰──────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/panel_styling_1.txt b/test/txtfiles/panel_styling_1.txt new file mode 100644 index 000000000..29b0dcfa1 --- /dev/null +++ b/test/txtfiles/panel_styling_1.txt @@ -0,0 +1,3 @@ +╭──────────────────────────────────────────────────────────────────────────────╮ +│ testste   │ +╰──────────────────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/renderable_text_2.txt b/test/txtfiles/renderable_text_2.txt index 88b52ce17..9b266d587 100644 --- a/test/txtfiles/renderable_text_2.txt +++ b/test/txtfiles/renderable_text_2.txt @@ -1,4 +1,4 @@ - Lorem ipsum dolor sit amet,  - consectetur adipiscing elit,  -sed do eiusmod tempor incidid  - unt ut labore  \ No newline at end of file + Lorem ipsum dolor sit amet,  + consectetur adipiscing elit,  +sed do eiusmod tempor incidid  + unt ut labore  \ No newline at end of file diff --git a/test/txtfiles/repr_rocket_struct.txt b/test/txtfiles/repr_rocket_struct.txt index 2c10eb827..8dd9c0f9c 100644 --- a/test/txtfiles/repr_rocket_struct.txt +++ b/test/txtfiles/repr_rocket_struct.txt @@ -15,7 +15,7 @@ No documentation found. ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┌──────────────────────────────────────────────────────────────────┐ - │ struct Rocket  │ + │ struct Rocket  │ └──────────────────────────────────────────────────────────────────┘ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ @@ -23,8 +23,8 @@ No documentation found. ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┌──────────────────────────────────────────────────────────────────┐ - │ width :: Int64  │ - │ height :: Int64  │ - │ mass :: Float64  │ - │ manufacturer :: String  │ + │ width :: Int64   │ + │ height :: Int64   │ + │ mass :: Float64  │ + │ manufacturer :: String   │ └──────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_1_(1).txt b/test/txtfiles/widget_buttonsmenu_1_1_1_(1).txt index 462e180a5..c6fc0e105 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_1_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_1_(1).txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_1_(2).txt b/test/txtfiles/widget_buttonsmenu_1_1_1_(2).txt index 462e180a5..c6fc0e105 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_1_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_1_(2).txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_1_1_b.txt b/test/txtfiles/widget_buttonsmenu_1_1_1_1_b.txt index 89e1439b3..3174b4ad2 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_1_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_1_1_b.txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_1_2_b.txt b/test/txtfiles/widget_buttonsmenu_1_1_1_2_b.txt index 89e1439b3..3174b4ad2 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_1_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_1_2_b.txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_2_(1).txt b/test/txtfiles/widget_buttonsmenu_1_1_2_(1).txt index 462e180a5..c6fc0e105 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_2_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_2_(1).txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_2_(2).txt b/test/txtfiles/widget_buttonsmenu_1_1_2_(2).txt index 462e180a5..c6fc0e105 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_2_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_2_(2).txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_2_1_b.txt b/test/txtfiles/widget_buttonsmenu_1_1_2_1_b.txt index 89e1439b3..3174b4ad2 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_2_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_2_1_b.txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_1_2_2_b.txt b/test/txtfiles/widget_buttonsmenu_1_1_2_2_b.txt index 89e1439b3..3174b4ad2 100644 --- a/test/txtfiles/widget_buttonsmenu_1_1_2_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_1_2_2_b.txt @@ -1,9 +1,9 @@ ┌────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └────────────────────────────────────────────────┘ ┌────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_2_1_(1).txt b/test/txtfiles/widget_buttonsmenu_1_2_1_(1).txt index 726637f8d..1ce1511a6 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_1_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_1_(1).txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └──────────────┘└──────────────┘└──────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_2_1_(2).txt b/test/txtfiles/widget_buttonsmenu_1_2_1_(2).txt index 94b3fdcca..15659c36a 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_1_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_1_(2).txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_1_2_1_1_b.txt b/test/txtfiles/widget_buttonsmenu_1_2_1_1_b.txt index c548fdeb8..a239b828d 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_1_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_1_1_b.txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └──────────────┘└──────────────┘└──────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_2_1_2_b.txt b/test/txtfiles/widget_buttonsmenu_1_2_1_2_b.txt index 94c6d8474..752ccd20c 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_1_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_1_2_b.txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_1_2_2_(1).txt b/test/txtfiles/widget_buttonsmenu_1_2_2_(1).txt index 726637f8d..1ce1511a6 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_2_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_2_(1).txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └──────────────┘└──────────────┘└──────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_2_2_(2).txt b/test/txtfiles/widget_buttonsmenu_1_2_2_(2).txt index 94b3fdcca..15659c36a 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_2_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_2_(2).txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_1_2_2_1_b.txt b/test/txtfiles/widget_buttonsmenu_1_2_2_1_b.txt index c548fdeb8..a239b828d 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_2_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_2_1_b.txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └──────────────┘└──────────────┘└──────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_1_2_2_2_b.txt b/test/txtfiles/widget_buttonsmenu_1_2_2_2_b.txt index 94c6d8474..752ccd20c 100644 --- a/test/txtfiles/widget_buttonsmenu_1_2_2_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_1_2_2_2_b.txt @@ -1,5 +1,5 @@ ┌──────────────┐┌──────────────┐┌──────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_2_1_1_(1).txt b/test/txtfiles/widget_buttonsmenu_2_1_1_(1).txt index a2296b341..bfa31c8c2 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_1_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_1_(1).txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_1_(2).txt b/test/txtfiles/widget_buttonsmenu_2_1_1_(2).txt index a2296b341..bfa31c8c2 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_1_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_1_(2).txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_1_1_b.txt b/test/txtfiles/widget_buttonsmenu_2_1_1_1_b.txt index 2b08120a4..9c91574a0 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_1_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_1_1_b.txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_1_2_b.txt b/test/txtfiles/widget_buttonsmenu_2_1_1_2_b.txt index 2b08120a4..9c91574a0 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_1_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_1_2_b.txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_2_(1).txt b/test/txtfiles/widget_buttonsmenu_2_1_2_(1).txt index a2296b341..bfa31c8c2 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_2_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_2_(1).txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_2_(2).txt b/test/txtfiles/widget_buttonsmenu_2_1_2_(2).txt index a2296b341..bfa31c8c2 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_2_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_2_(2).txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_2_1_b.txt b/test/txtfiles/widget_buttonsmenu_2_1_2_1_b.txt index 2b08120a4..9c91574a0 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_2_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_2_1_b.txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_1_2_2_b.txt b/test/txtfiles/widget_buttonsmenu_2_1_2_2_b.txt index 2b08120a4..9c91574a0 100644 --- a/test/txtfiles/widget_buttonsmenu_2_1_2_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_1_2_2_b.txt @@ -1,9 +1,9 @@ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  one  │ +│  one  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  two  │ +│  two  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────────────────────────┐ -│  three  │ +│  three  │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_2_1_(1).txt b/test/txtfiles/widget_buttonsmenu_2_2_1_(1).txt index 833377a0f..fd7a4f915 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_1_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_1_(1).txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └───────────────────────────────┘└───────────────────────────────┘└───────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_2_1_(2).txt b/test/txtfiles/widget_buttonsmenu_2_2_1_(2).txt index 5653ec12d..c4788a95c 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_1_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_1_(2).txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_2_2_1_1_b.txt b/test/txtfiles/widget_buttonsmenu_2_2_1_1_b.txt index e06eedc14..be6253c3b 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_1_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_1_1_b.txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └───────────────────────────────┘└───────────────────────────────┘└───────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_2_1_2_b.txt b/test/txtfiles/widget_buttonsmenu_2_2_1_2_b.txt index a2195d3f7..c93913393 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_1_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_1_2_b.txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_2_2_2_(1).txt b/test/txtfiles/widget_buttonsmenu_2_2_2_(1).txt index 833377a0f..fd7a4f915 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_2_(1).txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_2_(1).txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └───────────────────────────────┘└───────────────────────────────┘└───────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_2_2_(2).txt b/test/txtfiles/widget_buttonsmenu_2_2_2_(2).txt index 5653ec12d..c4788a95c 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_2_(2).txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_2_(2).txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_buttonsmenu_2_2_2_1_b.txt b/test/txtfiles/widget_buttonsmenu_2_2_2_1_b.txt index e06eedc14..be6253c3b 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_2_1_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_2_1_b.txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ └───────────────────────────────┘└───────────────────────────────┘└───────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/widget_buttonsmenu_2_2_2_2_b.txt b/test/txtfiles/widget_buttonsmenu_2_2_2_2_b.txt index a2195d3f7..c93913393 100644 --- a/test/txtfiles/widget_buttonsmenu_2_2_2_2_b.txt +++ b/test/txtfiles/widget_buttonsmenu_2_2_2_2_b.txt @@ -1,5 +1,5 @@ ┌───────────────────────────────┐┌───────────────────────────────┐┌───────────────────────────────┐ -│  one  ││  two  ││  three  │ +│  one  ││  two  ││  three  │ │ ││ ││ │ │ ││ ││ │ │ ││ ││ │ diff --git a/test/txtfiles/widget_gal_1_1_1.txt b/test/txtfiles/widget_gal_1_1_1.txt index da0fcdae8..74a08a0ac 100644 --- a/test/txtfiles/widget_gal_1_1_1.txt +++ b/test/txtfiles/widget_gal_1_1_1.txt @@ -1,6 +1,6 @@ ╭───────────────────── Widget 1/2 ─────────────────────╮ │ │ -│ │aaa │ +│ │aaa │ │ │ │ │ │ │ diff --git a/test/txtfiles/widget_gal_1_2_1.txt b/test/txtfiles/widget_gal_1_2_1.txt index 17f58e81c..5f07d605d 100644 --- a/test/txtfiles/widget_gal_1_2_1.txt +++ b/test/txtfiles/widget_gal_1_2_1.txt @@ -1,6 +1,6 @@ ╭───────────────────── Widget 1/2 ─────────────────────╮ │ │ -│ │aaa │ +│ │aaa │ │ │ │ │ │ │ diff --git a/test/txtfiles/widget_gal_2_1_1.txt b/test/txtfiles/widget_gal_2_1_1.txt index acc082672..5e75a6713 100644 --- a/test/txtfiles/widget_gal_2_1_1.txt +++ b/test/txtfiles/widget_gal_2_1_1.txt @@ -1,6 +1,6 @@ ╭───────────────────────────────── Widget 1/2 ─────────────────────────────────╮ │ │ -│ │aaa │ +│ │aaa │ │ │ │ │ │ │ diff --git a/test/txtfiles/widget_gal_2_2_1.txt b/test/txtfiles/widget_gal_2_2_1.txt index 6feca5394..c3ac295cf 100644 --- a/test/txtfiles/widget_gal_2_2_1.txt +++ b/test/txtfiles/widget_gal_2_2_1.txt @@ -1,6 +1,6 @@ ╭───────────────────────────────── Widget 1/2 ─────────────────────────────────╮ │ │ -│ │aaa │ +│ │aaa │ │ │ │ │ │ │ From 4c1560204a67eca08d1de721ab0ca0ea46b7d2d7 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Fri, 17 Mar 2023 20:20:49 -0400 Subject: [PATCH 16/18] fixed tree width --- src/trees.jl | 5 +++++ test/txtfiles/tree_2_1_1.txt | 6 +++--- test/txtfiles/tree_2_1_2.txt | 10 +++++----- test/txtfiles/tree_2_1_3.txt | 10 +++++----- test/txtfiles/tree_2_1_4.txt | 24 ++++++++++++------------ test/txtfiles/tree_2_1_5.txt | 26 +++++++++++++------------- test/txtfiles/tree_2_1_6.txt | 8 ++++---- test/txtfiles/tree_2_1_7.txt | 10 +++++----- test/txtfiles/tree_2_1_8.txt | 12 ++++++------ test/txtfiles/tree_2_1_9.txt | 24 ++++++++++++------------ test/txtfiles/tree_2_2_1.txt | 6 +++--- test/txtfiles/tree_2_2_2.txt | 10 +++++----- test/txtfiles/tree_2_2_3.txt | 10 +++++----- test/txtfiles/tree_2_2_4.txt | 24 ++++++++++++------------ test/txtfiles/tree_2_2_5.txt | 26 +++++++++++++------------- test/txtfiles/tree_2_2_6.txt | 8 ++++---- test/txtfiles/tree_2_2_7.txt | 10 +++++----- test/txtfiles/tree_2_2_8.txt | 12 ++++++------ test/txtfiles/tree_2_2_9.txt | 24 ++++++++++++------------ test/txtfiles/tree_2_3_1.txt | 6 +++--- test/txtfiles/tree_2_3_2.txt | 10 +++++----- test/txtfiles/tree_2_3_3.txt | 10 +++++----- test/txtfiles/tree_2_3_4.txt | 24 ++++++++++++------------ test/txtfiles/tree_2_3_5.txt | 26 +++++++++++++------------- test/txtfiles/tree_2_3_6.txt | 8 ++++---- test/txtfiles/tree_2_3_7.txt | 10 +++++----- test/txtfiles/tree_2_3_8.txt | 12 ++++++------ test/txtfiles/tree_2_3_9.txt | 24 ++++++++++++------------ 28 files changed, 200 insertions(+), 195 deletions(-) diff --git a/src/trees.jl b/src/trees.jl index 10a095079..022d0ec81 100644 --- a/src/trees.jl +++ b/src/trees.jl @@ -138,6 +138,8 @@ function Tree( kwargs..., ) _TREE_PRINTING_TITLE[] = title + _theme = TERM_THEME[] + TERM_THEME[] = theme # print tree guides = guides isa Symbol ? treeguides[guides] : guides @@ -168,6 +170,9 @@ function Tree( # turn into a renderable rt = RenderableText(tree) + + # restore theme + TERM_THEME[] = _theme return Tree(rt.segments, rt.measure) end diff --git a/test/txtfiles/tree_2_1_1.txt b/test/txtfiles/tree_2_1_1.txt index a02a6a4c5..cc4bbbe81 100644 --- a/test/txtfiles/tree_2_1_1.txt +++ b/test/txtfiles/tree_2_1_1.txt @@ -1,8 +1,8 @@ tree_2_1_1 └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd -fd ⇒ Dict("n1" => 1, "n2" => 2) +fd ⇒ Dict("n1" => 1, "n2" => 2) - ├─ n1 ⇒ 1 + ├─ n1 ⇒ 1 - └─ n2 ⇒ 2 + └─ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_2.txt b/test/txtfiles/tree_2_1_2.txt index 487b51f45..97456165f 100644 --- a/test/txtfiles/tree_2_1_2.txt +++ b/test/txtfiles/tree_2_1_2.txt @@ -1,8 +1,8 @@ tree_2_1_2 - ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a - │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("n1" => 1, "n2" => 2) - ├─ n1 ⇒ 1 - └─ n2 ⇒ 2 + │ └─ n2 ⇒ 2 + └─ nested ⇒ Dict("n1" => 1, "n2" => 2) + ├─ n1 ⇒ 1 + └─ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_3.txt b/test/txtfiles/tree_2_1_3.txt index 2834e0586..59ff343aa 100644 --- a/test/txtfiles/tree_2_1_3.txt +++ b/test/txtfiles/tree_2_1_3.txt @@ -1,10 +1,10 @@ tree_2_1_3 - ├─ leaf ⇒ 2 - ├─ nested ⇒ Dict("n1" => 1, "n2" => 2) - │ ├─ n1 ⇒ 1 - │ └─ n2 ⇒ 2 + ├─ leaf ⇒ 2 + ├─ nested ⇒ Dict("n1" => 1, "n2" => 2) + │ ├─ n1 ⇒ 1 + │ └─ n2 ⇒ 2 ├─ canopy ⇒ test ├─ leafme ⇒ v ├─ ["a"] ⇒ test - └─ leaf2 ⇒ 2 + └─ leaf2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_4.txt b/test/txtfiles/tree_2_1_4.txt index fc27b7f43..ce45ab75c 100644 --- a/test/txtfiles/tree_2_1_4.txt +++ b/test/txtfiles/tree_2_1_4.txt @@ -1,20 +1,20 @@ tree_2_1_4 - ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a - │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + │ └─ n2 ⇒ 2 + └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - ├─ n3 ⇒ 3 +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) + ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ├─ aleaf ⇒ unbeliefable └─ leaflet ⇒ level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_1_5.txt b/test/txtfiles/tree_2_1_5.txt index e63a51bcd..760247895 100644 --- a/test/txtfiles/tree_2_1_5.txt +++ b/test/txtfiles/tree_2_1_5.txt @@ -1,20 +1,20 @@ tree_2_1_5 - ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a - │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - ├─ adict ⇒ Dict("x" => 2) - │ └─ x ⇒ 2 - ├─ n3 ⇒ 3 + │ └─ n2 ⇒ 2 + └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) + ├─ adict ⇒ Dict("x" => 2) + │ └─ x ⇒ 2 + ├─ n3 ⇒ 3 ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" => "unbeliefable", "leaflet" => "level - 3") - ├─ sodeep ⇒ Dict("a" => 4) - │ └─ a ⇒ 4 + 3") + ├─ sodeep ⇒ Dict("a" => 4) + │ └─ a ⇒ 4 ├─ aleaf ⇒ unbeliefable └─ leaflet ⇒ level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_6.txt b/test/txtfiles/tree_2_1_6.txt index f53661481..411eca919 100644 --- a/test/txtfiles/tree_2_1_6.txt +++ b/test/txtfiles/tree_2_1_6.txt @@ -1,8 +1,8 @@ tree_2_1_6 - ├─ 3 ⇒ OrderedDict(3 => 8, 1 => "a") - │ ├─ 3 ⇒ 8 + ├─ 3 ⇒ OrderedDict(3 => 8, 1 => "a") + │ ├─ 3 ⇒ 8 │ └─ 1 ⇒ a - └─ 2 ⇒ OrderedDict(3 => 8, 1 => "a") - ├─ 3 ⇒ 8 + └─ 2 ⇒ OrderedDict(3 => 8, 1 => "a") + ├─ 3 ⇒ 8 └─ 1 ⇒ a \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_7.txt b/test/txtfiles/tree_2_1_7.txt index 8a48eff58..297738d6c 100644 --- a/test/txtfiles/tree_2_1_7.txt +++ b/test/txtfiles/tree_2_1_7.txt @@ -1,7 +1,7 @@ tree_2_1_7 - ├─ 2 ⇒ 1 - └─ 3 ⇒ OrderedDict(4 => 2, "a" => 2, "b" => 1) - ├─ 4 ⇒ 2 - ├─ a ⇒ 2 - └─ b ⇒ 1 + ├─ 2 ⇒ 1 + └─ 3 ⇒ OrderedDict(4 => 2, "a" => 2, "b" => 1) + ├─ 4 ⇒ 2 + ├─ a ⇒ 2 + └─ b ⇒ 1 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_8.txt b/test/txtfiles/tree_2_1_8.txt index ca3c49e91..717185e2e 100644 --- a/test/txtfiles/tree_2_1_8.txt +++ b/test/txtfiles/tree_2_1_8.txt @@ -1,8 +1,8 @@ tree_2_1_8 - ├─ 1 ⇒ 1 - ├─ 2 ⇒ 2 - └─ 3 ⇒ [2, 3, 4] - ├─ 1 ⇒ 2 - ├─ 2 ⇒ 3 - └─ 3 ⇒ 4 + ├─ 1 ⇒ 1 + ├─ 2 ⇒ 2 + └─ 3 ⇒ [2, 3, 4] + ├─ 1 ⇒ 2 + ├─ 2 ⇒ 3 + └─ 3 ⇒ 4 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_9.txt b/test/txtfiles/tree_2_1_9.txt index 4d4e223a6..083b05e33 100644 --- a/test/txtfiles/tree_2_1_9.txt +++ b/test/txtfiles/tree_2_1_9.txt @@ -1,26 +1,26 @@ tree_2_1_9 - ├─ 1 ⇒ 1 - ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + ├─ 1 ⇒ 1 + ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] - │ ├─ 1 ⇒ 2 - │ ├─ 2 ⇒ [3, 4] - │ │ ├─ 1 ⇒ 3 - │ │ └─ 2 ⇒ 4 + │ ├─ 1 ⇒ 2 + │ ├─ 2 ⇒ [3, 4] + │ │ ├─ 1 ⇒ 3 + │ │ └─ 2 ⇒ 4 │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaa ├─ 3 ⇒ c - └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ├─ 2 ⇒ a ├─ 1 ⇒ ok - ├─ a ⇒ 2 - └─ test ⇒ [1, 2] - ├─ 1 ⇒ 1 - └─ 2 ⇒ 2 + ├─ a ⇒ 2 + └─ test ⇒ [1, 2] + ├─ 1 ⇒ 1 + └─ 2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_1.txt b/test/txtfiles/tree_2_2_1.txt index 6ff008b6e..11f6cf2bc 100644 --- a/test/txtfiles/tree_2_2_1.txt +++ b/test/txtfiles/tree_2_2_1.txt @@ -1,8 +1,8 @@ tree_2_2_1 ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf -sdfd ⇒ Dict("n1" => 1, "n2" => 2) +sdfd ⇒ Dict("n1" => 1, "n2" => 2) - ┣━━━ n1 ⇒ 1 + ┣━━━ n1 ⇒ 1 - ┗━━━ n2 ⇒ 2 + ┗━━━ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_2.txt b/test/txtfiles/tree_2_2_2.txt index 1a1f44634..2cceb5678 100644 --- a/test/txtfiles/tree_2_2_2.txt +++ b/test/txtfiles/tree_2_2_2.txt @@ -1,8 +1,8 @@ tree_2_2_2 - ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a - ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("n1" => 1, "n2" => 2) - ┣━━━ n1 ⇒ 1 - ┗━━━ n2 ⇒ 2 + ┃ ┗━━━ n2 ⇒ 2 + ┗━━━ nested ⇒ Dict("n1" => 1, "n2" => 2) + ┣━━━ n1 ⇒ 1 + ┗━━━ n2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_3.txt b/test/txtfiles/tree_2_2_3.txt index 0a3a4acc4..7c742fb72 100644 --- a/test/txtfiles/tree_2_2_3.txt +++ b/test/txtfiles/tree_2_2_3.txt @@ -1,10 +1,10 @@ tree_2_2_3 - ┣━━━ leaf ⇒ 2 - ┣━━━ nested ⇒ Dict("n1" => 1, "n2" => 2) - ┃ ┣━━━ n1 ⇒ 1 - ┃ ┗━━━ n2 ⇒ 2 + ┣━━━ leaf ⇒ 2 + ┣━━━ nested ⇒ Dict("n1" => 1, "n2" => 2) + ┃ ┣━━━ n1 ⇒ 1 + ┃ ┗━━━ n2 ⇒ 2 ┣━━━ canopy ⇒ test ┣━━━ leafme ⇒ v ┣━━━ ["a"] ⇒ test - ┗━━━ leaf2 ⇒ 2 + ┗━━━ leaf2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_4.txt b/test/txtfiles/tree_2_2_4.txt index 8b2a36d10..9e6cdc413 100644 --- a/test/txtfiles/tree_2_2_4.txt +++ b/test/txtfiles/tree_2_2_4.txt @@ -1,20 +1,20 @@ tree_2_2_4 - ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a - ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" + ┃ ┗━━━ n2 ⇒ 2 + ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - ┣━━━ n3 ⇒ 3 +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) + ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") ┣━━━ aleaf ⇒ unbeliefable ┗━━━ leaflet ⇒ level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_2_5.txt b/test/txtfiles/tree_2_2_5.txt index 1963bba4d..94b4ffa6d 100644 --- a/test/txtfiles/tree_2_2_5.txt +++ b/test/txtfiles/tree_2_2_5.txt @@ -1,20 +1,20 @@ tree_2_2_5 - ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) + ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a - ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - ┣━━━ adict ⇒ Dict("x" => 2) - ┃ ┗━━━ x ⇒ 2 - ┣━━━ n3 ⇒ 3 + ┃ ┗━━━ n2 ⇒ 2 + ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) + ┣━━━ adict ⇒ Dict("x" => 2) + ┃ ┗━━━ x ⇒ 2 + ┣━━━ n3 ⇒ 3 ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" + ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" => "unbeliefable", "leaflet" => "level - 3") - ┣━━━ sodeep ⇒ Dict("a" => 4) - ┃ ┗━━━ a ⇒ 4 + 3") + ┣━━━ sodeep ⇒ Dict("a" => 4) + ┃ ┗━━━ a ⇒ 4 ┣━━━ aleaf ⇒ unbeliefable ┗━━━ leaflet ⇒ level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_6.txt b/test/txtfiles/tree_2_2_6.txt index dbc3dda48..7c3485422 100644 --- a/test/txtfiles/tree_2_2_6.txt +++ b/test/txtfiles/tree_2_2_6.txt @@ -1,8 +1,8 @@ tree_2_2_6 - ┣━━━ 3 ⇒ OrderedDict(3 => 8, 1 => "a") - ┃ ┣━━━ 3 ⇒ 8 + ┣━━━ 3 ⇒ OrderedDict(3 => 8, 1 => "a") + ┃ ┣━━━ 3 ⇒ 8 ┃ ┗━━━ 1 ⇒ a - ┗━━━ 2 ⇒ OrderedDict(3 => 8, 1 => "a") - ┣━━━ 3 ⇒ 8 + ┗━━━ 2 ⇒ OrderedDict(3 => 8, 1 => "a") + ┣━━━ 3 ⇒ 8 ┗━━━ 1 ⇒ a \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_7.txt b/test/txtfiles/tree_2_2_7.txt index 078b10205..5982594d2 100644 --- a/test/txtfiles/tree_2_2_7.txt +++ b/test/txtfiles/tree_2_2_7.txt @@ -1,7 +1,7 @@ tree_2_2_7 - ┣━━━ 2 ⇒ 1 - ┗━━━ 3 ⇒ OrderedDict(4 => 2, "a" => 2, "b" => 1) - ┣━━━ 4 ⇒ 2 - ┣━━━ a ⇒ 2 - ┗━━━ b ⇒ 1 + ┣━━━ 2 ⇒ 1 + ┗━━━ 3 ⇒ OrderedDict(4 => 2, "a" => 2, "b" => 1) + ┣━━━ 4 ⇒ 2 + ┣━━━ a ⇒ 2 + ┗━━━ b ⇒ 1 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_8.txt b/test/txtfiles/tree_2_2_8.txt index a90871991..eff912cfa 100644 --- a/test/txtfiles/tree_2_2_8.txt +++ b/test/txtfiles/tree_2_2_8.txt @@ -1,8 +1,8 @@ tree_2_2_8 - ┣━━━ 1 ⇒ 1 - ┣━━━ 2 ⇒ 2 - ┗━━━ 3 ⇒ [2, 3, 4] - ┣━━━ 1 ⇒ 2 - ┣━━━ 2 ⇒ 3 - ┗━━━ 3 ⇒ 4 + ┣━━━ 1 ⇒ 1 + ┣━━━ 2 ⇒ 2 + ┗━━━ 3 ⇒ [2, 3, 4] + ┣━━━ 1 ⇒ 2 + ┣━━━ 2 ⇒ 3 + ┗━━━ 3 ⇒ 4 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_9.txt b/test/txtfiles/tree_2_2_9.txt index 1e2d7e5dc..af0033fc2 100644 --- a/test/txtfiles/tree_2_2_9.txt +++ b/test/txtfiles/tree_2_2_9.txt @@ -1,26 +1,26 @@ tree_2_2_9 - ┣━━━ 1 ⇒ 1 - ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + ┣━━━ 1 ⇒ 1 + ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] - ┃ ┣━━━ 1 ⇒ 2 - ┃ ┣━━━ 2 ⇒ [3, 4] - ┃ ┃ ┣━━━ 1 ⇒ 3 - ┃ ┃ ┗━━━ 2 ⇒ 4 + ┃ ┣━━━ 1 ⇒ 2 + ┃ ┣━━━ 2 ⇒ [3, 4] + ┃ ┃ ┣━━━ 1 ⇒ 3 + ┃ ┃ ┗━━━ 2 ⇒ 4 ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaa ┣━━━ 3 ⇒ c - ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) ┣━━━ 2 ⇒ a ┣━━━ 1 ⇒ ok - ┣━━━ a ⇒ 2 - ┗━━━ test ⇒ [1, 2] - ┣━━━ 1 ⇒ 1 - ┗━━━ 2 ⇒ 2 + ┣━━━ a ⇒ 2 + ┗━━━ test ⇒ [1, 2] + ┣━━━ 1 ⇒ 1 + ┗━━━ 2 ⇒ 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_1.txt b/test/txtfiles/tree_2_3_1.txt index 1ae773aab..0ac91e935 100644 --- a/test/txtfiles/tree_2_3_1.txt +++ b/test/txtfiles/tree_2_3_1.txt @@ -1,8 +1,8 @@ tree_2_3_1 `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds -fsdfd => Dict("n1" => 1, "n2" => 2) +fsdfd => Dict("n1" => 1, "n2" => 2) - +---- n1 => 1 + +---- n1 => 1 - `---- n2 => 2 + `---- n2 => 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_2.txt b/test/txtfiles/tree_2_3_2.txt index 5a2a036c5..4c4aebef7 100644 --- a/test/txtfiles/tree_2_3_2.txt +++ b/test/txtfiles/tree_2_3_2.txt @@ -1,8 +1,8 @@ tree_2_3_2 - +---- nested2 => Dict("n1" => "a", "n2" => 2) + +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a - | `---- n2 => 2 - `---- nested => Dict("n1" => 1, "n2" => 2) - +---- n1 => 1 - `---- n2 => 2 + | `---- n2 => 2 + `---- nested => Dict("n1" => 1, "n2" => 2) + +---- n1 => 1 + `---- n2 => 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_3.txt b/test/txtfiles/tree_2_3_3.txt index 6a6039f99..eb249d699 100644 --- a/test/txtfiles/tree_2_3_3.txt +++ b/test/txtfiles/tree_2_3_3.txt @@ -1,10 +1,10 @@ tree_2_3_3 - +---- leaf => 2 - +---- nested => Dict("n1" => 1, "n2" => 2) - | +---- n1 => 1 - | `---- n2 => 2 + +---- leaf => 2 + +---- nested => Dict("n1" => 1, "n2" => 2) + | +---- n1 => 1 + | `---- n2 => 2 +---- canopy => test +---- leafme => v +---- ["a"] => test - `---- leaf2 => 2 + `---- leaf2 => 2 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_4.txt b/test/txtfiles/tree_2_3_4.txt index b5e65bdcd..f901384a3 100644 --- a/test/txtfiles/tree_2_3_4.txt +++ b/test/txtfiles/tree_2_3_4.txt @@ -1,20 +1,20 @@ tree_2_3_4 - +---- nested2 => Dict("n1" => "a", "n2" => 2) + +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a - | `---- n2 => 2 - `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" + | `---- n2 => 2 + `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - +---- n3 => 3 +  => "level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3")) + +---- n3 => 3 +---- n2 => Int64 `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") + => "level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3level 3level 3level 3level + 3level 3level 3") +---- aleaf => unbeliefable `---- leaflet => level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_3_5.txt b/test/txtfiles/tree_2_3_5.txt index 26be47a4f..ffc276096 100644 --- a/test/txtfiles/tree_2_3_5.txt +++ b/test/txtfiles/tree_2_3_5.txt @@ -1,20 +1,20 @@ tree_2_3_5 - +---- nested2 => Dict("n1" => "a", "n2" => 2) + +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a - | `---- n2 => 2 - `---- nested => Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - +---- adict => Dict("x" => 2) - | `---- x => 2 - +---- n3 => 3 + | `---- n2 => 2 + `---- nested => Dict("adict" => Dict("x" => 2), "n3" => + 3, "n2" => Int64, "deeper" => Dict("sodeep" + => Dict("a" => 4), "aleaf" => "unbeliefable" + , "leaflet" => "level 3")) + +---- adict => Dict("x" => 2) + | `---- x => 2 + +---- n3 => 3 +---- n2 => Int64 - `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" + `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" => "unbeliefable", "leaflet" => "level - 3") - +---- sodeep => Dict("a" => 4) - | `---- a => 4 + 3") + +---- sodeep => Dict("a" => 4) + | `---- a => 4 +---- aleaf => unbeliefable `---- leaflet => level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_6.txt b/test/txtfiles/tree_2_3_6.txt index cb119689f..ba35d2add 100644 --- a/test/txtfiles/tree_2_3_6.txt +++ b/test/txtfiles/tree_2_3_6.txt @@ -1,8 +1,8 @@ tree_2_3_6 - +---- 3 => OrderedDict(3 => 8, 1 => "a") - | +---- 3 => 8 + +---- 3 => OrderedDict(3 => 8, 1 => "a") + | +---- 3 => 8 | `---- 1 => a - `---- 2 => OrderedDict(3 => 8, 1 => "a") - +---- 3 => 8 + `---- 2 => OrderedDict(3 => 8, 1 => "a") + +---- 3 => 8 `---- 1 => a \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_7.txt b/test/txtfiles/tree_2_3_7.txt index ba5ff5555..52e1ecf84 100644 --- a/test/txtfiles/tree_2_3_7.txt +++ b/test/txtfiles/tree_2_3_7.txt @@ -1,7 +1,7 @@ tree_2_3_7 - +---- 2 => 1 - `---- 3 => OrderedDict(4 => 2, "a" => 2, "b" => 1) - +---- 4 => 2 - +---- a => 2 - `---- b => 1 + +---- 2 => 1 + `---- 3 => OrderedDict(4 => 2, "a" => 2, "b" => 1) + +---- 4 => 2 + +---- a => 2 + `---- b => 1 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_8.txt b/test/txtfiles/tree_2_3_8.txt index 20a8be710..338db8939 100644 --- a/test/txtfiles/tree_2_3_8.txt +++ b/test/txtfiles/tree_2_3_8.txt @@ -1,8 +1,8 @@ tree_2_3_8 - +---- 1 => 1 - +---- 2 => 2 - `---- 3 => [2, 3, 4] - +---- 1 => 2 - +---- 2 => 3 - `---- 3 => 4 + +---- 1 => 1 + +---- 2 => 2 + `---- 3 => [2, 3, 4] + +---- 1 => 2 + +---- 2 => 3 + `---- 3 => 4 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_9.txt b/test/txtfiles/tree_2_3_9.txt index e7407e822..2acefa50a 100644 --- a/test/txtfiles/tree_2_3_9.txt +++ b/test/txtfiles/tree_2_3_9.txt @@ -1,26 +1,26 @@ tree_2_3_9 - +---- 1 => 1 - +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa + +---- 1 => 1 + +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] - | +---- 1 => 2 - | +---- 2 => [3, 4] - | | +---- 1 => 3 - | | `---- 2 => 4 + | +---- 1 => 2 + | +---- 2 => [3, 4] + | | +---- 1 => 3 + | | `---- 2 => 4 | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaa +---- 3 => c - `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) + `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => + 2, :test => [1, 2]) +---- 2 => a +---- 1 => ok - +---- a => 2 - `---- test => [1, 2] - +---- 1 => 1 - `---- 2 => 2 + +---- a => 2 + `---- test => [1, 2] + +---- 1 => 1 + `---- 2 => 2 \ No newline at end of file From 26b44c89a102077ad47389f1c77616e4642bfe22 Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Fri, 17 Mar 2023 20:21:57 -0400 Subject: [PATCH 17/18] fmt --- Project.toml | 2 +- src/_errors.jl | 2 +- src/link.jl | 3 +-- src/markdown.jl | 2 +- src/panels.jl | 7 ++----- src/progress.jl | 8 +++++++- test/08_test_panel.jl | 14 +++++++++----- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Project.toml b/Project.toml index 569a383d7..6a2585a1b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Term" uuid = "22787eb5-b846-44ae-b979-8e399b8463ab" authors = ["FedeClaudi and contributors"] -version = "2.0.0" +version = "2.0.2" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" diff --git a/src/_errors.jl b/src/_errors.jl index 55a4fdbb0..8236354c1 100644 --- a/src/_errors.jl +++ b/src/_errors.jl @@ -220,7 +220,7 @@ function add_stack_frame!( source_file = RenderableText( string(frame.file) * ":$(frame.line)"; style = "underline dim", - width=ctx.func_name_w, + width = ctx.func_name_w, ) _out = func_line / source_file else diff --git a/src/link.jl b/src/link.jl index 5a09aec0a..9f6c2a872 100644 --- a/src/link.jl +++ b/src/link.jl @@ -7,8 +7,7 @@ import ..Style: apply_style import ..Renderables: RenderableText, AbstractRenderable import ..Renderables import ..Layout: pad -import Term: - textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi +import Term: textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi import Term export Link diff --git a/src/markdown.jl b/src/markdown.jl index abc5243a9..4bb51102d 100644 --- a/src/markdown.jl +++ b/src/markdown.jl @@ -176,7 +176,7 @@ function parse_md( "{$(theme.md_code)}`{/$(theme.md_code)}" else panel = Panel( - RenderableText(syntax; style="on_$(theme.md_codeblock_bg)"); + RenderableText(syntax; style = "on_$(theme.md_codeblock_bg)"); style = "white on_$(theme.md_codeblock_bg)", box = :SQUARE, subtitle = length(code.language) > 0 ? code.language : nothing, diff --git a/src/panels.jl b/src/panels.jl index 629825932..2e462533d 100644 --- a/src/panels.jl +++ b/src/panels.jl @@ -192,10 +192,7 @@ content_as_renderable( justify::Symbol, background::Union{String,Nothing}, )::RenderableText = - RenderableText(content; width = width - Δw, - background = background, - justify = justify - ) + RenderableText(content; width = width - Δw, background = background, justify = justify) """ @@ -295,7 +292,7 @@ function Panel( style = "dim", width = content.measure.w, justify = :center, - background=background, + background = background, ) segments = if lines_to_drop < content.measure.h diff --git a/src/progress.jl b/src/progress.jl index c6d322666..7b78a3168 100644 --- a/src/progress.jl +++ b/src/progress.jl @@ -692,7 +692,13 @@ function foreachprogress( return # The job tracks the iteration through `iter` - job = addjob!(pbar; N = n, transient=transient, columns_kwargs=columns_kwargs, kwargs...) + job = addjob!( + pbar; + N = n, + transient = transient, + columns_kwargs = columns_kwargs, + kwargs..., + ) if parallel Threads.@threads for elem in iter f(elem) diff --git a/test/08_test_panel.jl b/test/08_test_panel.jl index 6cebf519a..2164e9610 100644 --- a/test/08_test_panel.jl +++ b/test/08_test_panel.jl @@ -312,7 +312,6 @@ end end end - @testset "\e[34mPanel - padding" begin p = Panel("°"^24; padding = (4, 4, 2, 2), fit = false) @testpanel(p, 7, default_width()) @@ -322,10 +321,17 @@ end end @testset "\e[34mPanel - background" begin - p = Panel(RenderableText("testste"; style="white on_red", background="on_blue", width=25); background="green") + p = Panel( + RenderableText( + "testste"; + style = "white on_red", + background = "on_blue", + width = 25, + ); + background = "green", + ) IS_WIN || @compare_to_string p "panel_background_1" - p = Panel(apply_style( """ asasd @@ -336,9 +342,7 @@ ads "on_blue", ); background = "on_red", fit = true) - IS_WIN || @compare_to_string p "panel_background_2" - end @testset "\e[34mPANEL - UnicodePlots" begin From 44e55ae9252335ac985b8e2ad3f90ee0d5b86acc Mon Sep 17 00:00:00 2001 From: FedeClaudi Date: Fri, 17 Mar 2023 20:29:24 -0400 Subject: [PATCH 18/18] bump --- test/txtfiles/automatic_repr_showme_1.txt | 13 ------------- test/txtfiles/markdown_3.txt | 10 +++++----- test/txtfiles/panel_styling_1.txt | 3 --- test/txtfiles/pbar_cols_style_1.txt | 1 - test/txtfiles/pbar_cols_style_2.txt | 1 - test/txtfiles/pbar_cols_style_4.txt | 2 +- test/txtfiles/renderable_text_2.txt | 9 +-------- test/txtfiles/tree_2_1_1.txt | 8 -------- test/txtfiles/tree_2_1_4.txt | 17 ----------------- test/txtfiles/tree_2_1_5.txt | 17 ----------------- test/txtfiles/tree_2_1_9.txt | 17 ----------------- test/txtfiles/tree_2_2_1.txt | 8 -------- test/txtfiles/tree_2_2_4.txt | 17 ----------------- test/txtfiles/tree_2_2_5.txt | 17 ----------------- test/txtfiles/tree_2_2_9.txt | 17 ----------------- test/txtfiles/tree_2_3_1.txt | 8 -------- test/txtfiles/tree_2_3_4.txt | 17 ----------------- test/txtfiles/tree_2_3_5.txt | 17 ----------------- test/txtfiles/tree_2_3_9.txt | 17 ----------------- 19 files changed, 7 insertions(+), 209 deletions(-) delete mode 100644 test/txtfiles/panel_styling_1.txt delete mode 100644 test/txtfiles/pbar_cols_style_1.txt delete mode 100644 test/txtfiles/pbar_cols_style_2.txt diff --git a/test/txtfiles/automatic_repr_showme_1.txt b/test/txtfiles/automatic_repr_showme_1.txt index 3bfdf0fc5..acec76b90 100644 --- a/test/txtfiles/automatic_repr_showme_1.txt +++ b/test/txtfiles/automatic_repr_showme_1.txt @@ -9,7 +9,6 @@ Method definition ┌────────────────────────────────────────────────────────────────────┐ -<<<<<<< HEAD │ function tprint(io::IO, x::AbstractString; highlight = true)   │ │  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ │ x)   │ @@ -20,16 +19,4 @@ │ (io)))   │ │  print(io, x)   │ │ end   │ -======= -│ function tprint(io::IO, x::AbstractString; highlight = true)  │ -│  x = (highlight ? apply_style ∘ highlighter : apply_style)(  │ -│ x)  │ -│   │ -│  x =  │ -│  Measure(x).w <= console_width(io) ? x :  │ -│  string(RenderableText(string(x), width = console_width  │ -│ (io)))  │ -│  print(io, x)  │ -│ end  │ ->>>>>>> master └────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/test/txtfiles/markdown_3.txt b/test/txtfiles/markdown_3.txt index 63726b70d..30bdb7286 100644 --- a/test/txtfiles/markdown_3.txt +++ b/test/txtfiles/markdown_3.txt @@ -15,17 +15,17 @@ and footnotes {#9aacdb}[1]{/#9aacdb} for your content {#9aacdb}[named]{/#9aacdb} And, of course, you can show some code too: ┌──────────────────────────────────────────────┐ - │ function say_hi(x)   │ - │  print("Hellow World")  │ - │ end   │ + │ function say_hi(x)   │ + │  print("Hello World")  │ + │ end   │ └──────────────────────────────────── julia ───┘ ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ You can use "quotes" to highlight a section: - > “Multi-line quotes can be helpful to make a paragram - ┃ stand out, so that users + > “Multi-line quotes can be helpful to make a paragraph + ┃ stand out, so that users ┃ won't miss it! You can use other inline syntax in ┃ you `quotes` too.” diff --git a/test/txtfiles/panel_styling_1.txt b/test/txtfiles/panel_styling_1.txt deleted file mode 100644 index 29b0dcfa1..000000000 --- a/test/txtfiles/panel_styling_1.txt +++ /dev/null @@ -1,3 +0,0 @@ -╭──────────────────────────────────────────────────────────────────────────────╮ -│ testste   │ -╰──────────────────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_1.txt b/test/txtfiles/pbar_cols_style_1.txt deleted file mode 100644 index 62ef92942..000000000 --- a/test/txtfiles/pbar_cols_style_1.txt +++ /dev/null @@ -1 +0,0 @@ -Running... ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_2.txt b/test/txtfiles/pbar_cols_style_2.txt deleted file mode 100644 index e02241074..000000000 --- a/test/txtfiles/pbar_cols_style_2.txt +++ /dev/null @@ -1 +0,0 @@ -Running... ● ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ ● 10/10 100% \ No newline at end of file diff --git a/test/txtfiles/pbar_cols_style_4.txt b/test/txtfiles/pbar_cols_style_4.txt index 73421fe7b..e76de31e8 100644 --- a/test/txtfiles/pbar_cols_style_4.txt +++ b/test/txtfiles/pbar_cols_style_4.txt @@ -1 +1 @@ -Running... ● ━━━━━━━━━━ ● 10/10 100% ● elapsed: 219ms remaining: 0.0ms \ No newline at end of file +Running... ● ━━━━━━━━━━ ● 10/10 100% ● elapsed: 201ms remaining: 0.0ms \ No newline at end of file diff --git a/test/txtfiles/renderable_text_2.txt b/test/txtfiles/renderable_text_2.txt index 1009faa93..9b266d587 100644 --- a/test/txtfiles/renderable_text_2.txt +++ b/test/txtfiles/renderable_text_2.txt @@ -1,11 +1,4 @@ -<<<<<<< HEAD  Lorem ipsum dolor sit amet,   consectetur adipiscing elit,  sed do eiusmod tempor incidid  - unt ut labore  -======= - Lorem ipsum dolor sit amet,  - consectetur adipiscing elit,  -sed do eiusmod tempor incidid  - unt ut labore  ->>>>>>> master + unt ut labore  \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_1.txt b/test/txtfiles/tree_2_1_1.txt index a012f6d29..cc4bbbe81 100644 --- a/test/txtfiles/tree_2_1_1.txt +++ b/test/txtfiles/tree_2_1_1.txt @@ -1,16 +1,8 @@ tree_2_1_1 └─ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsfsd -<<<<<<< HEAD fd ⇒ Dict("n1" => 1, "n2" => 2) ├─ n1 ⇒ 1 └─ n2 ⇒ 2 -======= -fd ⇒ Dict("n1" => 1, "n2" => 2) - - ├─ n1 ⇒ 1 - - └─ n2 ⇒ 2 ->>>>>>> master \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_4.txt b/test/txtfiles/tree_2_1_4.txt index e936d62cf..ce45ab75c 100644 --- a/test/txtfiles/tree_2_1_4.txt +++ b/test/txtfiles/tree_2_1_4.txt @@ -1,7 +1,6 @@ tree_2_1_4 ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a -<<<<<<< HEAD │ └─ n2 ⇒ 2 └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" @@ -16,22 +15,6 @@ 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3") -======= - │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - ├─ n3 ⇒ 3 - ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") ->>>>>>> master ├─ aleaf ⇒ unbeliefable └─ leaflet ⇒ level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_1_5.txt b/test/txtfiles/tree_2_1_5.txt index f780a3e1f..760247895 100644 --- a/test/txtfiles/tree_2_1_5.txt +++ b/test/txtfiles/tree_2_1_5.txt @@ -1,7 +1,6 @@ tree_2_1_5 ├─ nested2 ⇒ Dict("n1" => "a", "n2" => 2) │ ├─ n1 ⇒ a -<<<<<<< HEAD │ └─ n2 ⇒ 2 └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => 3, "n2" => Int64, "deeper" => Dict("sodeep" @@ -16,22 +15,6 @@ 3") ├─ sodeep ⇒ Dict("a" => 4) │ └─ a ⇒ 4 -======= - │ └─ n2 ⇒ 2 - └─ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - ├─ adict ⇒ Dict("x" => 2) - │ └─ x ⇒ 2 - ├─ n3 ⇒ 3 - ├─ n2 ⇒ Int64 - └─ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") - ├─ sodeep ⇒ Dict("a" => 4) - │ └─ a ⇒ 4 ->>>>>>> master ├─ aleaf ⇒ unbeliefable └─ leaflet ⇒ level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_1_9.txt b/test/txtfiles/tree_2_1_9.txt index e3128536e..083b05e33 100644 --- a/test/txtfiles/tree_2_1_9.txt +++ b/test/txtfiles/tree_2_1_9.txt @@ -1,39 +1,22 @@ tree_2_1_9 -<<<<<<< HEAD ├─ 1 ⇒ 1 ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa -======= - ├─ 1 ⇒ 1 - ├─ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa ->>>>>>> master │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] -<<<<<<< HEAD │ ├─ 1 ⇒ 2 │ ├─ 2 ⇒ [3, 4] │ │ ├─ 1 ⇒ 3 │ │ └─ 2 ⇒ 4 -======= - │ ├─ 1 ⇒ 2 - │ ├─ 2 ⇒ [3, 4] - │ │ ├─ 1 ⇒ 3 - │ │ └─ 2 ⇒ 4 ->>>>>>> master │ └─ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa │ aaaaaaaaaaaaaaaaaaaaaaaa ├─ 3 ⇒ c -<<<<<<< HEAD └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => 2, :test => [1, 2]) -======= - └─ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) ->>>>>>> master ├─ 2 ⇒ a ├─ 1 ⇒ ok ├─ a ⇒ 2 diff --git a/test/txtfiles/tree_2_2_1.txt b/test/txtfiles/tree_2_2_1.txt index c920d2e89..11f6cf2bc 100644 --- a/test/txtfiles/tree_2_2_1.txt +++ b/test/txtfiles/tree_2_2_1.txt @@ -1,16 +1,8 @@ tree_2_2_1 ┗━━━ nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfdsf -<<<<<<< HEAD sdfd ⇒ Dict("n1" => 1, "n2" => 2) ┣━━━ n1 ⇒ 1 ┗━━━ n2 ⇒ 2 -======= -sdfd ⇒ Dict("n1" => 1, "n2" => 2) - - ┣━━━ n1 ⇒ 1 - - ┗━━━ n2 ⇒ 2 ->>>>>>> master \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_4.txt b/test/txtfiles/tree_2_2_4.txt index de67de370..9e6cdc413 100644 --- a/test/txtfiles/tree_2_2_4.txt +++ b/test/txtfiles/tree_2_2_4.txt @@ -1,7 +1,6 @@ tree_2_2_4 ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a -<<<<<<< HEAD ┃ ┗━━━ n2 ⇒ 2 ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" @@ -16,22 +15,6 @@ 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3") -======= - ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - ┣━━━ n3 ⇒ 3 - ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") ->>>>>>> master ┣━━━ aleaf ⇒ unbeliefable ┗━━━ leaflet ⇒ level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_2_5.txt b/test/txtfiles/tree_2_2_5.txt index b11fd593c..94b4ffa6d 100644 --- a/test/txtfiles/tree_2_2_5.txt +++ b/test/txtfiles/tree_2_2_5.txt @@ -1,7 +1,6 @@ tree_2_2_5 ┣━━━ nested2 ⇒ Dict("n1" => "a", "n2" => 2) ┃ ┣━━━ n1 ⇒ a -<<<<<<< HEAD ┃ ┗━━━ n2 ⇒ 2 ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => 3, "n2" => Int64, "deeper" => Dict("sodeep" @@ -16,22 +15,6 @@ 3") ┣━━━ sodeep ⇒ Dict("a" => 4) ┃ ┗━━━ a ⇒ 4 -======= - ┃ ┗━━━ n2 ⇒ 2 - ┗━━━ nested ⇒ Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - ┣━━━ adict ⇒ Dict("x" => 2) - ┃ ┗━━━ x ⇒ 2 - ┣━━━ n3 ⇒ 3 - ┣━━━ n2 ⇒ Int64 - ┗━━━ deeper ⇒ Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") - ┣━━━ sodeep ⇒ Dict("a" => 4) - ┃ ┗━━━ a ⇒ 4 ->>>>>>> master ┣━━━ aleaf ⇒ unbeliefable ┗━━━ leaflet ⇒ level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_2_9.txt b/test/txtfiles/tree_2_2_9.txt index bb96cfd21..af0033fc2 100644 --- a/test/txtfiles/tree_2_2_9.txt +++ b/test/txtfiles/tree_2_2_9.txt @@ -1,39 +1,22 @@ tree_2_2_9 -<<<<<<< HEAD ┣━━━ 1 ⇒ 1 ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa -======= - ┣━━━ 1 ⇒ 1 - ┣━━━ 2 ⇒ Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa ->>>>>>> master ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] -<<<<<<< HEAD ┃ ┣━━━ 1 ⇒ 2 ┃ ┣━━━ 2 ⇒ [3, 4] ┃ ┃ ┣━━━ 1 ⇒ 3 ┃ ┃ ┗━━━ 2 ⇒ 4 -======= - ┃ ┣━━━ 1 ⇒ 2 - ┃ ┣━━━ 2 ⇒ [3, 4] - ┃ ┃ ┣━━━ 1 ⇒ 3 - ┃ ┃ ┗━━━ 2 ⇒ 4 ->>>>>>> master ┃ ┗━━━ 3 ⇒ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ┃ aaaaaaaaaaaaaaaaaaaaaaaa ┣━━━ 3 ⇒ c -<<<<<<< HEAD ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => 2, :test => [1, 2]) -======= - ┗━━━ 4 ⇒ OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) ->>>>>>> master ┣━━━ 2 ⇒ a ┣━━━ 1 ⇒ ok ┣━━━ a ⇒ 2 diff --git a/test/txtfiles/tree_2_3_1.txt b/test/txtfiles/tree_2_3_1.txt index ba2020b34..0ac91e935 100644 --- a/test/txtfiles/tree_2_3_1.txt +++ b/test/txtfiles/tree_2_3_1.txt @@ -1,16 +1,8 @@ tree_2_3_1 `---- nestedasdasdsadasdasdsadsadasdasdasdsadasasdasdassfsdfdsfdsfdsfsdfsdfds -<<<<<<< HEAD fsdfd => Dict("n1" => 1, "n2" => 2) +---- n1 => 1 `---- n2 => 2 -======= -fsdfd => Dict("n1" => 1, "n2" => 2) - - +---- n1 => 1 - - `---- n2 => 2 ->>>>>>> master \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_4.txt b/test/txtfiles/tree_2_3_4.txt index 5540c4970..f901384a3 100644 --- a/test/txtfiles/tree_2_3_4.txt +++ b/test/txtfiles/tree_2_3_4.txt @@ -1,7 +1,6 @@ tree_2_3_4 +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a -<<<<<<< HEAD | `---- n2 => 2 `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" => Dict("aleaf" => "unbeliefable", "leaflet" @@ -16,22 +15,6 @@ 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3level 3") -======= - | `---- n2 => 2 - `---- nested => Dict("n3" => 3, "n2" => Int64, "deeper" - => Dict("aleaf" => "unbeliefable", "leaflet" -  => "level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3")) - +---- n3 => 3 - +---- n2 => Int64 - `---- deeper => Dict("aleaf" => "unbeliefable", "leaflet" - => "level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3level 3level 3level 3level - 3level 3level 3") ->>>>>>> master +---- aleaf => unbeliefable `---- leaflet => level 3level 3level 3level 3level 3level diff --git a/test/txtfiles/tree_2_3_5.txt b/test/txtfiles/tree_2_3_5.txt index 8122feced..ffc276096 100644 --- a/test/txtfiles/tree_2_3_5.txt +++ b/test/txtfiles/tree_2_3_5.txt @@ -1,7 +1,6 @@ tree_2_3_5 +---- nested2 => Dict("n1" => "a", "n2" => 2) | +---- n1 => a -<<<<<<< HEAD | `---- n2 => 2 `---- nested => Dict("adict" => Dict("x" => 2), "n3" => 3, "n2" => Int64, "deeper" => Dict("sodeep" @@ -16,22 +15,6 @@ 3") +---- sodeep => Dict("a" => 4) | `---- a => 4 -======= - | `---- n2 => 2 - `---- nested => Dict("adict" => Dict("x" => 2), "n3" => - 3, "n2" => Int64, "deeper" => Dict("sodeep" - => Dict("a" => 4), "aleaf" => "unbeliefable" - , "leaflet" => "level 3")) - +---- adict => Dict("x" => 2) - | `---- x => 2 - +---- n3 => 3 - +---- n2 => Int64 - `---- deeper => Dict("sodeep" => Dict("a" => 4), "aleaf" - => "unbeliefable", "leaflet" => "level - 3") - +---- sodeep => Dict("a" => 4) - | `---- a => 4 ->>>>>>> master +---- aleaf => unbeliefable `---- leaflet => level 3 \ No newline at end of file diff --git a/test/txtfiles/tree_2_3_9.txt b/test/txtfiles/tree_2_3_9.txt index f0e7682d9..2acefa50a 100644 --- a/test/txtfiles/tree_2_3_9.txt +++ b/test/txtfiles/tree_2_3_9.txt @@ -1,39 +1,22 @@ tree_2_3_9 -<<<<<<< HEAD +---- 1 => 1 +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa -======= - +---- 1 => 1 - +---- 2 => Any[2, [3, 4], "aaaaaaaaaaaaaaaaaaaaaaaaaaaa ->>>>>>> master | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] -<<<<<<< HEAD | +---- 1 => 2 | +---- 2 => [3, 4] | | +---- 1 => 3 | | `---- 2 => 4 -======= - | +---- 1 => 2 - | +---- 2 => [3, 4] - | | +---- 1 => 3 - | | `---- 2 => 4 ->>>>>>> master | `---- 3 => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | aaaaaaaaaaaaaaaaaaaaaaaa +---- 3 => c -<<<<<<< HEAD `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => 2, :test => [1, 2]) -======= - `---- 4 => OrderedDict(2 => "a", 1 => :ok, "a" => - 2, :test => [1, 2]) ->>>>>>> master +---- 2 => a +---- 1 => ok +---- a => 2