diff --git a/CHANGELOG.md b/CHANGELOG.md index 55fccbc..d669e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## [Unreleased] -- Added ability to show "Overall" statistics for subgroups in `table_one` [#30](https://github.com/PumasAI/SummaryTables.jl/pull/30). +- **Breaking** Changed `show_overall` keyword of `table_one` to `show_total`. The name of all total columns was changed from `"Overall"` to `"Total"` as well but this can be changed using the new `total_name` keyword. +- Added ability to show "Total" statistics for subgroups in `table_one` [#30](https://github.com/PumasAI/SummaryTables.jl/pull/30). - Fixed tagging of header rows in docx output, such that the header section is now repeated across pages as expected [#32](https://github.com/PumasAI/SummaryTables.jl/pull/32). ## [2.0.2] - 2024-09-16 diff --git a/README_files/figure-commonmark/cell-3-output-1.svg b/README_files/figure-commonmark/cell-3-output-1.svg index fa3f5a3..e1b9f6d 100644 --- a/README_files/figure-commonmark/cell-3-output-1.svg +++ b/README_files/figure-commonmark/cell-3-output-1.svg @@ -25,15 +25,13 @@ - + - - - - - - + + + + @@ -86,34 +84,34 @@ - - + + - - - + + + - - + + - - + + - - - - + + + + @@ -121,147 +119,147 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - + + - + - + - + - + - - - + + + - + - + - - - + + + - + - - - + + + - + @@ -269,34 +267,34 @@ - - + + - + - - - + + + - + - - - + + + - + @@ -304,50 +302,50 @@ - - + + - + - - - - - + + + + + - + - - - + + + - - - + + + - + - - - - + + + + @@ -355,37 +353,37 @@ - - + + - + - - - + + + - + - - - + + + - - - - + + + + @@ -393,33 +391,33 @@ - - + + - + - - - + + + - + - - - + + + - + @@ -430,13 +428,13 @@ - + - + - + @@ -496,111 +494,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + diff --git a/docs/src/predefined_tables/table_one.md b/docs/src/predefined_tables/table_one.md index 01c1ffe..09b2109 100644 --- a/docs/src/predefined_tables/table_one.md +++ b/docs/src/predefined_tables/table_one.md @@ -199,9 +199,9 @@ data = (; x = [1, 2, 3, 4, 5, 6], y = ["a", "a", "a", "a", "b", "b"]) table_one(data, :x, groupby = :y, show_n = true) ``` -## Keyword: `show_overall` +## Keyword: `show_total` -When `show_overall` is set to `false`, the column summarizing all groups together is hidden. +When `show_total` is set to `false`, the column summarizing all groups together is hidden. Use this only when `groupby` is set, otherwise the resulting table will be empty. ```@example @@ -209,7 +209,41 @@ using SummaryTables data = (; x = [1, 2, 3, 4, 5, 6], y = ["a", "a", "a", "a", "b", "b"]) -table_one(data, :x, groupby = :y, show_overall = false) +table_one(data, :x, groupby = :y, show_total = false) +``` + +## Keyword: `total_name` + +The object that will be used to identify total columns. Can be of any value that SummaryTables knows how to display. + +```@example +using SummaryTables + +data = (; x = [1, 2, 3, 4, 5, 6], y = ["a", "a", "a", "a", "b", "b"]) + +table_one(data, :x, groupby = :y, total_name = "Overall") +``` + +## Keyword: `group_totals` + +A `Symbol` or `Vector{Symbol}` specifying one or multiple groups for which to add subtotals. All but the topmost group can be chosen here as the topmost group is handled by `show_total` already. + +```@example +using SummaryTables + +data = (; x = 1:12, y = repeat(["a", "b"], 6), z = repeat(["c", "d"], inner = 6)) + +table_one(data, :x, groupby = [:y, :z], group_totals = :z) +``` + +This example shows multiple-level group totals. In order not to make the resulting table too wide, the topmost factor `q` just has one level which would otherwise be redundant. + +```@example +using SummaryTables + +data = (; x = 1:12, y = repeat(["a", "b"], 6), z = repeat(["c", "d"], inner = 6), q = repeat(["e"], 12)) + +table_one(data, :x, groupby = [:q, :y, :z], group_totals = [:y, :z]) ``` ## Keyword: `sort` diff --git a/src/table.jl b/src/table.jl index 7a65b5b..8073f51 100644 --- a/src/table.jl +++ b/src/table.jl @@ -267,7 +267,7 @@ listingtable( :Apples => "Number of apples", rows = [:Batch, :Checked => "Checked for spots"], cols = [:Delivery], - summarize_cols = [sum => "overall"], + summarize_cols = [sum => "total"], summarize_rows = :Batch => [mean => "average", sum] ) ``` diff --git a/src/table_one.jl b/src/table_one.jl index 0678b25..d960eb1 100644 --- a/src/table_one.jl +++ b/src/table_one.jl @@ -223,15 +223,21 @@ can be stratified by one, or more, variables using the `groupby` keyword. - `groupby`: Which columns to stratify the dataset with, as a `Vector{Symbol}`. - `nonnormal`: A vector of column names where hypothesis tests for the `:nonnormal` type are chosen. - `minmax`: A vector of column names where hypothesis tests for the `:minmax` type are chosen. - - `tests`: a `NamedTuple` of hypothesis test types to use for `categorical`, `nonnormal`, `minmax`, and `normal` variables. - - `combine`: an object from `MultipleTesting` to use when combining p-values. - - `show_overall`: display the "Overall" column summary. Default is `true`. + - `tests`: A `NamedTuple` of hypothesis test types to use for `categorical`, `nonnormal`, `minmax`, and `normal` variables. + - `combine`: An object from `MultipleTesting` to use when combining p-values. + - `show_total`: Display the total column summary. Default is `true`. + - `group_totals`: A group `Symbol` or vector of symbols specifying for which group levels totals should be added. Any group levels but the topmost can be chosen (the topmost being already handled by the `show_total` option). Default is `Symbol[]`. + - `total_name`: The name for all total columns. Default is `"Total"`. - `show_n`: Display the number of rows for each group key next to its label. - - `show_pvalues`: display the `P-Value` column. Default is `false`. - - `show_testnames`: display the `Test` column. Default is `false`. - - `show_confints`: display the `CI` column. Default is `false`. + - `show_pvalues`: Display the `P-Value` column. Default is `false`. + - `show_testnames`: Display the `Test` column. Default is `false`. + - `show_confints`: Display the `CI` column. Default is `false`. - `sort`: Sort the input table before grouping. Default is `true`. Pre-sort as desired and set to `false` when you want to maintain a specific group order or are using non-sortable objects as group keys. +## Deprecated keywords + + - `show_overall`: Use `show_total` instead + All other keywords are forwarded to the `Table` constructor, refer to its docstring for details. """ @@ -239,8 +245,10 @@ function table_one( table, analyses; groupby = [], - show_overall = true, - group_overalls = Symbol[], + show_total = true, + show_overall = nothing, # deprecated in version 3 + group_totals = Symbol[], + total_name = "Total", show_pvalues = false, show_tests = true, show_confints = false, @@ -259,7 +267,11 @@ function table_one( groups = make_groups(groupby) n_groups = length(groups) - show_overall || n_groups > 0 || error("Overall can't be false if there are no groups.") + if show_overall !== nothing + @warn """`show_overall` has been deprecated, use `show_total` instead. You can change the identifier back from "Total" to "Overall" using the `total_name` keyword argument""" + show_total = show_overall + end + show_total || n_groups > 0 || error("`show_total` can't be false if there are no groups.") _analyses = make_analyses(analyses, df) @@ -280,16 +292,16 @@ function table_one( groupsymbols = [g.symbol for g in groups] - _group_overalls(a::AbstractVector{Symbol}) = collect(a) - _group_overalls(s::Symbol) = [s] - group_overalls = _group_overalls(group_overalls) - if !isempty(groupsymbols) && first(groupsymbols) in group_overalls - throw(ArgumentError("Cannot show overall values for topmost group $(repr(first(groupsymbols))) as it would be equivalent to the `show_overall` option. Grouping is $groupsymbols")) + _group_totals(a::AbstractVector{Symbol}) = collect(a) + _group_totals(s::Symbol) = [s] + group_totals = _group_totals(group_totals) + if !isempty(groupsymbols) && first(groupsymbols) in group_totals + throw(ArgumentError("Cannot show totals for topmost group $(repr(first(groupsymbols))) as it would be equivalent to the `show_total` option. Grouping is $groupsymbols")) end - other_syms = setdiff(group_overalls, groupsymbols) + other_syms = setdiff(group_totals, groupsymbols) if !isempty(other_syms) - throw(ArgumentError("Invalid group symbols in `group_overalls`: $other_syms. Grouping is $groupsymbols")) + throw(ArgumentError("Invalid group symbols in `group_totals`: $other_syms. Grouping is $groupsymbols")) end if sort && !isempty(groupsymbols) @@ -313,16 +325,16 @@ function table_one( funcvector = [a.variable => a.func for a in _analyses] df_analyses = DataFrames.combine(gdf, funcvector; ungroup = false) - if show_overall - df_overall = DataFrames.combine(df, funcvector) + if show_total + df_total = DataFrames.combine(df, funcvector) end - group_overall_indices = Base.sort(map(sym -> findfirst(==(sym), groupsymbols), group_overalls)) + group_total_indices = Base.sort(map(sym -> findfirst(==(sym), groupsymbols), group_totals)) - dfs_group_overall = map(group_overall_indices) do i + dfs_group_total = map(group_total_indices) do i DataFrames.groupby(df, groupsymbols[1:i-1], sort = false) end - gdfs_group_overall = map(dfs_group_overall) do _gdf + gdfs_group_total = map(dfs_group_total) do _gdf return DataFrames.combine(_gdf, funcvector, ungroup = false) end @@ -352,26 +364,26 @@ function table_one( end push!(columns, ana_title_col) - if show_overall - overall_col = Cell[] + if show_total + total_col = Cell[] for _ in 1:max(0, 2 * n_groups - 1) - push!(overall_col, Cell(nothing)) + push!(total_col, Cell(nothing)) end title = if show_n - Multiline("Overall", "(n=$(nrow(df)))") + Multiline(total_name, "(n=$(nrow(df)))") else - "Overall" + total_name end - push!(overall_col, Cell(title, tableone_column_header())) + push!(total_col, Cell(title, tableone_column_header())) - for col in eachcol(df_overall) - push!(overall_col, Cell(nothing)) + for col in eachcol(df_total) + push!(total_col, Cell(nothing)) for result in only(col) - push!(overall_col, Cell(result[1])) + push!(total_col, Cell(result[1])) end end - push!(columns, overall_col) + push!(columns, total_col) end # value => index dictionaries for each grouping level @@ -415,43 +427,43 @@ function table_one( push!(columns, data_col) # go from smallest to largest group if there are multiple at this border - for ii in length(group_overall_indices):-1:1 - i_overall_group = group_overall_indices[ii] - i_parent_group = i_overall_group - 1 + for ii in length(group_total_indices):-1:1 + i_total_group = group_total_indices[ii] + i_parent_group = i_total_group - 1 next_key = length(df_analyses) == ikey ? nothing : keys(df_analyses)[ikey+1] if next_key === nothing || key[i_parent_group] != next_key[i_parent_group] || ikey == length(df_analyses) - group_overall_col = Cell[] + group_total_col = Cell[] - for i in 1:i_overall_group + for i in 1:i_total_group # we assign merge groups according to the value in the parent group, # this way cells can never merge across their parent groups mergegroup = i == 1 ? 0 : mergegroups[i-1][key[i-1]] - push!(group_overall_col, Cell(groups[i].name, tableone_column_header_spanned(); merge = true, mergegroup)) - i < i_overall_group && push!(group_overall_col, Cell(group_key_title(i), tableone_column_header_key(); merge = true, mergegroup)) + push!(group_total_col, Cell(groups[i].name, tableone_column_header_spanned(); merge = true, mergegroup)) + i < i_total_group && push!(group_total_col, Cell(group_key_title(i), tableone_column_header_key(); merge = true, mergegroup)) end - agg_key = Tuple(key)[1:i_overall_group-1] + agg_key = Tuple(key)[1:i_total_group-1] title = if show_n - Multiline("Overall", "(n=$(nrow(dfs_group_overall[ii][agg_key])))") + Multiline(total_name, "(n=$(nrow(dfs_group_total[ii][agg_key])))") else - "Overall" + total_name end - push!(group_overall_col, Cell(title)) + push!(group_total_col, Cell(title)) - for _ in 1:(2 * (n_groups-i_overall_group)) - push!(group_overall_col, Cell(nothing)) + for _ in 1:(2 * (n_groups-i_total_group)) + push!(group_total_col, Cell(nothing)) end - gdf_group_overall = gdfs_group_overall[ii] - _gdf = gdf_group_overall[agg_key] - for icol in i_overall_group:ncol(_gdf) - push!(group_overall_col, Cell(nothing)) + gdf_group_total = gdfs_group_total[ii] + _gdf = gdf_group_total[agg_key] + for icol in i_total_group:ncol(_gdf) + push!(group_total_col, Cell(nothing)) for result in _gdf[1, icol] - push!(group_overall_col, Cell(result[1])) + push!(group_total_col, Cell(result[1])) end end - push!(columns, group_overall_col) + push!(columns, group_total_col) end end end diff --git a/test/references/table_one/all_missing_group.docx.txt b/test/references/table_one/all_missing_group.docx.txt index 84ca9fe..0d6056d 100644 --- a/test/references/table_one/all_missing_group.docx.txt +++ b/test/references/table_one/all_missing_group.docx.txt @@ -276,7 +276,7 @@ - Overall + Total diff --git a/test/references/table_one/all_missing_group.latex.txt b/test/references/table_one/all_missing_group.latex.txt index e95eb36..6f20de5 100644 --- a/test/references/table_one/all_missing_group.latex.txt +++ b/test/references/table_one/all_missing_group.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{2}{c}{\textbf{group}} \\ \cmidrule{3-4} - & \textbf{Overall} & 1 & 2 \\ + & \textbf{Total} & 1 & 2 \\ \midrule \textbf{empty} & & & \\ \hspace{12.0pt}Mean (SD) & 2 (1) & NC & 2 (1) \\ diff --git a/test/references/table_one/all_missing_group.txt b/test/references/table_one/all_missing_group.txt index 61acbe6..3692735 100644 --- a/test/references/table_one/all_missing_group.txt +++ b/test/references/table_one/all_missing_group.txt @@ -1,6 +1,6 @@ - +
@@ -36,7 +36,7 @@ - + diff --git a/test/references/table_one/all_missing_group.typ.txt b/test/references/table_one/all_missing_group.typ.txt index e85d26a..91cc64a 100644 --- a/test/references/table_one/all_missing_group.typ.txt +++ b/test/references/table_one/all_missing_group.typ.txt @@ -11,7 +11,7 @@ table.cell(colspan: 2)[*group*], table.hline(y: 1, start: 2, end: 4, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [1], [2], table.hline(y: 2, stroke: 0.75pt), diff --git a/test/references/table_one/category_with_missing.docx.txt b/test/references/table_one/category_with_missing.docx.txt index 1e34e9d..459f11b 100644 --- a/test/references/table_one/category_with_missing.docx.txt +++ b/test/references/table_one/category_with_missing.docx.txt @@ -276,7 +276,7 @@ - Overall + Total diff --git a/test/references/table_one/category_with_missing.latex.txt b/test/references/table_one/category_with_missing.latex.txt index b5dd920..21a7c8d 100644 --- a/test/references/table_one/category_with_missing.latex.txt +++ b/test/references/table_one/category_with_missing.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{2}{c}{\textbf{group}} \\ \cmidrule{3-4} - & \textbf{Overall} & 1 & 2 \\ + & \textbf{Total} & 1 & 2 \\ \midrule \textbf{category} & & & \\ \hspace{12.0pt}a & 1 (12.5\%) & 1 (25\%) & 0 (0\%) \\ diff --git a/test/references/table_one/category_with_missing.txt b/test/references/table_one/category_with_missing.txt index fdb7698..3f9fcab 100644 --- a/test/references/table_one/category_with_missing.txt +++ b/test/references/table_one/category_with_missing.txt @@ -1,6 +1,6 @@ -
OverallTotal 1 2
+
@@ -36,7 +36,7 @@ - + diff --git a/test/references/table_one/category_with_missing.typ.txt b/test/references/table_one/category_with_missing.typ.txt index 8d0aeaf..b0589a1 100644 --- a/test/references/table_one/category_with_missing.typ.txt +++ b/test/references/table_one/category_with_missing.typ.txt @@ -11,7 +11,7 @@ table.cell(colspan: 2)[*group*], table.hline(y: 1, start: 2, end: 4, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [1], [2], table.hline(y: 2, stroke: 0.75pt), diff --git a/test/references/table_one/group_totals_three_groups_one_total_level_three.docx.txt b/test/references/table_one/group_totals_three_groups_one_total_level_three.docx.txt new file mode 100644 index 0000000..9e78921 --- /dev/null +++ b/test/references/table_one/group_totals_three_groups_one_total_level_three.docx.txt @@ -0,0 +1,3296 @@ +############################## [Content_Types].xml ############################## + + + + + + + + + +############################## _rels/.rels ############################## + + + + +############################## word/_rels/document.xml.rels ############################## + + + + +############################## word/styles.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +############################## word/document.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + (n=4) + + + + + + + + + + + + + + + + b + + + + + + + + (n=4) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + e + + + + + + + + (n=2) + + + + + + + + + + + + + + + + f + + + + + + + + (n=2) + + + + + + + + + + + + + + + + e + + + + + + + + (n=2) + + + + + + + + + + + + + + + + f + + + + + + + + (n=2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total + + + + + + + + + + (n=8) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + Total + + + + + + + + (n=2) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + Total + + + + + + + + (n=2) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + Total + + + + + + + + (n=2) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + Total + + + + + + + + (n=2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mean (SD) + + + + + + + + + + + + + + + 4.5 + + + + ( + + + + 2.45 + + + + ) + + + + + + + + + + + + + + + 1 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 3 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 2 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 4 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 3 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 5 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 7 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 6 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 6 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 8 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 7 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + + + + + + Median [Min, Max] + + + + + + + + + + + + + + + 4.5 + + + + [ + + + + 1 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 1 + + + + [ + + + + 1 + + + + , + + + + 1 + + + + ] + + + + + + + + + + + + + + + 3 + + + + [ + + + + 3 + + + + , + + + + 3 + + + + ] + + + + + + + + + + + + + + + 2 + + + + [ + + + + 1 + + + + , + + + + 3 + + + + ] + + + + + + + + + + + + + + + 2 + + + + [ + + + + 2 + + + + , + + + + 2 + + + + ] + + + + + + + + + + + + + + + 4 + + + + [ + + + + 4 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 3 + + + + [ + + + + 2 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 5 + + + + [ + + + + 5 + + + + , + + + + 5 + + + + ] + + + + + + + + + + + + + + + 7 + + + + [ + + + + 7 + + + + , + + + + 7 + + + + ] + + + + + + + + + + + + + + + 6 + + + + [ + + + + 5 + + + + , + + + + 7 + + + + ] + + + + + + + + + + + + + + + 6 + + + + [ + + + + 6 + + + + , + + + + 6 + + + + ] + + + + + + + + + + + + + + + 8 + + + + [ + + + + 8 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 7 + + + + [ + + + + 6 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + + + + + + value2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + + + + + + b + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + + + + + + c + + + + + + + + + + + + + + + 2 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.latex.txt b/test/references/table_one/group_totals_three_groups_one_total_level_three.latex.txt similarity index 75% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_three.latex.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_three.latex.txt index 0f57d75..3a968c2 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.latex.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_three.latex.txt @@ -17,7 +17,7 @@ & & \multicolumn{3}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{3}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} & \multicolumn{3}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{3}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} \\ & & \multicolumn{3}{c}{\textbf{group3}} & \multicolumn{3}{c}{\textbf{group3}} & \multicolumn{3}{c}{\textbf{group3}} & \multicolumn{3}{c}{\textbf{group3}} \\ \cmidrule{3-5}\cmidrule{6-8}\cmidrule{9-11}\cmidrule{12-14} - & \textbf{\begin{tabular}{@{}c@{}}Overall \\ (n=8)\end{tabular}} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Overall \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Overall \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Overall \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Overall \\ (n=2)\end{tabular} \\ + & \textbf{\begin{tabular}{@{}c@{}}Total \\ (n=8)\end{tabular}} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Total \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Total \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Total \\ (n=2)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}Total \\ (n=2)\end{tabular} \\ \midrule \textbf{value1} & & & & & & & & & & & & & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 1 (NaN) & 3 (NaN) & 2 (1.41) & 2 (NaN) & 4 (NaN) & 3 (1.41) & 5 (NaN) & 7 (NaN) & 6 (1.41) & 6 (NaN) & 8 (NaN) & 7 (1.41) \\ diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.txt b/test/references/table_one/group_totals_three_groups_one_total_level_three.txt similarity index 94% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_three.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_three.txt index 00d7d69..083545b 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_three.txt @@ -1,6 +1,6 @@ -
OverallTotal 1 2
+
@@ -64,19 +64,19 @@ - + - + - + - + - + diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.typ.txt b/test/references/table_one/group_totals_three_groups_one_total_level_three.typ.txt similarity index 94% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_three.typ.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_three.typ.txt index aed103a..a91596d 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_three.typ.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_three.typ.txt @@ -37,19 +37,19 @@ table.cell(colspan: 3)[*group3*], table.hline(y: 5, start: 11, end: 14, stroke: 0.75pt), [], - [*Overall #linebreak() (n=8)*], + [*Total #linebreak() (n=8)*], [c #linebreak() (n=1)], [d #linebreak() (n=1)], - [Overall #linebreak() (n=2)], + [Total #linebreak() (n=2)], [c #linebreak() (n=1)], [d #linebreak() (n=1)], - [Overall #linebreak() (n=2)], + [Total #linebreak() (n=2)], [c #linebreak() (n=1)], [d #linebreak() (n=1)], - [Overall #linebreak() (n=2)], + [Total #linebreak() (n=2)], [c #linebreak() (n=1)], [d #linebreak() (n=1)], - [Overall #linebreak() (n=2)], + [Total #linebreak() (n=2)], table.hline(y: 6, stroke: 0.75pt), [*value1*], [], diff --git a/test/references/table_one/group_totals_three_groups_one_total_level_two.docx.txt b/test/references/table_one/group_totals_three_groups_one_total_level_two.docx.txt new file mode 100644 index 0000000..48455cd --- /dev/null +++ b/test/references/table_one/group_totals_three_groups_one_total_level_two.docx.txt @@ -0,0 +1,2964 @@ +############################## [Content_Types].xml ############################## + + + + + + + + + +############################## _rels/.rels ############################## + + + + +############################## word/_rels/document.xml.rels ############################## + + + + +############################## word/styles.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +############################## word/document.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + (n=4) + + + + + + + + + + + + + + + + b + + + + + + + + (n=4) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + e + + + + + + + + (n=2) + + + + + + + + + + + + + + + + f + + + + + + + + (n=2) + + + + + + + + + + + + + + + Total + + + + + + + + (n=4) + + + + + + + + + + + + + + + + e + + + + + + + + (n=2) + + + + + + + + + + + + + + + + f + + + + + + + + (n=2) + + + + + + + + + + + + + + + Total + + + + + + + + (n=4) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + group3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total + + + + + + + + + + (n=8) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + c + + + + + + + + (n=1) + + + + + + + + + + + + + + + d + + + + + + + + (n=1) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mean (SD) + + + + + + + + + + + + + + + 4.5 + + + + ( + + + + 2.45 + + + + ) + + + + + + + + + + + + + + + 1 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 3 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 2 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 4 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 2.5 + + + + ( + + + + 1.29 + + + + ) + + + + + + + + + + + + + + + 5 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 7 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 6 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 8 + + + + ( + + + + NaN + + + + ) + + + + + + + + + + + + + + + 6.5 + + + + ( + + + + 1.29 + + + + ) + + + + + + + + + + + + + + + + + + + + Median [Min, Max] + + + + + + + + + + + + + + + 4.5 + + + + [ + + + + 1 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 1 + + + + [ + + + + 1 + + + + , + + + + 1 + + + + ] + + + + + + + + + + + + + + + 3 + + + + [ + + + + 3 + + + + , + + + + 3 + + + + ] + + + + + + + + + + + + + + + 2 + + + + [ + + + + 2 + + + + , + + + + 2 + + + + ] + + + + + + + + + + + + + + + 4 + + + + [ + + + + 4 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 2.5 + + + + [ + + + + 1 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 5 + + + + [ + + + + 5 + + + + , + + + + 5 + + + + ] + + + + + + + + + + + + + + + 7 + + + + [ + + + + 7 + + + + , + + + + 7 + + + + ] + + + + + + + + + + + + + + + 6 + + + + [ + + + + 6 + + + + , + + + + 6 + + + + ] + + + + + + + + + + + + + + + 8 + + + + [ + + + + 8 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 6.5 + + + + [ + + + + 5 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + + + + + + value2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + + + + + + b + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + + + + + + c + + + + + + + + + + + + + + + 2 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 100 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.latex.txt b/test/references/table_one/group_totals_three_groups_one_total_level_two.latex.txt similarity index 71% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_two.latex.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_two.latex.txt index 9768e12..c15cdce 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.latex.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_two.latex.txt @@ -14,10 +14,10 @@ & & \multicolumn{5}{c}{\begin{tabular}{@{}c@{}}a \\ (n=4)\end{tabular}} & \multicolumn{5}{c}{\begin{tabular}{@{}c@{}}b \\ (n=4)\end{tabular}} \\ & & \multicolumn{5}{c}{\textbf{group2}} & \multicolumn{5}{c}{\textbf{group2}} \\ \cmidrule{3-7}\cmidrule{8-12} - & & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} & \begin{tabular}{@{}c@{}}Overall \\ (n=4)\end{tabular} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} & \begin{tabular}{@{}c@{}}Overall \\ (n=4)\end{tabular} \\ + & & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} & \begin{tabular}{@{}c@{}}Total \\ (n=4)\end{tabular} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}e \\ (n=2)\end{tabular}} & \multicolumn{2}{c}{\begin{tabular}{@{}c@{}}f \\ (n=2)\end{tabular}} & \begin{tabular}{@{}c@{}}Total \\ (n=4)\end{tabular} \\ & & \multicolumn{2}{c}{\textbf{group3}} & \multicolumn{2}{c}{\textbf{group3}} & & \multicolumn{2}{c}{\textbf{group3}} & \multicolumn{2}{c}{\textbf{group3}} & \\ \cmidrule{3-4}\cmidrule{5-6}\cmidrule{8-9}\cmidrule{10-11} - & \textbf{\begin{tabular}{@{}c@{}}Overall \\ (n=8)\end{tabular}} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \\ + & \textbf{\begin{tabular}{@{}c@{}}Total \\ (n=8)\end{tabular}} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}c \\ (n=1)\end{tabular} & \begin{tabular}{@{}c@{}}d \\ (n=1)\end{tabular} & \\ \midrule \textbf{value1} & & & & & & & & & & & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 1 (NaN) & 3 (NaN) & 2 (NaN) & 4 (NaN) & 2.5 (1.29) & 5 (NaN) & 7 (NaN) & 6 (NaN) & 8 (NaN) & 6.5 (1.29) \\ diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.txt b/test/references/table_one/group_totals_three_groups_one_total_level_two.txt similarity index 95% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_two.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_two.txt index 3df8dbf..7df21ab 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_two.txt @@ -1,6 +1,6 @@ -
Overall
(n=8)
Total
(n=8)
c
(n=1)
d
(n=1)
Overall
(n=2)
Total
(n=2)
c
(n=1)
d
(n=1)
Overall
(n=2)
Total
(n=2)
c
(n=1)
d
(n=1)
Overall
(n=2)
Total
(n=2)
c
(n=1)
d
(n=1)
Overall
(n=2)
Total
(n=2)
value1
+
@@ -51,10 +51,10 @@ - + - + @@ -68,7 +68,7 @@ - + diff --git a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.typ.txt b/test/references/table_one/group_totals_three_groups_one_total_level_two.typ.txt similarity index 96% rename from test/references/table_one/group_overalls_three_groups_one_overall_level_two.typ.txt rename to test/references/table_one/group_totals_three_groups_one_total_level_two.typ.txt index 7c7c26c..33225f0 100644 --- a/test/references/table_one/group_overalls_three_groups_one_overall_level_two.typ.txt +++ b/test/references/table_one/group_totals_three_groups_one_total_level_two.typ.txt @@ -24,10 +24,10 @@ [], table.cell(colspan: 2)[e #linebreak() (n=2)], table.cell(colspan: 2)[f #linebreak() (n=2)], - [Overall #linebreak() (n=4)], + [Total #linebreak() (n=4)], table.cell(colspan: 2)[e #linebreak() (n=2)], table.cell(colspan: 2)[f #linebreak() (n=2)], - [Overall #linebreak() (n=4)], + [Total #linebreak() (n=4)], [], [], table.cell(colspan: 2)[*group3*], @@ -41,7 +41,7 @@ table.hline(y: 5, start: 9, end: 11, stroke: 0.75pt), [], [], - [*Overall #linebreak() (n=8)*], + [*Total #linebreak() (n=8)*], [c #linebreak() (n=1)], [d #linebreak() (n=1)], [c #linebreak() (n=1)], diff --git a/test/references/table_one/group_totals_two_groups_one_total.docx.txt b/test/references/table_one/group_totals_two_groups_one_total.docx.txt new file mode 100644 index 0000000..23a9bf0 --- /dev/null +++ b/test/references/table_one/group_totals_two_groups_one_total.docx.txt @@ -0,0 +1,1844 @@ +############################## [Content_Types].xml ############################## + + + + + + + + + +############################## _rels/.rels ############################## + + + + +############################## word/_rels/document.xml.rels ############################## + + + + +############################## word/styles.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +############################## word/document.xml ############################## + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + + + + + + + + + b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + group2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total + + + + + + + + + + + + + + + e + + + + + + + + + + + + + + + f + + + + + + + + + + + + + + + Total + + + + + + + + + + + + + + + e + + + + + + + + + + + + + + + f + + + + + + + + + + + + + + + Total + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mean (SD) + + + + + + + + + + + + + + + 4.5 + + + + ( + + + + 2.45 + + + + ) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 3 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 2.5 + + + + ( + + + + 1.29 + + + + ) + + + + + + + + + + + + + + + 6 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 7 + + + + ( + + + + 1.41 + + + + ) + + + + + + + + + + + + + + + 6.5 + + + + ( + + + + 1.29 + + + + ) + + + + + + + + + + + + + + + + + + + + Median [Min, Max] + + + + + + + + + + + + + + + 4.5 + + + + [ + + + + 1 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 2 + + + + [ + + + + 1 + + + + , + + + + 3 + + + + ] + + + + + + + + + + + + + + + 3 + + + + [ + + + + 2 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 2.5 + + + + [ + + + + 1 + + + + , + + + + 4 + + + + ] + + + + + + + + + + + + + + + 6 + + + + [ + + + + 5 + + + + , + + + + 7 + + + + ] + + + + + + + + + + + + + + + 7 + + + + [ + + + + 6 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + 6.5 + + + + [ + + + + 5 + + + + , + + + + 8 + + + + ] + + + + + + + + + + + + + + + + + + + + value2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + + + + + + b + + + + + + + + + + + + + + + 3 + + + + ( + + + + 37.5 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 2 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + + + + + + c + + + + + + + + + + + + + + + 2 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + 0 + + + + ( + + + + 0 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 50 + + + + %) + + + + + + + + + + + + + + + 1 + + + + ( + + + + 25 + + + + %) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/references/table_one/group_overalls_two_groups_one_overall.latex.txt b/test/references/table_one/group_totals_two_groups_one_total.latex.txt similarity index 95% rename from test/references/table_one/group_overalls_two_groups_one_overall.latex.txt rename to test/references/table_one/group_totals_two_groups_one_total.latex.txt index 1e90de3..7a28527 100644 --- a/test/references/table_one/group_overalls_two_groups_one_overall.latex.txt +++ b/test/references/table_one/group_totals_two_groups_one_total.latex.txt @@ -14,7 +14,7 @@ & & \multicolumn{3}{c}{a} & \multicolumn{3}{c}{b} \\ & & \multicolumn{3}{c}{\textbf{group2}} & \multicolumn{3}{c}{\textbf{group2}} \\ \cmidrule{3-5}\cmidrule{6-8} - & \textbf{Overall} & e & f & Overall & e & f & Overall \\ + & \textbf{Total} & e & f & Total & e & f & Total \\ \midrule \textbf{value1} & & & & & & & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 2 (1.41) & 3 (1.41) & 2.5 (1.29) & 6 (1.41) & 7 (1.41) & 6.5 (1.29) \\ diff --git a/test/references/table_one/group_overalls_two_groups_one_overall.txt b/test/references/table_one/group_totals_two_groups_one_total.txt similarity index 93% rename from test/references/table_one/group_overalls_two_groups_one_overall.txt rename to test/references/table_one/group_totals_two_groups_one_total.txt index 6d267e2..769625b 100644 --- a/test/references/table_one/group_overalls_two_groups_one_overall.txt +++ b/test/references/table_one/group_totals_two_groups_one_total.txt @@ -1,6 +1,6 @@ -
e
(n=2)
f
(n=2)
Overall
(n=4)
Total
(n=4)
e
(n=2)
f
(n=2)
Overall
(n=4)
Total
(n=4)
Overall
(n=8)
Total
(n=8)
c
(n=1)
d
(n=1)
c
(n=1)
+
@@ -48,13 +48,13 @@ - + - + - + diff --git a/test/references/table_one/group_overalls_two_groups_one_overall.typ.txt b/test/references/table_one/group_totals_two_groups_one_total.typ.txt similarity index 97% rename from test/references/table_one/group_overalls_two_groups_one_overall.typ.txt rename to test/references/table_one/group_totals_two_groups_one_total.typ.txt index 7e1ae89..b05c871 100644 --- a/test/references/table_one/group_overalls_two_groups_one_overall.typ.txt +++ b/test/references/table_one/group_totals_two_groups_one_total.typ.txt @@ -21,13 +21,13 @@ table.cell(colspan: 3)[*group2*], table.hline(y: 3, start: 5, end: 8, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [e], [f], - [Overall], + [Total], [e], [f], - [Overall], + [Total], table.hline(y: 4, stroke: 0.75pt), [*value1*], [], diff --git a/test/references/table_one/natural_sort_order.docx.txt b/test/references/table_one/natural_sort_order.docx.txt index df1e579..18bafd5 100644 --- a/test/references/table_one/natural_sort_order.docx.txt +++ b/test/references/table_one/natural_sort_order.docx.txt @@ -276,7 +276,7 @@ - Overall + Total diff --git a/test/references/table_one/natural_sort_order.latex.txt b/test/references/table_one/natural_sort_order.latex.txt index 1154d1e..22ec551 100644 --- a/test/references/table_one/natural_sort_order.latex.txt +++ b/test/references/table_one/natural_sort_order.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{4}{c}{\textbf{dose}} \\ \cmidrule{3-6} - & \textbf{Overall} & 1 mg & 5 mg & 10 mg & 50 mg \\ + & \textbf{Total} & 1 mg & 5 mg & 10 mg & 50 mg \\ \midrule \textbf{value} & & & & & \\ \hspace{12.0pt}Mean (SD) & 3 (1.41) & 2.67 (2.08) & 2.67 (1.53) & 4.33 (0.577) & 2.33 (0.577) \\ diff --git a/test/references/table_one/natural_sort_order.txt b/test/references/table_one/natural_sort_order.txt index b1d51ff..7c8e0c6 100644 --- a/test/references/table_one/natural_sort_order.txt +++ b/test/references/table_one/natural_sort_order.txt @@ -1,6 +1,6 @@ -
OverallTotal e fOverallTotal e fOverallTotal
value1
+
@@ -36,7 +36,7 @@ - + diff --git a/test/references/table_one/natural_sort_order.typ.txt b/test/references/table_one/natural_sort_order.typ.txt index 62e10ad..e9dfe66 100644 --- a/test/references/table_one/natural_sort_order.typ.txt +++ b/test/references/table_one/natural_sort_order.typ.txt @@ -11,7 +11,7 @@ table.cell(colspan: 4)[*dose*], table.hline(y: 1, start: 2, end: 6, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [1 mg], [5 mg], [10 mg], diff --git a/test/references/table_one/nested_spans_bad_sort.docx.txt b/test/references/table_one/nested_spans_bad_sort.docx.txt index 0580174..1caa63e 100644 --- a/test/references/table_one/nested_spans_bad_sort.docx.txt +++ b/test/references/table_one/nested_spans_bad_sort.docx.txt @@ -449,7 +449,7 @@ - Overall + Total diff --git a/test/references/table_one/nested_spans_bad_sort.latex.txt b/test/references/table_one/nested_spans_bad_sort.latex.txt index 8cc28ad..3565ac8 100644 --- a/test/references/table_one/nested_spans_bad_sort.latex.txt +++ b/test/references/table_one/nested_spans_bad_sort.latex.txt @@ -14,7 +14,7 @@ & & A & \multicolumn{2}{c}{B} & A \\ & & \textbf{z} & \multicolumn{2}{c}{\textbf{z}} & \textbf{z} \\ \cmidrule{3-3}\cmidrule{4-5}\cmidrule{6-6} - & \textbf{Overall} & C & C & D & D \\ + & \textbf{Total} & C & C & D & D \\ \midrule \textbf{x} & & & & & \\ \hspace{12.0pt}Mean (SD) & 3.5 (1.87) & 1.5 (0.707) & 3 (NaN) & 4.5 (0.707) & 6 (NaN) \\ diff --git a/test/references/table_one/nested_spans_bad_sort.txt b/test/references/table_one/nested_spans_bad_sort.txt index 0131661..e219dc2 100644 --- a/test/references/table_one/nested_spans_bad_sort.txt +++ b/test/references/table_one/nested_spans_bad_sort.txt @@ -1,6 +1,6 @@ -
OverallTotal 1 mg 5 mg 10 mg
+
@@ -50,7 +50,7 @@ - + diff --git a/test/references/table_one/nested_spans_bad_sort.typ.txt b/test/references/table_one/nested_spans_bad_sort.typ.txt index fc27feb..e99a538 100644 --- a/test/references/table_one/nested_spans_bad_sort.typ.txt +++ b/test/references/table_one/nested_spans_bad_sort.typ.txt @@ -24,7 +24,7 @@ [*z*], table.hline(y: 3, start: 5, end: 6, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [C], [C], [D], diff --git a/test/references/table_one/one_row.docx.txt b/test/references/table_one/one_row.docx.txt index f4dec3f..fb69334 100644 --- a/test/references/table_one/one_row.docx.txt +++ b/test/references/table_one/one_row.docx.txt @@ -224,7 +224,7 @@ - Overall + Total diff --git a/test/references/table_one/one_row.latex.txt b/test/references/table_one/one_row.latex.txt index 0ba99a2..e68bda1 100644 --- a/test/references/table_one/one_row.latex.txt +++ b/test/references/table_one/one_row.latex.txt @@ -9,7 +9,7 @@ \begin{threeparttable} \begin{tabular}{@{\extracolsep{2ex}}*{2}{lc}} \toprule - & \textbf{Overall} \\ + & \textbf{Total} \\ \midrule \textbf{value1} & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) \\ diff --git a/test/references/table_one/one_row.txt b/test/references/table_one/one_row.txt index 4ee0cc9..70d6a57 100644 --- a/test/references/table_one/one_row.txt +++ b/test/references/table_one/one_row.txt @@ -1,6 +1,6 @@ -
OverallTotal C C D
+
- + diff --git a/test/references/table_one/one_row.typ.txt b/test/references/table_one/one_row.typ.txt index 519a472..a93c4a8 100644 --- a/test/references/table_one/one_row.typ.txt +++ b/test/references/table_one/one_row.typ.txt @@ -7,7 +7,7 @@ stroke: none, table.hline(y: 0, stroke: 1pt), [], - [*Overall*], + [*Total*], table.hline(y: 1, stroke: 0.75pt), [*value1*], [], diff --git a/test/references/table_one/one_row_no_group.txt b/test/references/table_one/one_row_no_group.txt deleted file mode 100644 index 8bd687b..0000000 --- a/test/references/table_one/one_row_no_group.txt +++ /dev/null @@ -1,63 +0,0 @@ - -
OverallTotal
value1
Overall
value1
Mean (SD)4.5 (2.4)
Median [Min, Max]4.5 [1.0, 8.0]
\ No newline at end of file diff --git a/test/references/table_one/one_row_one_group_pvalues_tests_confints.docx.txt b/test/references/table_one/one_row_one_group_pvalues_tests_confints.docx.txt index 913f5be..58ad007 100644 --- a/test/references/table_one/one_row_one_group_pvalues_tests_confints.docx.txt +++ b/test/references/table_one/one_row_one_group_pvalues_tests_confints.docx.txt @@ -309,7 +309,7 @@ - Overall + Total diff --git a/test/references/table_one/one_row_one_group_pvalues_tests_confints.latex.txt b/test/references/table_one/one_row_one_group_pvalues_tests_confints.latex.txt index f04627b..b2320ea 100644 --- a/test/references/table_one/one_row_one_group_pvalues_tests_confints.latex.txt +++ b/test/references/table_one/one_row_one_group_pvalues_tests_confints.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{2}{c}{\textbf{group1}} & & & \\ \cmidrule{3-4} - & \textbf{Overall} & a & b & \textbf{P-Value} & \textbf{Test} & \textbf{CI} \\ + & \textbf{Total} & a & b & \textbf{P-Value} & \textbf{Test} & \textbf{CI} \\ \midrule \textbf{value1} & & & & 0.005 & UnequalVarianceTTest & (-6.234, -1.766) \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 2.5 (1.29) & 6.5 (1.29) & & & \\ diff --git a/test/references/table_one/one_row_one_group_pvalues_tests_confints.txt b/test/references/table_one/one_row_one_group_pvalues_tests_confints.txt index ac1cc80..7391994 100644 --- a/test/references/table_one/one_row_one_group_pvalues_tests_confints.txt +++ b/test/references/table_one/one_row_one_group_pvalues_tests_confints.txt @@ -1,6 +1,6 @@ - +
@@ -39,7 +39,7 @@ - + diff --git a/test/references/table_one/one_row_one_group_pvalues_tests_confints.typ.txt b/test/references/table_one/one_row_one_group_pvalues_tests_confints.typ.txt index facb1f0..ca86860 100644 --- a/test/references/table_one/one_row_one_group_pvalues_tests_confints.typ.txt +++ b/test/references/table_one/one_row_one_group_pvalues_tests_confints.typ.txt @@ -14,7 +14,7 @@ [], [], [], - [*Overall*], + [*Total*], [a], [b], [*P-Value*], diff --git a/test/references/table_one/one_row_renamed.docx.txt b/test/references/table_one/one_row_renamed.docx.txt index b0c8d53..31dea2e 100644 --- a/test/references/table_one/one_row_renamed.docx.txt +++ b/test/references/table_one/one_row_renamed.docx.txt @@ -224,7 +224,7 @@ - Overall + Total diff --git a/test/references/table_one/one_row_renamed.latex.txt b/test/references/table_one/one_row_renamed.latex.txt index c6391d3..4ccd58d 100644 --- a/test/references/table_one/one_row_renamed.latex.txt +++ b/test/references/table_one/one_row_renamed.latex.txt @@ -9,7 +9,7 @@ \begin{threeparttable} \begin{tabular}{@{\extracolsep{2ex}}*{2}{lc}} \toprule - & \textbf{Overall} \\ + & \textbf{Total} \\ \midrule \textbf{Value 1} & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) \\ diff --git a/test/references/table_one/one_row_renamed.txt b/test/references/table_one/one_row_renamed.txt index 3f58307..f605d75 100644 --- a/test/references/table_one/one_row_renamed.txt +++ b/test/references/table_one/one_row_renamed.txt @@ -1,6 +1,6 @@ -
OverallTotal a b P-Value
+
- + diff --git a/test/references/table_one/one_row_renamed.typ.txt b/test/references/table_one/one_row_renamed.typ.txt index e75145d..3572282 100644 --- a/test/references/table_one/one_row_renamed.typ.txt +++ b/test/references/table_one/one_row_renamed.typ.txt @@ -7,7 +7,7 @@ stroke: none, table.hline(y: 0, stroke: 1pt), [], - [*Overall*], + [*Total*], table.hline(y: 1, stroke: 0.75pt), [*Value 1*], [], diff --git a/test/references/table_one/one_row_two_groups_pvalues.docx.txt b/test/references/table_one/one_row_two_groups_pvalues.docx.txt index d78260a..e988e5c 100644 --- a/test/references/table_one/one_row_two_groups_pvalues.docx.txt +++ b/test/references/table_one/one_row_two_groups_pvalues.docx.txt @@ -478,7 +478,7 @@ - Overall + Total diff --git a/test/references/table_one/one_row_two_groups_pvalues.latex.txt b/test/references/table_one/one_row_two_groups_pvalues.latex.txt index 3e25f1b..029e489 100644 --- a/test/references/table_one/one_row_two_groups_pvalues.latex.txt +++ b/test/references/table_one/one_row_two_groups_pvalues.latex.txt @@ -14,7 +14,7 @@ & & \multicolumn{2}{c}{a} & \multicolumn{2}{c}{b} & & \\ & & \multicolumn{2}{c}{\textbf{group2}} & \multicolumn{2}{c}{\textbf{group2}} & & \\ \cmidrule{3-4}\cmidrule{5-6} - & \textbf{Overall} & e & f & e & f & \textbf{P-Value} & \textbf{Test} \\ + & \textbf{Total} & e & f & e & f & \textbf{P-Value} & \textbf{Test} \\ \midrule \textbf{value1} & & & & & & 0.063 & UnequalVarianceTTest \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 2 (1.41) & 3 (1.41) & 6 (1.41) & 7 (1.41) & & \\ diff --git a/test/references/table_one/one_row_two_groups_pvalues.txt b/test/references/table_one/one_row_two_groups_pvalues.txt index ce174b3..fa5f438 100644 --- a/test/references/table_one/one_row_two_groups_pvalues.txt +++ b/test/references/table_one/one_row_two_groups_pvalues.txt @@ -1,6 +1,6 @@ -
OverallTotal
Value 1
+
@@ -54,7 +54,7 @@ - + diff --git a/test/references/table_one/one_row_two_groups_pvalues.typ.txt b/test/references/table_one/one_row_two_groups_pvalues.typ.txt index a446737..5b5e620 100644 --- a/test/references/table_one/one_row_two_groups_pvalues.typ.txt +++ b/test/references/table_one/one_row_two_groups_pvalues.typ.txt @@ -27,7 +27,7 @@ [], [], [], - [*Overall*], + [*Total*], [e], [f], [e], diff --git a/test/references/table_one/sort_false.docx.txt b/test/references/table_one/sort_false.docx.txt index e471a75..7071475 100644 --- a/test/references/table_one/sort_false.docx.txt +++ b/test/references/table_one/sort_false.docx.txt @@ -276,7 +276,7 @@ - Overall + Total diff --git a/test/references/table_one/sort_false.latex.txt b/test/references/table_one/sort_false.latex.txt index 3f88dc1..3e707d8 100644 --- a/test/references/table_one/sort_false.latex.txt +++ b/test/references/table_one/sort_false.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{3}{c}{\textbf{parameters}} \\ \cmidrule{3-5} - & \textbf{Overall} & T\textsubscript{max} & C\textsuperscript{max} & \begin{tabular}{@{}c@{}}One Line \\ Another Line\end{tabular} \\ + & \textbf{Total} & T\textsubscript{max} & C\textsuperscript{max} & \begin{tabular}{@{}c@{}}One Line \\ Another Line\end{tabular} \\ \midrule \textbf{value} & & & & \\ \hspace{12.0pt}Mean (SD) & 6.5 (3.61) & 2.5 (1.29) & 6.5 (1.29) & 10.5 (1.29) \\ diff --git a/test/references/table_one/sort_false.txt b/test/references/table_one/sort_false.txt index 4f4c6f4..c53a4eb 100644 --- a/test/references/table_one/sort_false.txt +++ b/test/references/table_one/sort_false.txt @@ -1,6 +1,6 @@ -
OverallTotal e f e
+
@@ -36,7 +36,7 @@ - + diff --git a/test/references/table_one/sort_false.typ.txt b/test/references/table_one/sort_false.typ.txt index df8f083..5e5d9f3 100644 --- a/test/references/table_one/sort_false.typ.txt +++ b/test/references/table_one/sort_false.typ.txt @@ -11,7 +11,7 @@ table.cell(colspan: 3)[*parameters*], table.hline(y: 1, start: 2, end: 5, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [T#sub[max]], [C#super[max]], [One Line #linebreak() Another Line], diff --git a/test/references/table_one/two_rows.docx.txt b/test/references/table_one/two_rows.docx.txt index b880ec4..f653885 100644 --- a/test/references/table_one/two_rows.docx.txt +++ b/test/references/table_one/two_rows.docx.txt @@ -224,7 +224,7 @@ - Overall + Total diff --git a/test/references/table_one/two_rows.latex.txt b/test/references/table_one/two_rows.latex.txt index ec28d5d..0a99ed8 100644 --- a/test/references/table_one/two_rows.latex.txt +++ b/test/references/table_one/two_rows.latex.txt @@ -9,7 +9,7 @@ \begin{threeparttable} \begin{tabular}{@{\extracolsep{2ex}}*{2}{lc}} \toprule - & \textbf{Overall} \\ + & \textbf{Total} \\ \midrule \textbf{value1} & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) \\ diff --git a/test/references/table_one/two_rows.txt b/test/references/table_one/two_rows.txt index c9381dd..1e90e3e 100644 --- a/test/references/table_one/two_rows.txt +++ b/test/references/table_one/two_rows.txt @@ -1,6 +1,6 @@ -
OverallTotal Tmax Cmax One Line
Another Line
+
- + diff --git a/test/references/table_one/two_rows.typ.txt b/test/references/table_one/two_rows.typ.txt index 356245b..ce851ce 100644 --- a/test/references/table_one/two_rows.typ.txt +++ b/test/references/table_one/two_rows.typ.txt @@ -7,7 +7,7 @@ stroke: none, table.hline(y: 0, stroke: 1pt), [], - [*Overall*], + [*Total*], table.hline(y: 1, stroke: 0.75pt), [*value1*], [], diff --git a/test/references/table_one/two_rows_no_group.txt b/test/references/table_one/two_rows_no_group.txt deleted file mode 100644 index a812fb0..0000000 --- a/test/references/table_one/two_rows_no_group.txt +++ /dev/null @@ -1,63 +0,0 @@ - -
OverallTotal
value1
Overall
value1
Mean (SD)4.5 (2.4)
Median [Min, Max]4.5 [1.0, 8.0]
value2
a3 (37.5%)
b3 (37.5%)
c2 (25.0%)
\ No newline at end of file diff --git a/test/references/table_one/two_rows_one_group.docx.txt b/test/references/table_one/two_rows_one_group.docx.txt index 34feb08..78ad7a2 100644 --- a/test/references/table_one/two_rows_one_group.docx.txt +++ b/test/references/table_one/two_rows_one_group.docx.txt @@ -276,7 +276,7 @@ - Overall + Total diff --git a/test/references/table_one/two_rows_one_group.latex.txt b/test/references/table_one/two_rows_one_group.latex.txt index 2f3a821..0c12fe6 100644 --- a/test/references/table_one/two_rows_one_group.latex.txt +++ b/test/references/table_one/two_rows_one_group.latex.txt @@ -11,7 +11,7 @@ \toprule & & \multicolumn{2}{c}{\textbf{group1}} \\ \cmidrule{3-4} - & \textbf{Overall} & a & b \\ + & \textbf{Total} & a & b \\ \midrule \textbf{value1} & & & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 2.5 (1.29) & 6.5 (1.29) \\ diff --git a/test/references/table_one/two_rows_one_group.txt b/test/references/table_one/two_rows_one_group.txt index 26d621b..cbe5494 100644 --- a/test/references/table_one/two_rows_one_group.txt +++ b/test/references/table_one/two_rows_one_group.txt @@ -1,6 +1,6 @@ - +
@@ -36,7 +36,7 @@ - + diff --git a/test/references/table_one/two_rows_one_group.typ.txt b/test/references/table_one/two_rows_one_group.typ.txt index d6b2780..7f9f89b 100644 --- a/test/references/table_one/two_rows_one_group.typ.txt +++ b/test/references/table_one/two_rows_one_group.typ.txt @@ -11,7 +11,7 @@ table.cell(colspan: 2)[*group1*], table.hline(y: 1, start: 2, end: 4, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [a], [b], table.hline(y: 2, stroke: 0.75pt), diff --git a/test/references/table_one/two_rows_two_groups.docx.txt b/test/references/table_one/two_rows_two_groups.docx.txt index 50af206..8dd5ff0 100644 --- a/test/references/table_one/two_rows_two_groups.docx.txt +++ b/test/references/table_one/two_rows_two_groups.docx.txt @@ -412,7 +412,7 @@ - Overall + Total diff --git a/test/references/table_one/two_rows_two_groups.latex.txt b/test/references/table_one/two_rows_two_groups.latex.txt index b7368cb..d36b67e 100644 --- a/test/references/table_one/two_rows_two_groups.latex.txt +++ b/test/references/table_one/two_rows_two_groups.latex.txt @@ -14,7 +14,7 @@ & & \multicolumn{2}{c}{a} & \multicolumn{2}{c}{b} \\ & & \multicolumn{2}{c}{\textbf{group2}} & \multicolumn{2}{c}{\textbf{group2}} \\ \cmidrule{3-4}\cmidrule{5-6} - & \textbf{Overall} & e & f & e & f \\ + & \textbf{Total} & e & f & e & f \\ \midrule \textbf{value1} & & & & & \\ \hspace{12.0pt}Mean (SD) & 4.5 (2.45) & 2 (1.41) & 3 (1.41) & 6 (1.41) & 7 (1.41) \\ diff --git a/test/references/table_one/two_rows_two_groups.txt b/test/references/table_one/two_rows_two_groups.txt index 985baaa..5be8981 100644 --- a/test/references/table_one/two_rows_two_groups.txt +++ b/test/references/table_one/two_rows_two_groups.txt @@ -1,6 +1,6 @@ -
OverallTotal a b
+
@@ -48,7 +48,7 @@ - + diff --git a/test/references/table_one/two_rows_two_groups.typ.txt b/test/references/table_one/two_rows_two_groups.typ.txt index a3d3b2c..2f8ab8b 100644 --- a/test/references/table_one/two_rows_two_groups.typ.txt +++ b/test/references/table_one/two_rows_two_groups.typ.txt @@ -21,7 +21,7 @@ table.cell(colspan: 2)[*group2*], table.hline(y: 3, start: 4, end: 6, stroke: 0.75pt), [], - [*Overall*], + [*Total*], [e], [f], [e], diff --git a/test/references/table_one/vector_and_function_arguments.docx.txt b/test/references/table_one/vector_and_function_arguments.docx.txt index 89ea917..10cd019 100644 --- a/test/references/table_one/vector_and_function_arguments.docx.txt +++ b/test/references/table_one/vector_and_function_arguments.docx.txt @@ -224,7 +224,7 @@ - Overall + Total diff --git a/test/references/table_one/vector_and_function_arguments.latex.txt b/test/references/table_one/vector_and_function_arguments.latex.txt index 92aa182..7e3b5ac 100644 --- a/test/references/table_one/vector_and_function_arguments.latex.txt +++ b/test/references/table_one/vector_and_function_arguments.latex.txt @@ -9,7 +9,7 @@ \begin{threeparttable} \begin{tabular}{@{\extracolsep{2ex}}*{2}{lc}} \toprule - & \textbf{Overall} \\ + & \textbf{Total} \\ \midrule \textbf{value1} & \\ \hspace{12.0pt}mean & 4.5 \\ diff --git a/test/references/table_one/vector_and_function_arguments.txt b/test/references/table_one/vector_and_function_arguments.txt index 3919c3f..84bf0bb 100644 --- a/test/references/table_one/vector_and_function_arguments.txt +++ b/test/references/table_one/vector_and_function_arguments.txt @@ -1,6 +1,6 @@ -
OverallTotal e f e
+
- + diff --git a/test/references/table_one/vector_and_function_arguments.typ.txt b/test/references/table_one/vector_and_function_arguments.typ.txt index e0a342d..e8cf726 100644 --- a/test/references/table_one/vector_and_function_arguments.typ.txt +++ b/test/references/table_one/vector_and_function_arguments.typ.txt @@ -7,7 +7,7 @@ stroke: none, table.hline(y: 0, stroke: 1pt), [], - [*Overall*], + [*Total*], table.hline(y: 1, stroke: 0.75pt), [*value1*], [], diff --git a/test/runtests.jl b/test/runtests.jl index 7b010d5..8ea37a3 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -176,14 +176,14 @@ end t = table_one(df, [:value1], groupby = [:group1], show_pvalues = true, show_tests = true, show_confints = true) reftest(t, "references/table_one/one_row_one_group_pvalues_tests_confints") - t = table_one(df, [:value1, :value2], groupby = [:group1, :group2], group_overalls = [:group2]) - reftest(t, "references/table_one/group_overalls_two_groups_one_overall") + t = table_one(df, [:value1, :value2], groupby = [:group1, :group2], group_totals = [:group2]) + reftest(t, "references/table_one/group_totals_two_groups_one_total") - t = table_one(df, [:value1, :value2], groupby = [:group1, :group2, :group3], group_overalls = [:group3], show_n = true) - reftest(t, "references/table_one/group_overalls_three_groups_one_overall_level_three") + t = table_one(df, [:value1, :value2], groupby = [:group1, :group2, :group3], group_totals = [:group3], show_n = true) + reftest(t, "references/table_one/group_totals_three_groups_one_total_level_three") - t = table_one(df, [:value1, :value2], groupby = [:group1, :group2, :group3], group_overalls = :group2, show_n = true) - reftest(t, "references/table_one/group_overalls_three_groups_one_overall_level_two") + t = table_one(df, [:value1, :value2], groupby = [:group1, :group2, :group3], group_totals = :group2, show_n = true) + reftest(t, "references/table_one/group_totals_three_groups_one_total_level_two") function summarizer(col) m = mean(col)
OverallTotal
value1