diff --git a/DESCRIPTION b/DESCRIPTION index ea6cdf77..f668e40b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -9,7 +9,7 @@ Description: Functions for plotting eatModel output. License: GPL (>= 2) Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Suggests: covr, knitr, @@ -21,7 +21,7 @@ Depends: R (>= 2.10) LazyData: true Imports: - ggbrace, + ggbrace (>= 0.1.1), ggnewscale, ggpattern, ggplot2, @@ -32,6 +32,5 @@ Imports: patchwork, plyr, rlang -Remotes: NicolasH2/ggbrace VignetteBuilder: knitr URL: https://nickhaf.github.io/eatPlot/ diff --git a/R/plot_braces.R b/R/plot_braces.R index b1855ceb..3cf6cfeb 100644 --- a/R/plot_braces.R +++ b/R/plot_braces.R @@ -55,7 +55,7 @@ plot_braces <- function(dat, # Utils ------------------------------------------------------------------- draw_braces <- function(dat, plot_settings = plotsettings_lineplot()) { if (plot_settings$split_plot == TRUE) { - res <- ggbrace::geom_brace( + res <- ggbrace::stat_brace( data = unique(dat[, c("years_Trend", "year_axis", "brace_y")]), mapping = ggplot2::aes( x = .data$year_axis, @@ -64,12 +64,13 @@ draw_braces <- function(dat, plot_settings = plotsettings_lineplot()) { ), rotate = 180, linewidth = plot_settings$brace_line_width, - npoints = 200 + npoints = 200, + outside = FALSE ) } else { res <- lapply(unique(dat$years_Trend), function(x) { dat_year <- unique(dat[dat$years_Trend == x, c("year_start_axis", "year_end_axis", "upper_y", "lower_y", "mid")]) - ggbrace::geom_brace( + ggbrace::stat_brace( mapping = ggplot2::aes( x = c(dat_year$year_start_axis, dat_year$year_end_axis), y = c(dat_year$upper_y, dat_year$lower_y), @@ -77,7 +78,8 @@ draw_braces <- function(dat, plot_settings = plotsettings_lineplot()) { mid = unique(dat_year$mid), rotate = 180, linewidth = plot_settings$brace_line_width, - npoints = 200 + npoints = 200, + outside = FALSE ) }) } diff --git a/R/plot_lineplot.R b/R/plot_lineplot.R index ea49cc97..998110aa 100644 --- a/R/plot_lineplot.R +++ b/R/plot_lineplot.R @@ -163,7 +163,7 @@ plot_lineplot <- function(plot_dat, widths_setting <- 1 / plot_settings$n_cols } - # The wholeGroup plot gets a box drawn around it. + ## The wholeGroup plot gets a box drawn around it. for (plot_names in names(plot_list)) { if (plot_names %in% seperate_plot_var_box) { plot_list[[plot_names]] <- plot_list[[plot_names]] + @@ -223,19 +223,20 @@ filter_plot_years <- function(plot_dat, years_lines = NULL, years_braces = NULL, } -plot_title <- function(title, title_raised_letter) { - if (!is.null(title_raised_letter)) { - names(title_raised_letter) <- sapply(names(title_raised_letter), sub_dash) - pos <- which(title == names(title_raised_letter)) +plot_title <- function(title, title_superscript) { + if (!is.null(title_superscript)) { + names(title_superscript) <- sapply(names(title_superscript), sub_dash) + pos <- which(title == names(title_superscript)) if (length(pos) == 0) { ggplot2::labs(title = title) } else { - superscript <- title_raised_letter[[pos]] + superscript <- title_superscript[[pos]] ggplot2::labs(title = bquote(.(title)^.(superscript))) } } else { ggplot2::labs(title = title) } + } diff --git a/R/plot_tablebar.R b/R/plot_tablebar.R index b024905d..83548ab9 100644 --- a/R/plot_tablebar.R +++ b/R/plot_tablebar.R @@ -197,7 +197,7 @@ plot_tablebar <- function(dat, dat$y_axis <- rev(as.integer(dat$y_axis)) dat$background_colour <- plot_settings$background_stripes_colour - if(length(plot_settings$bar_nudge_y) != 1 & length(plot_settings$bar_nudge_y) != nrow(dat)){ + if (length(plot_settings$bar_nudge_y) != 1 & length(plot_settings$bar_nudge_y) != nrow(dat)) { stop(paste0("Your plot_settings$bar_nudge_y argument has either to have the length 1, or has to be as long as your data. Currently, it has the length: ", length(plot_settings$bar_nudge_y), ". Your data has: ", nrow(dat), " rows."), call. = FALSE) } @@ -302,7 +302,6 @@ plot_tablebar <- function(dat, ) } - if (!is.null(bar_est)) { if (is.null(bar_sig)) { res_plot <- res_plot + @@ -330,10 +329,10 @@ plot_tablebar <- function(dat, dat <- fill_na(dat, column_name = i, filling = "FALSE") } - res_plot <- res_plot + ggnewscale::new_scale_fill() + - ggnewscale::new_scale_colour() + + ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) + + ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) + ggpattern::geom_rect_pattern( data = dat, ggplot2::aes( @@ -353,12 +352,6 @@ plot_tablebar <- function(dat, pattern_spacing = plot_settings$bar_pattern_spacing, pattern_key_scale_factor = 0.6 # legend adjustment ) + - ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) + - ggplot2::scale_colour_manual(values = plot_settings$bar_fill_colour) + - ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) + - ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) + - ggplot2::scale_colour_manual(values = plot_settings$bar_fill_colour) + - ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) + NULL } else if (plot_settings$bar_sig_type == "frame") { res_plot <- res_plot + @@ -384,7 +377,6 @@ plot_tablebar <- function(dat, } } - # Column spanners --------------------------------------------------------- plot_settings <- check_spanners_requirements(column_spanners, column_spanners_2, plot_settings) @@ -496,7 +488,6 @@ build_background_stripes <- function(dat, columns_table, plot_borders, plot_settings = plotsettings_tablebarplot()) { - scale_breaks <- set_scale_breaks(plot_borders) if (plot_settings$background_stripes_border == "Inf") { @@ -723,14 +714,14 @@ plot_capped_x_axis <- function(scale_breaks) { yend = 0.4, linewidth = 0.1 ) - }else{ + } else { ## Plot something invisible, so the y axis is the same over all plots: ggplot2::annotate("segment", - x = 0, - xend = 0, - y = 0.4, - yend = 0.4, - linewidth = 0.00000001 + x = 0, + xend = 0, + y = 0.4, + yend = 0.4, + linewidth = 0.00000001 ) } } diff --git a/R/themes.R b/R/themes.R index 3f091490..4c8e8483 100644 --- a/R/themes.R +++ b/R/themes.R @@ -87,6 +87,10 @@ theme_line <- function(plot_settings = plotsettings_lineplot()) { text = ggplot2::element_text(colour = "#000000"), panel.spacing = ggplot2::unit(plot_settings$split_plot_gap_width, "npc"), # Gap in split plot plot.margin = ggplot2::unit(c(0, 0, 0.25, 0), units = "npc"), - plot.title = ggplot2::element_text(size = 7, hjust = 0.5, vjust = 2.5) + plot.title = ggplot2::element_text(size = 7, + hjust = 0.5, + vjust = 0, + margin = ggplot2::margin(-3.5, 0, 3.5, 0) + ) ) } diff --git a/R/utils.R b/R/utils.R index 27555b5d..32698cc0 100644 --- a/R/utils.R +++ b/R/utils.R @@ -93,7 +93,7 @@ consecutive_numbers <- function(vec) { #' @keywords internal #' @noRd #' -#' @param vec Character vector, usually the group-column in a data.frame returned by [eatRep::report()]. +#' @param vec Character vector, usually the group-column in a data.frame returned by `eatRep::report()`. #' @param groups Character vector of groups that should be extracted from vec. #' #' @return Returns the first group found in vec. diff --git a/man/construct_label.Rd b/man/construct_label.Rd index 689211b4..69bfe1de 100644 --- a/man/construct_label.Rd +++ b/man/construct_label.Rd @@ -49,13 +49,13 @@ This function creates a new column containing labels with significances represen names <-c("Berlin", "Hamburg", "Hessen", "Niedersachsen", "Saarland") estimate <- c(400, 650, 380, 500, 600) se <- c(0.1, 0.45, 1, 0.27, 0.9) -p_estimate <- c(0.6, 0.2, 0.05, 0.04, 0.01) +p_estimate <- c(FALSE, FALSE, TRUE, TRUE, FALSE) dat <- data.frame(names, estimate, se, p_estimate) -# tables +# lineplots construct_label(dat, new_name = "new", label_est = "estimate", label_se = "se", round_se = 2) -# lineplots -construct_label(dat, label_est = "estimate", label_se = "se", label_sig_high = "p_estimate", label_sig_high_extra_column = TRUE) +# tables +construct_label(dat, label_est = "estimate", label_se = "se", label_sig_bold = "p_estimate", label_sig_high = "p_estimate", label_sig_high_extra_column = TRUE) } diff --git a/tests/adjusted_means_ger.pdf b/tests/adjusted_means_ger.pdf deleted file mode 100644 index a9546ea7..00000000 Binary files a/tests/adjusted_means_ger.pdf and /dev/null differ diff --git a/tests/split_lineplot_2_books.pdf b/tests/split_lineplot_2_books.pdf deleted file mode 100644 index 2bf37116..00000000 Binary files a/tests/split_lineplot_2_books.pdf and /dev/null differ diff --git a/tests/testplot_1.pdf b/tests/testplot_1.pdf deleted file mode 100644 index 6139fd38..00000000 Binary files a/tests/testplot_1.pdf and /dev/null differ diff --git a/tests/testthat/_snaps/plot_braces/adjacent-braces.svg b/tests/testthat/_snaps/plot_braces/adjacent-braces.svg index 96731994..f725ada1 100644 --- a/tests/testthat/_snaps/plot_braces/adjacent-braces.svg +++ b/tests/testthat/_snaps/plot_braces/adjacent-braces.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_braces/brace-plot-trend-books.svg b/tests/testthat/_snaps/plot_braces/brace-plot-trend-books.svg index ac4530ff..b76df459 100644 --- a/tests/testthat/_snaps/plot_braces/brace-plot-trend-books.svg +++ b/tests/testthat/_snaps/plot_braces/brace-plot-trend-books.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_braces/brace-plot.svg b/tests/testthat/_snaps/plot_braces/brace-plot.svg index 7c626af1..08aa9af0 100644 --- a/tests/testthat/_snaps/plot_braces/brace-plot.svg +++ b/tests/testthat/_snaps/plot_braces/brace-plot.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_braces/facetted-braces.svg b/tests/testthat/_snaps/plot_braces/facetted-braces.svg index 508610e2..00f204b8 100644 --- a/tests/testthat/_snaps/plot_braces/facetted-braces.svg +++ b/tests/testthat/_snaps/plot_braces/facetted-braces.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_braces/overlapping-braces-in-other-direction.svg b/tests/testthat/_snaps/plot_braces/overlapping-braces-in-other-direction.svg index c9cc7c1a..41819544 100644 --- a/tests/testthat/_snaps/plot_braces/overlapping-braces-in-other-direction.svg +++ b/tests/testthat/_snaps/plot_braces/overlapping-braces-in-other-direction.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_braces/overlapping-braces.svg b/tests/testthat/_snaps/plot_braces/overlapping-braces.svg index 99dab933..98a242d8 100644 --- a/tests/testthat/_snaps/plot_braces/overlapping-braces.svg +++ b/tests/testthat/_snaps/plot_braces/overlapping-braces.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-1group.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-1group.svg index ba67326e..9626a42c 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-1group.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-1group.svg @@ -105,7 +105,7 @@ -Land­17 +Land­17 @@ -183,7 +183,7 @@ -Land­21 +Land­21 @@ -261,7 +261,7 @@ -Land­28 +Land­28 @@ -339,7 +339,7 @@ -Land­29 +Land­29 @@ -417,7 +417,7 @@ -Land­31 +Land­31 @@ -495,7 +495,7 @@ -Land­34 +Land­34 @@ -573,7 +573,7 @@ -Land­36 +Land­36 @@ -651,7 +651,7 @@ -Land­40 +Land­40 @@ -729,7 +729,7 @@ -Land­43 +Land­43 @@ -807,7 +807,7 @@ -Land­45 +Land­45 @@ -885,7 +885,7 @@ -Land­48 +Land­48 @@ -963,7 +963,7 @@ -Land­70 +Land­70 @@ -1041,7 +1041,7 @@ -Land­72 +Land­72 @@ -1119,7 +1119,7 @@ -Land­77 +Land­77 @@ -1197,7 +1197,7 @@ -Land­88 +Land­88 @@ -1275,7 +1275,7 @@ -Land­93 +Land­93 lineplot_4x4_1group diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-2groups.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-2groups.svg index 79d7cf6e..74283720 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-2groups.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-2groups.svg @@ -127,7 +127,7 @@ -Land­17 +Land­17 @@ -227,7 +227,7 @@ -Land­21 +Land­21 @@ -327,7 +327,7 @@ -Land­28 +Land­28 @@ -427,7 +427,7 @@ -Land­29 +Land­29 @@ -527,7 +527,7 @@ -Land­31 +Land­31 @@ -627,7 +627,7 @@ -Land­34 +Land­34 @@ -727,7 +727,7 @@ -Land­36 +Land­36 @@ -827,7 +827,7 @@ -Land­40 +Land­40 @@ -927,7 +927,7 @@ -Land­43 +Land­43 @@ -1027,7 +1027,7 @@ -Land­45 +Land­45 @@ -1127,7 +1127,7 @@ -Land­48 +Land­48 @@ -1227,7 +1227,7 @@ -Land­70 +Land­70 @@ -1327,7 +1327,7 @@ -Land­72 +Land­72 @@ -1427,7 +1427,7 @@ -Land­77 +Land­77 @@ -1527,7 +1527,7 @@ -Land­88 +Land­88 @@ -1627,7 +1627,7 @@ -Land­93 +Land­93 lineplot_4x4_2groups diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-no-split.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-no-split.svg index d8c14c31..8c81757b 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-no-split.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-no-split.svg @@ -113,7 +113,7 @@ 2022 -Land­17 +Land­17 @@ -199,7 +199,7 @@ 2022 -Land­21 +Land­21 @@ -285,7 +285,7 @@ 2022 -Land­28 +Land­28 @@ -371,7 +371,7 @@ 2022 -Land­29 +Land­29 @@ -457,7 +457,7 @@ 2022 -Land­31 +Land­31 @@ -543,7 +543,7 @@ 2022 -Land­34 +Land­34 @@ -629,7 +629,7 @@ 2022 -Land­36 +Land­36 @@ -715,7 +715,7 @@ 2022 -Land­40 +Land­40 @@ -801,7 +801,7 @@ 2022 -Land­43 +Land­43 @@ -887,7 +887,7 @@ 2022 -Land­45 +Land­45 @@ -973,7 +973,7 @@ 2022 -Land­48 +Land­48 @@ -1059,7 +1059,7 @@ 2022 -Land­70 +Land­70 @@ -1145,7 +1145,7 @@ 2022 -Land­72 +Land­72 @@ -1231,7 +1231,7 @@ 2022 -Land­77 +Land­77 @@ -1317,7 +1317,7 @@ 2022 -Land­88 +Land­88 @@ -1403,7 +1403,7 @@ 2022 -Land­93 +Land­93 lineplot_4x4_3groups unequal trend_length, no split diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-with-split.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-with-split.svg index f8b4446c..064afdc2 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-with-split.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups-unequal-trend-length-with-split.svg @@ -157,7 +157,7 @@ -Land­17 +Land­17 @@ -287,7 +287,7 @@ -Land­21 +Land­21 @@ -417,7 +417,7 @@ -Land­28 +Land­28 @@ -547,7 +547,7 @@ -Land­29 +Land­29 @@ -677,7 +677,7 @@ -Land­31 +Land­31 @@ -807,7 +807,7 @@ -Land­34 +Land­34 @@ -937,7 +937,7 @@ -Land­36 +Land­36 @@ -1067,7 +1067,7 @@ -Land­40 +Land­40 @@ -1197,7 +1197,7 @@ -Land­43 +Land­43 @@ -1327,7 +1327,7 @@ -Land­45 +Land­45 @@ -1457,7 +1457,7 @@ -Land­48 +Land­48 @@ -1587,7 +1587,7 @@ -Land­70 +Land­70 @@ -1717,7 +1717,7 @@ -Land­72 +Land­72 @@ -1847,7 +1847,7 @@ -Land­77 +Land­77 @@ -1977,7 +1977,7 @@ -Land­88 +Land­88 @@ -2107,7 +2107,7 @@ -Land­93 +Land­93 lineplot_4x4_3groups unequal trend_length, with split diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups.svg index ca54e9cc..e6a7eba9 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-3groups.svg @@ -157,7 +157,7 @@ -Land­17 +Land­17 @@ -287,7 +287,7 @@ -Land­21 +Land­21 @@ -417,7 +417,7 @@ -Land­28 +Land­28 @@ -547,7 +547,7 @@ -Land­29 +Land­29 @@ -677,7 +677,7 @@ -Land­31 +Land­31 @@ -807,7 +807,7 @@ -Land­34 +Land­34 @@ -937,7 +937,7 @@ -Land­36 +Land­36 @@ -1067,7 +1067,7 @@ -Land­40 +Land­40 @@ -1197,7 +1197,7 @@ -Land­43 +Land­43 @@ -1327,7 +1327,7 @@ -Land­45 +Land­45 @@ -1457,7 +1457,7 @@ -Land­48 +Land­48 @@ -1587,7 +1587,7 @@ -Land­70 +Land­70 @@ -1717,7 +1717,7 @@ -Land­72 +Land­72 @@ -1847,7 +1847,7 @@ -Land­77 +Land­77 @@ -1977,7 +1977,7 @@ -Land­88 +Land­88 @@ -2107,7 +2107,7 @@ -Land­93 +Land­93 lineplot_4x4_3groups diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adj-means.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adj-means.svg index 9a1f7527..80c039db 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adj-means.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adj-means.svg @@ -83,7 +83,7 @@ -Land­17 +Land­17 @@ -139,7 +139,7 @@ -Land­21 +Land­21 @@ -195,7 +195,7 @@ -Land­28 +Land­28 @@ -251,7 +251,7 @@ -Land­29 +Land­29 @@ -307,7 +307,7 @@ -Land­31 +Land­31 @@ -363,7 +363,7 @@ -Land­34 +Land­34 @@ -419,7 +419,7 @@ -Land­36 +Land­36 @@ -475,7 +475,7 @@ -Land­40 +Land­40 @@ -531,7 +531,7 @@ -Land­43 +Land­43 @@ -587,7 +587,7 @@ -Land­45 +Land­45 @@ -643,7 +643,7 @@ -Land­48 +Land­48 @@ -699,7 +699,7 @@ -Land­70 +Land­70 @@ -755,7 +755,7 @@ -Land­72 +Land­72 @@ -811,7 +811,7 @@ -Land­77 +Land­77 @@ -867,7 +867,7 @@ -Land­88 +Land­88 @@ -923,7 +923,7 @@ -Land­93 +Land­93 lineplot_4x4_adj_means diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adjusted-ger.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adjusted-ger.svg index 0e97db3c..0a7827a1 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adjusted-ger.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-adjusted-ger.svg @@ -83,7 +83,7 @@ -Deutsch Lesen +Deutsch Lesen @@ -139,7 +139,7 @@ -Deutsch Orthographie +Deutsch Orthographie @@ -195,7 +195,7 @@ -Deutsch Zuhören +Deutsch Zuhören @@ -251,7 +251,7 @@ -Englisch Hörverstehen +Englisch Hörverstehen @@ -307,7 +307,7 @@ -Englisch Leseverstehen +Englisch Leseverstehen lineplot_4x4_adjusted_ger diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles-3groups.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles-3groups.svg index 7cfc1e73..57ee9d71 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles-3groups.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles-3groups.svg @@ -149,7 +149,7 @@ -Deutsch Lesen +Deutsch Lesen @@ -271,7 +271,7 @@ -Deutsch Orthographie +Deutsch Orthographie @@ -393,7 +393,7 @@ -Deutsch Zuhören +Deutsch Zuhören @@ -515,7 +515,7 @@ -Englisch Hörverstehen +Englisch Hörverstehen @@ -638,7 +638,7 @@ -Englisch Leseverstehen +Englisch Leseverstehen lineplot_4x4_kb_tiles_3groups diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles.svg index 7aa75bc6..13107045 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-4x4-kb-tiles.svg @@ -127,7 +127,7 @@ -Deutsch Lesen +Deutsch Lesen @@ -227,7 +227,7 @@ -Deutsch Orthographie +Deutsch Orthographie @@ -327,7 +327,7 @@ -Deutsch Zuhören +Deutsch Zuhören @@ -427,7 +427,7 @@ -Englisch Hörverstehen +Englisch Hörverstehen @@ -527,7 +527,7 @@ -Englisch Leseverstehen +Englisch Leseverstehen lineplot_4x4_kb_tiles diff --git a/tests/testthat/_snaps/plot_lineplot/lineplot-random-settings.svg b/tests/testthat/_snaps/plot_lineplot/lineplot-random-settings.svg index 904b7c24..3486d6e0 100644 --- a/tests/testthat/_snaps/plot_lineplot/lineplot-random-settings.svg +++ b/tests/testthat/_snaps/plot_lineplot/lineplot-random-settings.svg @@ -44,7 +44,7 @@ - + -23 (9.9) -6 @@ -71,7 +71,7 @@ - + -23 (20.0) -41 @@ -117,7 +117,7 @@ -Land­17 +Land­17 @@ -134,7 +134,7 @@ - + -18 (7.1) -21 @@ -161,7 +161,7 @@ - + -5 (7.4) -23 @@ -205,7 +205,7 @@ -Land­21 +Land­21 @@ -222,7 +222,7 @@ - + -15 (6.4) -7 @@ -249,7 +249,7 @@ - + -6 (6.9) -21 @@ -295,7 +295,7 @@ -Land­28 +Land­28 @@ -312,7 +312,7 @@ - + -17 (7.9) -23 @@ -339,7 +339,7 @@ - + -15 (8.9) -14 @@ -383,7 +383,7 @@ -Land­29 +Land­29 @@ -400,7 +400,7 @@ - + 3 (7.6) 1 @@ -427,7 +427,7 @@ - + -11 (7.8) -29 @@ -471,7 +471,7 @@ -Land­31 +Land­31 @@ -488,7 +488,7 @@ - + 2 (12.1) -5 @@ -515,7 +515,7 @@ - + 1 (12.5) -10 @@ -559,7 +559,7 @@ -Land­34 +Land­34 @@ -576,7 +576,7 @@ - + 5 (10.3) 2 @@ -603,7 +603,7 @@ - + -25 (10.0) -33 @@ -649,7 +649,7 @@ -Land­36 +Land­36 @@ -666,7 +666,7 @@ - + -11 (10.6) -12 @@ -693,7 +693,7 @@ - + -1 (9.7) -12 @@ -737,7 +737,7 @@ -Land­40 +Land­40 @@ -754,7 +754,7 @@ - + -14 (7.9) -2 @@ -781,7 +781,7 @@ - + -43 (11.3) -43 @@ -827,7 +827,7 @@ -Land­43 +Land­43 @@ -844,7 +844,7 @@ - + -34 (10.1) -31 @@ -875,7 +875,7 @@ - + 19 (12.9) 3 @@ -921,7 +921,7 @@ -Land­45 +Land­45 @@ -938,7 +938,7 @@ - + 6 (10.0) 3 @@ -967,7 +967,7 @@ - + -5 (8.6) -22 @@ -1011,7 +1011,7 @@ -Land­48 +Land­48 @@ -1028,7 +1028,7 @@ - + -1 (8.6) -12 @@ -1055,7 +1055,7 @@ - + -15 (8.4) -12 @@ -1101,7 +1101,7 @@ -Land­70 +Land­70 @@ -1118,7 +1118,7 @@ - + 5 (7.3) -14 @@ -1147,7 +1147,7 @@ - + -17 (6.7) -16 @@ -1191,7 +1191,7 @@ -Land­72 +Land­72 @@ -1208,7 +1208,7 @@ - + -14 (8.7) -11 @@ -1235,7 +1235,7 @@ - + -10 (9.2) -14 @@ -1281,7 +1281,7 @@ -Land­77 +Land­77 @@ -1298,7 +1298,7 @@ - + -20 (10.8) -19 @@ -1325,7 +1325,7 @@ - + -5 (12.1) -25 @@ -1373,7 +1373,7 @@ -Land­88 +Land­88 @@ -1390,7 +1390,7 @@ - + -18 (8.7) -25 @@ -1417,7 +1417,7 @@ - + -17 (8.7) -30 @@ -1461,7 +1461,7 @@ -Land­93 +Land­93 lineplot random settings diff --git a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-box.svg b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-box.svg index 82e16b3d..3eab4ea9 100644 --- a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-box.svg +++ b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-box.svg @@ -127,8 +127,8 @@ -Land­17 -a +Land­17 +a @@ -228,7 +228,7 @@ -Land­21 +Land­21 @@ -328,7 +328,7 @@ -Land­28 +Land­28 @@ -428,7 +428,7 @@ -Land­29 +Land­29 @@ -528,7 +528,7 @@ -Land­31 +Land­31 @@ -628,7 +628,7 @@ -Land­34 +Land­34 @@ -728,7 +728,7 @@ -Land­36 +Land­36 @@ -828,7 +828,7 @@ -Land­40 +Land­40 @@ -928,7 +928,7 @@ -Land­43 +Land­43 @@ -1028,8 +1028,8 @@ -Land­45 -3 +Land­45 +3 @@ -1129,7 +1129,7 @@ -Land­48 +Land­48 @@ -1229,7 +1229,7 @@ -Land­70 +Land­70 @@ -1329,7 +1329,7 @@ -Land­72 +Land­72 @@ -1429,7 +1429,7 @@ -Land­77 +Land­77 @@ -1529,7 +1529,7 @@ -Land­88 +Land­88 @@ -1630,7 +1630,7 @@ -Land­93 +Land­93 split_lineplot with box diff --git a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-and-box.svg b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-and-box.svg index 556c07f3..d8a2f794 100644 --- a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-and-box.svg +++ b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-and-box.svg @@ -127,8 +127,8 @@ -Land­17 -a +Land­17 +a @@ -228,7 +228,7 @@ -Land­21 +Land­21 @@ -328,7 +328,7 @@ -Land­28 +Land­28 @@ -428,7 +428,7 @@ -Land­29 +Land­29 @@ -528,7 +528,7 @@ -Land­31 +Land­31 @@ -628,7 +628,7 @@ -Land­34 +Land­34 @@ -728,7 +728,7 @@ -Land­36 +Land­36 @@ -828,7 +828,7 @@ -Land­40 +Land­40 @@ -928,7 +928,7 @@ -Land­43 +Land­43 @@ -1028,8 +1028,8 @@ -Land­45 -3 +Land­45 +3 @@ -1129,7 +1129,7 @@ -Land­48 +Land­48 @@ -1229,7 +1229,7 @@ -Land­70 +Land­70 @@ -1329,7 +1329,7 @@ -Land­72 +Land­72 @@ -1429,7 +1429,7 @@ -Land­77 +Land­77 @@ -1529,7 +1529,7 @@ -Land­88 +Land­88 @@ -1630,7 +1630,7 @@ -Land­93 +Land­93 split_lineplot with unequal distances and box diff --git a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-box-and-y-axis.svg b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-box-and-y-axis.svg index 51623e55..4ea43ff3 100644 --- a/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-box-and-y-axis.svg +++ b/tests/testthat/_snaps/plot_lineplot/split-lineplot-with-unequal-distances-box-and-y-axis.svg @@ -170,8 +170,8 @@ -Land­17 -a +Land­17 +a @@ -271,7 +271,7 @@ -Land­21 +Land­21 @@ -371,7 +371,7 @@ -Land­28 +Land­28 @@ -471,7 +471,7 @@ -Land­29 +Land­29 @@ -614,7 +614,7 @@ -Land­31 +Land­31 @@ -714,7 +714,7 @@ -Land­34 +Land­34 @@ -814,7 +814,7 @@ -Land­36 +Land­36 @@ -914,7 +914,7 @@ -Land­40 +Land­40 @@ -1057,7 +1057,7 @@ -Land­43 +Land­43 @@ -1157,8 +1157,8 @@ -Land­45 -3 +Land­45 +3 @@ -1258,7 +1258,7 @@ -Land­48 +Land­48 @@ -1358,7 +1358,7 @@ -Land­70 +Land­70 @@ -1501,7 +1501,7 @@ -Land­72 +Land­72 @@ -1601,7 +1601,7 @@ -Land­77 +Land­77 @@ -1701,7 +1701,7 @@ -Land­88 +Land­88 @@ -1802,7 +1802,7 @@ -Land­93 +Land­93 split_lineplot with unequal distances, box and y-axis diff --git a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-manual-y-axis.svg b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-manual-y-axis.svg index 89b638fa..0cdd8c2b 100644 --- a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-manual-y-axis.svg +++ b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-manual-y-axis.svg @@ -130,8 +130,8 @@ 2023 -Land­17 -a +Land­17 +a @@ -195,7 +195,7 @@ 2023 -Land­21 +Land­21 @@ -259,7 +259,7 @@ 2023 -Land­28 +Land­28 @@ -323,7 +323,7 @@ 2023 -Land­29 +Land­29 @@ -426,7 +426,7 @@ 2023 -Land­31 +Land­31 @@ -490,7 +490,7 @@ 2023 -Land­34 +Land­34 @@ -554,7 +554,7 @@ 2023 -Land­36 +Land­36 @@ -618,7 +618,7 @@ 2023 -Land­40 +Land­40 @@ -721,7 +721,7 @@ 2023 -Land­43 +Land­43 @@ -785,8 +785,8 @@ 2023 -Land­45 -3 +Land­45 +3 @@ -850,7 +850,7 @@ 2023 -Land­48 +Land­48 @@ -914,7 +914,7 @@ 2023 -Land­70 +Land­70 @@ -1017,7 +1017,7 @@ 2023 -Land­72 +Land­72 @@ -1081,7 +1081,7 @@ 2023 -Land­77 +Land­77 @@ -1145,7 +1145,7 @@ 2023 -Land­88 +Land­88 @@ -1210,7 +1210,7 @@ 2023 -Land­93 +Land­93 unsplit lineplot, unequal distances, box, manual y-axis diff --git a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-y-axis.svg b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-y-axis.svg index 94f9b127..28c6ba59 100644 --- a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-y-axis.svg +++ b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-unequal-distances-box-y-axis.svg @@ -134,8 +134,8 @@ 2023 -Land­17 -a +Land­17 +a @@ -199,7 +199,7 @@ 2023 -Land­21 +Land­21 @@ -263,7 +263,7 @@ 2023 -Land­28 +Land­28 @@ -327,7 +327,7 @@ 2023 -Land­29 +Land­29 @@ -434,7 +434,7 @@ 2023 -Land­31 +Land­31 @@ -498,7 +498,7 @@ 2023 -Land­34 +Land­34 @@ -562,7 +562,7 @@ 2023 -Land­36 +Land­36 @@ -626,7 +626,7 @@ 2023 -Land­40 +Land­40 @@ -733,7 +733,7 @@ 2023 -Land­43 +Land­43 @@ -797,8 +797,8 @@ 2023 -Land­45 -3 +Land­45 +3 @@ -862,7 +862,7 @@ 2023 -Land­48 +Land­48 @@ -926,7 +926,7 @@ 2023 -Land­70 +Land­70 @@ -1033,7 +1033,7 @@ 2023 -Land­72 +Land­72 @@ -1097,7 +1097,7 @@ 2023 -Land­77 +Land­77 @@ -1161,7 +1161,7 @@ 2023 -Land­88 +Land­88 @@ -1226,7 +1226,7 @@ 2023 -Land­93 +Land­93 unsplit lineplot, unequal distances, box, y-axis diff --git a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-box.svg b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-box.svg index 2f3be8e4..946288b2 100644 --- a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-box.svg +++ b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-box.svg @@ -91,8 +91,8 @@ 2021 -Land­17 -a +Land­17 +a @@ -156,7 +156,7 @@ 2021 -Land­21 +Land­21 @@ -220,7 +220,7 @@ 2021 -Land­28 +Land­28 @@ -284,7 +284,7 @@ 2021 -Land­29 +Land­29 @@ -348,7 +348,7 @@ 2021 -Land­31 +Land­31 @@ -412,7 +412,7 @@ 2021 -Land­34 +Land­34 @@ -476,7 +476,7 @@ 2021 -Land­36 +Land­36 @@ -540,7 +540,7 @@ 2021 -Land­40 +Land­40 @@ -604,7 +604,7 @@ 2021 -Land­43 +Land­43 @@ -668,8 +668,8 @@ 2021 -Land­45 -3 +Land­45 +3 @@ -733,7 +733,7 @@ 2021 -Land­48 +Land­48 @@ -797,7 +797,7 @@ 2021 -Land­70 +Land­70 @@ -861,7 +861,7 @@ 2021 -Land­72 +Land­72 @@ -925,7 +925,7 @@ 2021 -Land­77 +Land­77 @@ -989,7 +989,7 @@ 2021 -Land­88 +Land­88 @@ -1054,7 +1054,7 @@ 2021 -Land­93 +Land­93 unsplit lineplot with box diff --git a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-unequal-distances-and-box.svg b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-unequal-distances-and-box.svg index 18c69d2e..f11b40a6 100644 --- a/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-unequal-distances-and-box.svg +++ b/tests/testthat/_snaps/plot_lineplot/unsplit-lineplot-with-unequal-distances-and-box.svg @@ -91,8 +91,8 @@ 2023 -Land­17 -a +Land­17 +a @@ -156,7 +156,7 @@ 2023 -Land­21 +Land­21 @@ -220,7 +220,7 @@ 2023 -Land­28 +Land­28 @@ -284,7 +284,7 @@ 2023 -Land­29 +Land­29 @@ -348,7 +348,7 @@ 2023 -Land­31 +Land­31 @@ -412,7 +412,7 @@ 2023 -Land­34 +Land­34 @@ -476,7 +476,7 @@ 2023 -Land­36 +Land­36 @@ -540,7 +540,7 @@ 2023 -Land­40 +Land­40 @@ -604,7 +604,7 @@ 2023 -Land­43 +Land­43 @@ -668,8 +668,8 @@ 2023 -Land­45 -3 +Land­45 +3 @@ -733,7 +733,7 @@ 2023 -Land­48 +Land­48 @@ -797,7 +797,7 @@ 2023 -Land­70 +Land­70 @@ -861,7 +861,7 @@ 2023 -Land­72 +Land­72 @@ -925,7 +925,7 @@ 2023 -Land­77 +Land­77 @@ -989,7 +989,7 @@ 2023 -Land­88 +Land­88 @@ -1054,7 +1054,7 @@ 2023 -Land­93 +Land­93 unsplit lineplot with unequal distances and box diff --git a/tests/testthat/_snaps/plot_lines/plotting-lines.svg b/tests/testthat/_snaps/plot_lines/plotting-lines.svg index 4359e0a8..832c0c95 100644 --- a/tests/testthat/_snaps/plot_lines/plotting-lines.svg +++ b/tests/testthat/_snaps/plot_lines/plotting-lines.svg @@ -52,32 +52,32 @@ 2020.0 year_start_axis est_y - -line_sig - - - - -FALSE -TRUE - - -0.00 -0.25 -0.50 -0.75 -1.00 -grouping_var - - - - - - - - - - + +grouping_var + + + + + + + + + + + +0.00 +0.25 +0.50 +0.75 +1.00 + +line_sig + + + + +FALSE +TRUE Plotting lines diff --git a/tests/testthat/_snaps/plot_lines/wrapped-lineplot.svg b/tests/testthat/_snaps/plot_lines/wrapped-lineplot.svg index 31c63186..2a38e738 100644 --- a/tests/testthat/_snaps/plot_lines/wrapped-lineplot.svg +++ b/tests/testthat/_snaps/plot_lines/wrapped-lineplot.svg @@ -18,7 +18,7 @@ - + @@ -104,11 +104,11 @@ FALSE TRUE +grouping_var + + 1 -grouping_var - - wrapped lineplot diff --git a/tests/testthat/_snaps/plot_single_lineplot/single-grouped-lineplot.svg b/tests/testthat/_snaps/plot_single_lineplot/single-grouped-lineplot.svg index e9c6d0e3..954b2d89 100644 --- a/tests/testthat/_snaps/plot_single_lineplot/single-grouped-lineplot.svg +++ b/tests/testthat/_snaps/plot_single_lineplot/single-grouped-lineplot.svg @@ -64,6 +64,6 @@ 30 -single grouped lineplot +single grouped lineplot diff --git a/tests/testthat/_snaps/plot_single_lineplot/single-lineplot-with-relational-distances.svg b/tests/testthat/_snaps/plot_single_lineplot/single-lineplot-with-relational-distances.svg index e0867984..6ff83260 100644 --- a/tests/testthat/_snaps/plot_single_lineplot/single-lineplot-with-relational-distances.svg +++ b/tests/testthat/_snaps/plot_single_lineplot/single-lineplot-with-relational-distances.svg @@ -48,6 +48,6 @@ 2020 -single lineplot with relational distances +single lineplot with relational distances diff --git a/tests/testthat/_snaps/plot_single_lineplot/single-lineplot.svg b/tests/testthat/_snaps/plot_single_lineplot/single-lineplot.svg index 5484fc41..f4bff93a 100644 --- a/tests/testthat/_snaps/plot_single_lineplot/single-lineplot.svg +++ b/tests/testthat/_snaps/plot_single_lineplot/single-lineplot.svg @@ -48,6 +48,6 @@ 2020 -single lineplot +single lineplot diff --git a/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-equal-distances.svg b/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-equal-distances.svg index fe488695..452e28f7 100644 --- a/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-equal-distances.svg +++ b/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-equal-distances.svg @@ -102,6 +102,6 @@ -splitlineplot equal distances +splitlineplot equal distances diff --git a/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-relational-distances.svg b/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-relational-distances.svg index 08325e1a..cb7b92ec 100644 --- a/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-relational-distances.svg +++ b/tests/testthat/_snaps/plot_single_lineplot/splitlineplot-relational-distances.svg @@ -124,6 +124,6 @@ -splitlineplot relational distances +splitlineplot relational distances diff --git a/tests/testthat/_snaps/plot_x_axis/facetted-x-axis-is-plotted-with-relational-distances.svg b/tests/testthat/_snaps/plot_x_axis/facetted-x-axis-is-plotted-with-relational-distances.svg index c141d06f..ae9aa0f1 100644 --- a/tests/testthat/_snaps/plot_x_axis/facetted-x-axis-is-plotted-with-relational-distances.svg +++ b/tests/testthat/_snaps/plot_x_axis/facetted-x-axis-is-plotted-with-relational-distances.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/vignette_bt22/p-line-ger.svg b/tests/testthat/_snaps/vignette_bt22/p-line-ger.svg index 7078f4c8..a676e0aa 100644 --- a/tests/testthat/_snaps/vignette_bt22/p-line-ger.svg +++ b/tests/testthat/_snaps/vignette_bt22/p-line-ger.svg @@ -121,7 +121,7 @@ -hoeren +hoeren @@ -215,7 +215,7 @@ -lesen +lesen @@ -309,7 +309,7 @@ -GL +GL @@ -403,7 +403,7 @@ -DHW +DHW @@ -497,7 +497,7 @@ -GM +GM p_line_ger diff --git a/tests/testthat/_snaps/vignette_bt22/p-line-states-y.svg b/tests/testthat/_snaps/vignette_bt22/p-line-states-y.svg index aae8ccf4..b5c730cd 100644 --- a/tests/testthat/_snaps/vignette_bt22/p-line-states-y.svg +++ b/tests/testthat/_snaps/vignette_bt22/p-line-states-y.svg @@ -158,8 +158,8 @@ -Land­17 -a +Land­17 +a @@ -259,7 +259,7 @@ -Land­21 +Land­21 @@ -359,7 +359,7 @@ -Land­28 +Land­28 @@ -459,7 +459,7 @@ -Land­29 +Land­29 @@ -590,7 +590,7 @@ -Land­31 +Land­31 @@ -690,7 +690,7 @@ -Land­34 +Land­34 @@ -790,7 +790,7 @@ -Land­36 +Land­36 @@ -890,7 +890,7 @@ -Land­40 +Land­40 @@ -1021,7 +1021,7 @@ -Land­43 +Land­43 @@ -1121,8 +1121,8 @@ -Land­45 -3 +Land­45 +3 @@ -1222,7 +1222,7 @@ -Land­48 +Land­48 @@ -1322,7 +1322,7 @@ -Land­70 +Land­70 @@ -1453,7 +1453,7 @@ -Land­72 +Land­72 @@ -1553,7 +1553,7 @@ -Land­77 +Land­77 @@ -1653,7 +1653,7 @@ -Land­88 +Land­88 @@ -1753,7 +1753,7 @@ -Land­93 +Land­93 p_line_states_y diff --git a/tests/testthat/_snaps/vignette_bt22/p-line-states.svg b/tests/testthat/_snaps/vignette_bt22/p-line-states.svg index 02856cd7..b462b47a 100644 --- a/tests/testthat/_snaps/vignette_bt22/p-line-states.svg +++ b/tests/testthat/_snaps/vignette_bt22/p-line-states.svg @@ -127,8 +127,8 @@ -Land­17 -a +Land­17 +a @@ -228,7 +228,7 @@ -Land­21 +Land­21 @@ -328,7 +328,7 @@ -Land­28 +Land­28 @@ -428,7 +428,7 @@ -Land­29 +Land­29 @@ -528,7 +528,7 @@ -Land­31 +Land­31 @@ -628,7 +628,7 @@ -Land­34 +Land­34 @@ -728,7 +728,7 @@ -Land­36 +Land­36 @@ -828,7 +828,7 @@ -Land­40 +Land­40 @@ -928,7 +928,7 @@ -Land­43 +Land­43 @@ -1028,8 +1028,8 @@ -Land­45 -3 +Land­45 +3 @@ -1129,7 +1129,7 @@ -Land­48 +Land­48 @@ -1229,7 +1229,7 @@ -Land­70 +Land­70 @@ -1329,7 +1329,7 @@ -Land­72 +Land­72 @@ -1429,7 +1429,7 @@ -Land­77 +Land­77 @@ -1529,7 +1529,7 @@ -Land­88 +Land­88 @@ -1629,7 +1629,7 @@ -Land­93 +Land­93 p_line_states