diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 5e1c90b..56b2d96 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,7 +1,7 @@ services: app: - image: ghcr.io/ximeraproject/ximeralatex:v2.7.0 - # image: ghcr.io/ximeraproject/ximeralatex:v2.7.0-full + image: ghcr.io/ximeraproject/ximeralatex:v2.7.2 + # image: ghcr.io/ximeraproject/ximeralatex:v2.7.2-full volumes: # This is where VS Code should expect to find your project's source code and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/code:cached diff --git a/.github/workflows/serve-ximera.yml b/.github/workflows/serve-ximera.yml index 2cddae2..c47373e 100644 --- a/.github/workflows/serve-ximera.yml +++ b/.github/workflows/serve-ximera.yml @@ -49,13 +49,13 @@ jobs: GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} XIMERA_URL: ${{ vars.XIMERA_URL }} XIMERA_NAME: ${{ vars.XIMERA_NAME }}*${{ github.ref_name }} - XOURSES: "." # "./testXourses" + XOURSES: "29-a11y-table/xourse.tex" # "./testXourses" + # XM_COMPILE_SEQUENCE: "pdf" XM_COMPILE_SEQUENCE: "pdf,handout.pdf,html" run: | ls -alrt chmod +x xmScripts/xmlatex # Overleaf sync might reset it :-() - # ./xmScripts/xmlatex veryclean testXourses.TODO # TO BE REMOVED - ./xmScripts/xmlatex ghaction $XOURSES + ./xmScripts/xmlatex ghaction -j 8 $XOURSES echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY - name: Setup ximera serve cache (only .git) @@ -93,7 +93,7 @@ jobs: XIMERA_NAME: ${{ vars.XIMERA_NAME }} run: | ./xmScripts/xmlatex name - ./xmScripts/xmlatex serve -f + ./xmScripts/xmlatex serve -f echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY - name: Serve to ximera.osu.edu env: diff --git a/.vscode/settings.json b/.vscode/settings.json index 2fc3d2f..46833d3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -59,7 +59,7 @@ "alignment": "right", "task": "HTML", "description": "Create HTML of the current file.", - "tooltip": "Compile a HTML from the current file." + "tooltip": "Compile (and publish) HTML \nfrom the current file." }, { "label": "SERVE", @@ -91,52 +91,51 @@ "description": "Remove all generated files", "problemMatcher": [], }, - - { - "label": "Bake", - "alignment": "right", - "task": "Bake", - "description": "Bake this project (make .html files).", - "tooltip": "Bake this project." - }, - { - "task": "Bake pdf", - "label": "Bake PDF's (with answers)", - "description": "Make PDF's.", - "problemMatcher": [], - }, - { - "task": "Bake pdf (force rebuild)", - "label": "Force (re-)Bake PDF's (with answers)", - "description": "Make PDF's.", - "problemMatcher": [], - }, - { - "task": "Bake handout", - "label": "Bake handout PDF's (without answers)", - "description": "Make handout PDF's.", - "problemMatcher": [], - }, - { - "task": "Bake handout (fore rebuild)", - "label": "Force (re-)Bake handout PDF's (without answers)", - "description": "Make handout PDF's.", - "problemMatcher": [], - }, - { - "label": "Frost", - "alignment": "right", - "task": "Frost", - "description": "Frost this project.", - "tooltip": "Frost this project." - }, - { - "label": "Serve", - "alignment": "right", - "task": "Serve", - "description": "Serve this project.", - "tooltip": "Serve this project." - }, + // { + // "label": "Bake", + // "alignment": "right", + // "task": "Bake", + // "description": "Bake this project (make .html files).", + // "tooltip": "Bake this project." + // }, + // { + // "task": "Bake pdf", + // "label": "Bake PDF's (with answers)", + // "description": "Make PDF's.", + // "problemMatcher": [], + // }, + // { + // "task": "Bake pdf (force rebuild)", + // "label": "Force (re-)Bake PDF's (with answers)", + // "description": "Make PDF's.", + // "problemMatcher": [], + // }, + // { + // "task": "Bake handout", + // "label": "Bake handout PDF's (without answers)", + // "description": "Make handout PDF's.", + // "problemMatcher": [], + // }, + // { + // "task": "Bake handout (fore rebuild)", + // "label": "Force (re-)Bake handout PDF's (without answers)", + // "description": "Make handout PDF's.", + // "problemMatcher": [], + // }, + // { + // "label": "Frost", + // "alignment": "right", + // "task": "Frost", + // "description": "Frost this project.", + // "tooltip": "Frost this project." + // }, + // { + // "label": "Serve", + // "alignment": "right", + // "task": "Serve", + // "description": "Serve this project.", + // "tooltip": "Serve this project." + // }, { "task": "Update DevEnv", "label": "Update the build environment", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index cff9f65..3161141 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -31,8 +31,7 @@ { "label": "SERVE", "args": [ - "all", - "-s", + "ghaction", ], }, { diff --git a/29-a11y-table/Tables_Testing.tex b/29-a11y-table/Tables_Testing.tex new file mode 100644 index 0000000..4252fc9 --- /dev/null +++ b/29-a11y-table/Tables_Testing.tex @@ -0,0 +1,62 @@ +\documentclass{ximera} + +\title{Make Tables Accessible} + +\begin{document} +\begin{abstract}\end{abstract} +\maketitle + +Here is a table with two headers: + +\begin{center} +\begin{tblr}{ + colspec = {Q[l]Q[c]Q[c]}, + rowhead=1, + xmcolhead=1 +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG + & Grammy Wins & Grammy Nominations \\ +% \midrule +Fearless & 4 & 8 \\ +1989 & 3 & 7 \\ +%\bottomrule +\end{tblr} +\end{center} + +Here is a table with only a row header: +\begin{center} +\begin{tblr}{ + colspec = {Q[l]Q[l]Q[l]}, + rowhead=1, +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG + Album & Release Date & Lead Single \\ +% \midrule +Midnights & October 21, 2022 & Anti--Hero \\ +The Tortured Poets Department & April 19, 2024 & Fortnight \\ +%\bottomrule +\end{tblr} +\end{center} + +Here is a table with only a column header: + +\begin{center} +\begin{tblr}{ + colspec = {Q[l]Q[l]Q[l]}, + xmcolhead=1, +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG + Album & 1989 & Folklore \\ +% \midrule +Release Date & October 27, 2014 & Anti--Hero \\ +Lead Single & July 24, 2020 & Cardigan \\ +%\bottomrule +\end{tblr} +\end{center} + +\end{document} + + diff --git a/29-a11y-table/TailorSwiftBotPublic.sty b/29-a11y-table/TailorSwiftBotPublic.sty new file mode 100644 index 0000000..b55cd0d --- /dev/null +++ b/29-a11y-table/TailorSwiftBotPublic.sty @@ -0,0 +1,42 @@ +%%% % -*- coding: utf-8 -*- +%%% ---------------------------------------------------------------------------- +%%% Caption : Make your math WCAG2.1AA compliant +%%% Author : Jeffrey Kuan +%%% Collaborator: +%%% CTAN Page : +%%% Repository : +%%% License : +%%% ---------------------------------------------------------------------------- + +%%% -------------------------------------------------------- +%%> \section{} +%%% -------------------------------------------------------- + +%% \DeclareRelease and \DeclareCurrentRelease are added in LaTeX 2018-04-01 +\NeedsTeXFormat{LaTeX2e}[2018-04-01] +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} +%\DeclareRelease{}{}{} +\DeclareCurrentRelease{}{2025-07-10} + +\ProvidesExplPackage{TailorSwiftBotPublic}{2025-07-10}{2025} + {Make your math WCAG2.1AA compliant} + +\__tblr_keys_define:nn { table/inner } + { + xmcolhead .code:n = \__tblr_keys_gput:nn { xmcolhead } {#1}, + } + +\int_new:N \lTblrColHeadInt + +\cs_new_protected:Npn \__tblr_build_col_head_foot: + { + %% \lTblrColHeadInt can not be empty, so we append '+ 0'. + \int_set:Nn \lTblrColHeadInt + { \__tblr_prop_item:ne { inner } { xmcolhead } + 0 } + \int_compare:nNnTF { \lTblrColHeadInt } > { 0 } + { + \__tblr_build_one_table:nnNN {1} { \lTblrColHeadInt } + \c_true_bool \c_true_bool + } + } \ No newline at end of file diff --git a/29-a11y-table/tabularBasic.tex b/29-a11y-table/tabularBasic.tex new file mode 100644 index 0000000..1d66ba8 --- /dev/null +++ b/29-a11y-table/tabularBasic.tex @@ -0,0 +1,58 @@ +\documentclass{ximera} +\title{Tabular and array} + +\begin{document} +\begin{abstract} +\end{abstract} +\maketitle + +\section{Basic Usage} + + + With \verb|tabular| (and \verb|center|): + \begin{center} + \begin{tabular}{lr} + x & 1 \\ + y & 2 \\ + z & 1 + \end{tabular} + \end{center} + + With \verb|tabular and @{} | (and \verb|center|): + \begin{center} + \begin{tabular}{@{}l@{ }r@{.}} + x & 1 \\ + y & 2 \\ + z & 1 + \end{tabular} + \end{center} + + With \verb|tabular and p{} | (and \verb|center|): + \begin{center} + \begin{tabular}{|p{1cm}|p{2cm}|p{3cm}|} + x & 1 & 2\\ + y & 2 & 3\\ + z & 1 & 4 + \end{tabular} + \end{center} + + With \verb|array|: + $$ + \begin{array}{l|r} + x & 1 \\ + \hline + y & 2 \\ + z & 1 + \end{array} + $$ + With \verb|array and @{} and p{}|: + $$ + \begin{array}{@{X }l@{|}p{2cm}|} + x & 1 \\ + \hline + y & 2 \\ + z & 1 + \end{array} + $$ + + \end{document} \ No newline at end of file diff --git a/29-a11y-table/tabularBasic_article.tex b/29-a11y-table/tabularBasic_article.tex new file mode 100644 index 0000000..fd444f4 --- /dev/null +++ b/29-a11y-table/tabularBasic_article.tex @@ -0,0 +1,58 @@ +\documentclass{article} +\title{Tabular and array (with 'article')} + +\begin{document} +% \begin{abstract} +% \end{abstract} +\maketitle + +\section{Basic Usage} + + + With \verb|tabular| (and \verb|center|): + \begin{center} + \begin{tabular}{lr} + x & 1 \\ + y & 2 \\ + z & 1 + \end{tabular} + \end{center} + + With \verb|tabular and @{} | (and \verb|center|): + \begin{center} + \begin{tabular}{@{}l@{ }r@{.}} + x & 1 \\ + y & 2 \\ + z & 1 + \end{tabular} + \end{center} + + With \verb|tabular and p{} | (and \verb|center|): + \begin{center} + \begin{tabular}{|p{1cm}|p{2cm}|p{3cm}|} + x & 1 & 2\\ + y & 2 & 3\\ + z & 1 & 4 + \end{tabular} + \end{center} + + With \verb|array|: + $$ + \begin{array}{l|r} + x & 1 \\ + \hline + y & 2 \\ + z & 1 + \end{array} + $$ + With \verb|array and @{} and p{}|: + $$ + \begin{array}{@{X }l@{|}p{2cm}|} + x & 1 \\ + \hline + y & 2 \\ + z & 1 + \end{array} + $$ + + \end{document} \ No newline at end of file diff --git a/29-a11y-table/tabularray.4ht b/29-a11y-table/tabularray.4ht new file mode 100644 index 0000000..8beaed0 --- /dev/null +++ b/29-a11y-table/tabularray.4ht @@ -0,0 +1,159 @@ +% tabularray.4ht (2025-06-20-11:36), generated from tex4ht-4ht.tex +% Copyright 2022-2025 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2025-06-20-11:36} + +\NewConfigure{tabularray}{8} +\NewConfigure{tabularrayignoredcell}{2} +\NewConfigure{tabularrayattributes}[1]{\concat:config\CellAttributes{#1\space}} +\NewConfigure{tabularraystyles}[1]{\concat:config\CellStyle{#1}} +\NewConfigure{tabularraycolumnwidth}{1} + +\ExplSyntaxOn +\NewConfigure{tabularrayhalign}[2]{% + \cs_set:cpn{tabularray_halign:#1}{#2} +} + +\NewConfigure{tabularrayvalign}[2]{% + \cs_set:cpn{tabularray_valign:#1}{#2} +} +\ExplSyntaxOff + +\ExplSyntaxOn +\long\def\:tempa#1#2#3#4{% + % insert ...
+ \a:tabularray\o:__tblr_environ_code:nnnn:{#1}{#2}{#3}{#4}\b:tabularray +} +\HLet\__tblr_environ_code:nnnn\:tempa + +\long\def\:tempa#1{\int_set:Nn \c@rownum {#1}\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray} +\HLet\__tblr_build_row:N\:tempa +\ExplSyntaxOff + +% disable rules +\ht:special{t4ht@_} +\ExplSyntaxOn +% #1 row number, #2 column, #3 hline number (there can be multiple), #4 css property to be set +\def\:tblr:hlinestyle#1#2#3#4{ + % get line height + \tl_set:Ne \l__tblr_h_tl{ \__tblr_spec_item:ne { hline } { [#1](#3) / @hline-height } } + % get dash style + \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string + \tl_set:Ne \l__tblr_f_tl{\__tblr_spec_item:ne { hline } { [#1][#2](#3) / @dash }} + % create CSS only when a dash style is set + \tl_if_empty:NF\l__tblr_f_tl{ + % get hline color + \tl_set:Ne \l__tblr_g_tl { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / fg } } + \def\:hlinecolor{\#000000} + % convert color to CSS value if color is set + \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor} + % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here + % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here + \cs_set:ce{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_h_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;} + \Configure{tabularraystyles}{\csname#4:\endcsname} + } +} + +\def\:tblr:vlinestyle#1#2#3#4{ + \tl_set:Ne \l__tblr_t_tl{ \__tblr_spec_item:ne { vline } { [#2](#3) / @vline-width } } + \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string + \tl_set:Ne \l__tblr_f_tl{\__tblr_spec_item:ne { vline } { [#1][#2](#3) / @dash }} + \tl_if_empty:NF\l__tblr_f_tl{ + \tl_set:Ne \l__tblr_g_tl { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / fg } } + \def\:hlinecolor{\#000000} + % convert color to CSS value if color is set + \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor} + % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here + % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here + \cs_set:ce{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_t_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;} + \Configure{tabularraystyles}{\csname#4:\endcsname} + } +} +\ExplSyntaxOff + +\ExplSyntaxOn +\long\def\:tempa#1#2{% +% find columns that are covered by rowspan and colspan + \xdef\HCol{\@arabic\c@colnum} + \xdef\HRow{\@arabic\c@rownum} + \xdef\HMultispan{\lTblrCellColSpanInt} + \xdef\HRowspan{\lTblrCellRowSpanInt} + \let\CellAttributes\@empty + \let\CellStyle\@empty + % calculate ignored cells, if the current cell uses colspan or rowspan + \int_step_inline:nnn{\c@rownum }{\c@rownum - 1 + \lTblrCellRowSpanInt}{ + \int_step_inline:nnn{\c@colnum }{\c@colnum - 1 + \lTblrCellColSpanInt}{ + % the loop always matches the current cell, we must ignore it + \str_if_eq:eeF{\HCol.\HRow}{####1.##1}{% + \cs_gset:cpn{ignoredcell-####1-##1}{} + } + } + } + \cs_if_exist_use:c{tabularray_halign:\g__tblr_cell_halign_tl} + \cs_if_exist_use:c{tabularray_valign:\g__tblr_cell_valign_tl} + % the vertical aligment can be set also in \g__tblr_cell_middle_tl, so we should try it as well + \cs_if_exist_use:c{tabularray_valign:\g__tblr_cell_middle_tl} + % calculate column width + \dim_compare:nNnT {\__tblr_data_item:nen{column}{\HCol}{@col-width}} > {0pt}{ + \__tblr_get_table_width:% initialize \tablewidth + \edef\HColWidth{\fp_eval:n{\__tblr_data_item:nen{column}{\HCol}{@col-width}/\tablewidth*100}\%} + % save table width, preferably in CSS + \a:tabularraycolumnwidth% + } + % there can be multiple hlines for each cell, but we only suport the first one, because of limitations of CSS + \:tblr:hlinestyle{#1}{#2}{1}{border-top} + \int_compare:nNnT{\HRow + \HRowspan - 1} = {\c@rowcount}{% + % draw hline below the last row + \:tblr:hlinestyle{\int_eval:n{\c@rownum + 1}}{#2}{1}{border-bottom} + } + % the same is true for vlines + \:tblr:vlinestyle{#1}{#2}{1}{border-left} + \int_compare:nNnT{\HCol + \HMultispan - 1} = {\c@colcount}{% + % draw hline below the last row + \:tblr:vlinestyle{#1}{\int_eval:n{\c@colnum + 1}}{1}{border-right} + } + % support for the background color + \tl_set:Ne \l__tblr_b_tl + { \__tblr_data_item:neen { cell } {#1} {#2} { background } } + % save background color to the list of CSS, if it is set + \tl_if_empty:NF \l__tblr_b_tl{ + \get:xcolorcss{\l__tblr_b_tl}\:bgcolor + \Configure{tabularraystyles}{background-color: \:bgcolor;} + } + % We can use something like \Configure{tabularrayattributes}{rowspan="\HRowspan"} in \Configure{tabularray} + % to declare correct attributes for joined cells + \int_compare:nNnT {\HRowspan} > {1}{\g:tabularray} + \int_compare:nNnT {\HMultispan} > {1}{\h:tabularray} + \cs_if_exist:cTF{ignoredcell-\the\c@colnum-\the\c@rownum}{% + \a:tabularrayignoredcell\e:tabularray\o:__tblr_build_cell_content:NN:{#1}{#2}\f:tabularray\b:tabularrayignoredcell + }{% + \e:tabularray\o:__tblr_build_cell_content:NN:{#1}{#2}\f:tabularray + } + % the ignored cell is global, so we must undefine it after the thes + \cs_undefine:c{ignoredcell-\the\c@colnum-\the\c@rownum}% +} +\HLet\__tblr_build_cell_content:NN\:tempa + +\HLet\__tblr_get_vcenter_box:N\:gobble + + +\ExplSyntaxOff + +\Hinput{tabularray} +\endinput + diff --git a/29-a11y-table/tblrBasic.tex b/29-a11y-table/tblrBasic.tex new file mode 100644 index 0000000..fb4fcbb --- /dev/null +++ b/29-a11y-table/tblrBasic.tex @@ -0,0 +1,91 @@ +\documentclass{ximera} + +\title{Tables: tblr} + +\begin{document} +\begin{abstract} +\end{abstract} + +\maketitle + +\section{Basic Usage} + +\subsection{A simple table with colspec lcr, textwidth: } + +\begin{center} +\begin{tblr}{ + colspec = {lcr}, + rowhead=1, +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG +Left aligned & Centered & Right aligned \\ +% \midrule +Some text & More text & Final text \\ +Math $x^2$ & \textbf{Bold text} & \textit{Italic text} \\ +%\bottomrule +\end{tblr} +\end{center} + +\subsection{Another table: } + +\begin{center} +\begin{tblr}{ + width=\linewidth, + rowhead=1, + colspec = { + X[t,l,wd=3cm] % max 3.cm + Q[t,c] % fixed + X[t,r,wd=3cm] % max 3cm + X[t,l] % stretchable + }, + row{1} = {font=\bfseries}, + column{2} = {font=\itshape}, % Italic text in 2nd column + rowsep = 6pt, +% hlines, %% THIS CAUSES COMPILATION TO HANG +% vlines, %% THIS CAUSES COMPILATION TO HANG +} +Top aligned, left aligned & Top aligned, centered (italic) & Top aligned, right aligned & Top-left regular \\ +\SetCell[r=2]{t,l}Multirow: top-left aligned & \SetCell[r=2]{t,c}Multirow: top-centered (italic) & \SetCell[c=2]{t,l}Multicolumn: top-left aligned over 2 cols & \\ +Bottom aligned, left aligned & Center aligned (italic) & Right aligned & Bottom-left regular \\ +\end{tblr} +\end{center} + +\subsection{One more table:} + +\begin{center} +\begin{tblr}{ + colspec = {Q[l] Q[c] Q[r] Q[l]}, % Q = flexible column, with alignment + rowhead = 1, + row{1} = {font=\bfseries}, % make header bold + column{2} = {font=\itshape}, % italicize second column + column{3} = {halign=center}, % center-align 3rd column + rowsep = 4pt, +% hlines, +% vlines, +} +Name & Role & Age & Remarks \\ +Alice & Developer & 30 & Works remotely \\ +Bob & Designer & 27 & \SetCell[r=2]{c}On leave \\ +Charlie & \SetCell[c=2]{l}Intern (UI + UX) & & \\ +Diana & Project Manager & 34 & Full time \\ +\end{tblr} +\end{center} + +\subsection{A simple table with colspec X: } + +\begin{tblr}{ + colspec = {X[l]X[c]X[r]}, +% rowhead=1, +% width = \textwidth +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG +Left aligned & Centered & Right aligned \\ +% \midrule +Some text & More text & Final text \\ +%\bottomrule +\end{tblr} + + +\end{document} \ No newline at end of file diff --git a/29-a11y-table/tblrBasic_article.tex b/29-a11y-table/tblrBasic_article.tex new file mode 100644 index 0000000..e42fbe5 --- /dev/null +++ b/29-a11y-table/tblrBasic_article.tex @@ -0,0 +1,92 @@ +\documentclass{article} +\usepackage{xcolor} +\usepackage{tabularray} +\UseTblrLibrary{booktabs} % Optional, for \toprule etc. + +\title{Tables: tblr (with 'article')} + +\begin{document} + +\maketitle + +\section{Basic Usage} + +\subsection{A simple table with colspec lcr, textwidth: } + +\begin{center} +\begin{tblr}{ + colspec = {lcr}, + rowhead=1, +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG +Left aligned & Centered & Right aligned \\ +% \midrule +Some text & More text & Final text \\ +Math $x^2$ & \textbf{Bold text} & \textit{Italic text} \\ +%\bottomrule +\end{tblr} +\end{center} + +\subsection{Another table: } + +\begin{center} +\begin{tblr}{ + width=\linewidth, + rowhead=1, + colspec = { + X[t,l,wd=3cm] % max 3.cm + Q[t,c] % fixed + X[t,r,wd=3cm] % max 3cm + X[t,l] % stretchable + }, + row{1} = {font=\bfseries}, + column{2} = {font=\itshape}, % Italic text in 2nd column + rowsep = 6pt, +% hlines, %% THIS CAUSES COMPILATION TO HANG +% vlines, %% THIS CAUSES COMPILATION TO HANG +} +Top aligned, left aligned & Top aligned, centered (italic) & Top aligned, right aligned & Top-left regular \\ +\SetCell[r=2]{t,l}Multirow: top-left aligned & \SetCell[r=2]{t,c}Multirow: top-centered (italic) & \SetCell[c=2]{t,l}Multicolumn: top-left aligned over 2 cols & \\ +Bottom aligned, left aligned & Center aligned (italic) & Right aligned & Bottom-left regular \\ +\end{tblr} +\end{center} + +\subsection{One more table:} + +\begin{center} +\begin{tblr}{ + colspec = {Q[l] Q[c] Q[r] Q[l]}, % Q = flexible column, with alignment + rowhead = 1, + row{1} = {font=\bfseries}, % make header bold + column{2} = {font=\itshape}, % italicize second column + column{3} = {halign=center}, % center-align 3rd column + rowsep = 4pt, +% hlines, +% vlines, +} +Name & Role & Age & Remarks \\ +Alice & Developer & 30 & Works remotely \\ +Bob & Designer & 27 & \SetCell[r=2]{c}On leave \\ +Charlie & \SetCell[c=2]{l}Intern (UI + UX) & & \\ +Diana & Project Manager & 34 & Full time \\ +\end{tblr} +\end{center} + +\subsection{A simple table with colspec X:} + +\begin{tblr}{ + colspec = {X[l]X[c]X[r]}, +% rowhead=1, +% width = \textwidth +} +%\toprule %% THIS CAUSES COMPILATION TO HANG +%\hline %% THIS CAUSES COMPILATION TO HANG +Left aligned & Centered & Right aligned \\ +% \midrule +Some text & More text & Final text \\ +%\bottomrule +\end{tblr} + + +\end{document} \ No newline at end of file diff --git a/29-a11y-table/ximera.cfg b/29-a11y-table/ximera.cfg new file mode 100644 index 0000000..68d11f8 --- /dev/null +++ b/29-a11y-table/ximera.cfg @@ -0,0 +1,219 @@ +%% +%% This is file `ximera.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ximera.dtx (with options: `cfgXimera') +%% src/pagesetup.dtx (with options: `cfgXimera') +%% src/packages.dtx (with options: `cfgXimera') +%% src/jax.dtx (with options: `cfgXimera') +%% src/sectioning.dtx (with options: `cfgXimera') +%% src/title.dtx (with options: `cfgXimera') +%% src/abstract.dtx (with options: `cfgXimera') +%% src/image.dtx (with options: `cfgXimera') +%% src/outcomes.dtx (with options: `cfgXimera') +%% src/textcolor.dtx (with options: `cfgXimera') +%% src/verbatim.dtx (with options: `cfgXimera') +%% src/html.dtx (with options: `cfgXimera') +%% src/ending.dtx (with options: `cfgXimera') +%% ------------:| ------------------------------------------------------------ +%% ximera:| Simultaneously writing print and online interactive materials +%% Author:| Jim Fowler and Oscar Levin and Jason Nowell and Wim Obbels and Hans Parshall and Bart Snapp +%% E-mail:| bart.snapp@gmail.com +%% License:| Released under the LaTeX Project Public License v1.3c or later +%% See:| http://www.latex-project.org/lppl.txt +%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\Preamble{xhtml,mathjax} + +\ExplSyntaxOn +% Get the value of rowhead key and save it in the \lTblrRowHeadInt for later use +\def\:setrowhead{ + \int_set:Nn \lTblrRowHeadInt + { \__tblr_prop_item:ne { inner } { rowhead } + 0 } +} +% Get the value of xmcolhead key and save it in the \lTblrColHeadInt for later use +\def\:setcolhead{ + \int_set:Nn \lTblrColHeadInt + { \__tblr_prop_item:ne { inner } { xmcolhead } + 0 } +} +% print either th or td, depending on the value of \lTblrRowHeadInt or \lTblrColHeadInt +\def\:celltypeC{\int_compare:nTF{\int_value:w\lTblrColHeadInt>=\HCol}{th \space scope="row"}{td}} +\def\:celltype{\int_compare:nTF{\int_value:w\lTblrRowHeadInt>=\HRow}{th \space scope="col"}{td}} +\def\:testcell{\int_case:nnF { ( \HCol - \lTblrColHeadInt + 1) + 100 * (\HRow - \lTblrRowHeadInt + 1)} +{ + { 102 } { th \space scope="col" } + { 201 } { th \space scope="row" } + { 103 } { th \space scope="col" } + { 301 } { th \space scope="row" } + { 104 } { th \space scope="col" } + { 401 } { th \space scope="row" } +} +{ td }} +\ExplSyntaxOff + +% this is the configuration for the tabularray package with the support for +\catcode`\:=11 +\makeatletter +\Configure{tabularray}{% + \ifvmode\IgnorePar\fi\EndP% + \gHAdvance\Next:TableNo by 1 \global\let\TableNo=\Next:TableNo% + \HCode{} +}{\ifvmode\IgnorePar\fi\EndP\HCode{
}} +{\:setrowhead\HCode{}}{\HCode{}} +{\:setcolhead\HCode{<\:testcell\space id="cell\TableNo-\HRow-\HCol" style="\CellStyle" \CellAttributes>}}{\HCode{}} +{\Configure{tabularrayattributes}{rowspan="\HRowspan"}} +{\Configure{tabularrayattributes}{colspan="\HMultispan"}}{} +\catcode`\:=12 +\makeatother + + + + +\NoFonts + + + + +\Configure{@HEAD}{\HCode{\Hnewline}} +\Configure{@HEAD}{\HCode{\Hnewline}} +\Configure{@HEAD}{\HCode{\Hnewline}} + + +\catcode`\%=11 +\Configure{@BODY}{\HCode{\Hnewline}} +\catcode`\%=14 + + + +\Configure{BVerbatimInput}{}{}{}{} + +\Configure{verbatiminput}{}{}{}{} + +\makeatletter +\def\FV@Space{\space} +\makeatother + +\Configure{BODY}{% +\HCode{\Hnewline}% +\Tg
% +%% 202501: removed .jax inclusion (see luaxake) + +%% Include the .ids file +\IfFileExists{\jobname.ids}{\HCode{\Hnewline}% +}{} +\Tg
% +}{% +\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline}% +} + + +\ScriptEnv{matlabEquation}{\ifvmode \IgnorePar\fi \EndP\HCode{}} + +\renewcommand{\paragraph}[1]{% + \HCode{}% + #1% + \HCode{}\par\IgnorePar} +\renewcommand{\subparagraph}[1]{% + \HCode{}% + #1% + \HCode{}\par\IgnorePar} + +\ifvmode\IgnorePar\fi\EndP +\ConfigureEnv{abstract}{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline
}\par}{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline
}\par}{}{} +%% Although we accept many formats, SVG is preferred on the web. +%% Since we have a different mechanism for producing |alt| text, we +%% want to ignore tex4ht's own method fo producing alt text. +%% 2024: is now in TeX4ht ... +\ifcsname ifstandalone\endcsname + \ifstandalone + \renewcommand\includegraphics[2][]{} + \fi +\renewcommand{\outcome}[1]{ + \Configure{@HEAD}{\HCode{\Hnewline}} +} +\IfFileExists{\jobname.oc}{\input{\jobname.oc}}{} + +\renewcommand{\outcome}[1]{% + \HCode{#1} +} +\makeatletter +\Configure{textcolor}{\HCode{}}{\HCode{}} +\let\oldtextcolor\textcolor + +\renewcommand\textcolor[2]{% + % we need to convert the current color to hexadecimal form usable in the style attribute + % the \tsf@color macro is used in the \Configure{textcolor} configuration to insert the + % CSS color + \extractcolorspec{#1}{\tsf@color}% + \expandafter\convertcolorspec\tsf@color{HTML}\tsf@color% + % call the original command + \oldtextcolor{#1}{#2}% +}% +\makeatother +\renewenvironment{javascriptCode}{\NoFonts}{\EndNoFonts} +\ScriptEnv{javascriptCode}{\stepcounter{identification}\ifvmode \IgnorePar\fi \EndP\HCode{
}} +%%% On the web, translate verbatim and lstlisting blocks into |
|
+%%% elements.
+%%%    \begin{macrocode}
+%%%<*cfgXimera>
+%%\ConfigureEnv{verbatim}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{}
+%%\ConfigureEnv{lstlisting}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{}
+%%%
+%%%    \end{macrocode}
+\Configure{textbf}{\ifvmode\ShowPar\fi\HCode{}}{\HCode{}}
+\Configure{textit}{\ifvmode\ShowPar\fi\HCode{}}{\HCode{}}
+\Configure{emph}{\ifvmode\ShowPar\fi\HCode{}}{\HCode{}}
+\Configure{texttt}{\ifvmode\ShowPar\fi\HCode{}}{\HCode{}}
+
+
+\begin{document}
+\EndPreamble
+%% 
+%% Copyright (C) 2024 by Bart Snapp  and Jim Fowler 
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version.  The latest version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Bart Snapp. The source code can be found at:
+%% 
+%% https://github.com/XimeraProject/ximeraLatex
+%% 
+%% This work consists of the file ximera.dtx, the associated files
+%% under src/, and a Makefile.
+%% 
+%% Running "make" generates the derived files README, ximera.pdf, ximera.cls, xourse.cls.
+%% 
+%% Running "make inst" installs the files in the user's TeX tree.
+%% 
+%% Running "make install" installs the files in the local TeX tree.
+%% 
+%%
+%% End of file `ximera.cfg'.
diff --git a/29-a11y-table/xmPreamble.tex b/29-a11y-table/xmPreamble.tex
new file mode 100644
index 0000000..678d03d
--- /dev/null
+++ b/29-a11y-table/xmPreamble.tex
@@ -0,0 +1,7 @@
+\usepackage{tabularray}
+\UseTblrLibrary{booktabs} % Optional, for \toprule etc.
+
+%% must load tabularray first 
+\usepackage{TailorSwiftBotPublic}
+
+\usepackage{xcolor}
diff --git a/29-a11y-table/xourse..tex b/29-a11y-table/xourse..tex
new file mode 100644
index 0000000..5bd1dab
--- /dev/null
+++ b/29-a11y-table/xourse..tex
@@ -0,0 +1,21 @@
+\documentclass{xourse}
+\UseTblrLibrary{booktabs} % Optional, for \toprule etc.
+
+\title{Test: Tables}
+
+\begin{document}
+\maketitle
+
+\activity{./tabularBasic}
+\begin{onlineOnly}
+    \activity{./tabularBasic_article}
+\end{onlineOnly}
+% \begin{onlineOnly}
+%     \activity{../table/tableBase_css}     %% DOES NOT WORK: only xourse-level .css files
+% \end{onlineOnly}
+\activity{./tblrBasic}
+\ifonline
+    \activity{./tblrBasic_article}
+\fi
+
+\end{document}
\ No newline at end of file
diff --git a/29-a11y-table/xourse.tex b/29-a11y-table/xourse.tex
new file mode 100644
index 0000000..7fe9edc
--- /dev/null
+++ b/29-a11y-table/xourse.tex
@@ -0,0 +1,12 @@
+\documentclass{xourse}
+
+\title{Tests: a11y}
+
+
+\begin{document}
+\maketitle
+
+\activity{./Tables_Testing.tex}
+
+
+\end{document}
diff --git a/README.md b/README.md
index 1965836..f15f614 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,169 @@
-This repo contains basic examples of Ximera constructs that can be used as
-* demo
-* tests
+This Repo contains the master testbed for Ximera development. 
+It also contains minimal examples and syntax for the Ximera commands, environments, etc. 
+However, for a much in-depth treatment of Ximera commands, environments, etc you should
+refer to the Ximera manual, which explains things in more detail and in a more user friendly way.
+
+# General Structure and Intent of this Repo
+
+* **This Repo (will eventually be) structured as follows...**
+
+- depreciated (for content that is being removed in a future release, see README in folder)
+    - (DTXFileName)Test.tex files (e.g. problemTest.tex)
+- testFiles
+    -compositeTestFiles (for tests of interactions between different dtx file contents, see README in folder.)
+        -subfolder named to explain composite testing case.
+    -dtxTestFiles (for individual dtx file testbeds, see README in folder.)
+        - (Command/Env) folder; a folder for each testable command/enviroment/etc. (e.g. ''problem'' folder)
+            - base.tex file (basic usage implementation/info)
+            - (Additional Testing Feature).tex (e.g. nesting.tex or numbering.tex in the problem folder)
+- testXourses (xourse files to lode relevant test files, see README in folder)
+    - compositeTestXourses (xourses for testing interactions between different dtx files)
+    - dtxTestXourses (xourses for testing individual dtx file contents)
+        - (dtxFileName)Test.tex is the xourse that tests (dtxFileName) dtx file.
+        - Includes hard coded non-tested content so it is easy to verify all non-depreciated dtx has been parsed.
+
+* **testFiles Folder at a glance**
+The testFiles folder is the folder that contains all the actual test ximera document class files
+that are loaded and used for demo/testing. There are two subfolders in this folder.
+1) The dtxTestFiles are the files that test individual dtx files to verify the integrity of all
+the elements within that specific dtx file.
+2) The compositeTestFiles subfolder is for files that test the integrity of elements that span
+and/or interact between different dtx files.
+
+* **testXourses Folder at a glance**
+The testXourses is the location of all the xourse files. There are two subfolders;
+1) The first subfolder is the dtxTestXourses subfolder. It is a subfolder for xourses that are
+tests for each of the dtx files, these xourses should load all the relevant test files to verify
+the functionality of all the elements that are touched by that dtx file.
+2) The other subfolder is the compositeTestXourses folder, which are xourses that load all the relevant 
+tests to verify the integrity of how elements in different dtx files interact with each other. These
+should load each of the relevant test files in the corresponding compositeTestFiles subfolder
+of the testFiles folder.
+
+
+
+
+# Naming Schemes
+
+* **Each test xourse in the testXourses/dtxTestXourses is named after a dtx file.**
+Since all development work must be implemented via dtx file (as per CTAN standards) and most development work
+tends to involve only a few dtx files (usually just one or two), it is often easiest to test the new code by testing
+everything that is implemented by the newly changed dtx code. This testing bed makes that easy to accomplish by merely
+pulling up the relevant dtxTestXourse(s) and loading thetest bed xourse(s) that correspond to your changed dtx file.
+These in turn load all the relevant testFiles that correspond to the individual elements implemented by that dtx file
+i.e. each command/environment (or reasonably obvious groupings, like all ``\newtheorem`` generated environments are
+in the same place) has its own testing tile, making it relatively easy to investigate updated content, even inside a given dtx.
+Thus **Each dtxTestXourse should be named  (dtxFileName)Test.tex** e.g. ''abstractTest.tex'' for the ''abstract.dtx'' file.
+
+* **Each tested command/env/etc has a file in the relevant (subfolder) of the dtxTestFiles Folder**
+Each command/environment/etc (referred to as ``element``) that is implemented in a dtx should have its own testFile 
+in that dtxTestFiles subfolder, named after the relevant element. This should demo/test the most basic form of the 
+element.
+However, often there are a number of options, or other elements for whatever is being tested that also need a demo/test.
+We don't want to have a single test file that contains all the various complexities of these things,
+as it becomes difficult to see what aspect ended up generating issues (if there are issues from testing).
+Thus test files should have the ''base.tex'' file that is the minimal implementation of the tested item, and then various
+other files that demo/test the other relevant aspects, each named after whatever it tests (e.g. ''numbering'' or ''nesting''
+for demo/testing the numbering scheme and nesting behavior inside the problem subfolder in the testFiles folder.).
+
+* **When Preambles are Necessary**
+Some specific test files/xourses need to load specific options or alternative files as part of their
+testing (e.g. the graphics testing file needs to input graphics, and set graphics paths in the preamble). When this is
+necessary, **do note use the xmpreamble** for the test repo - instead you should make a preamble with the relevant test
+file (or xourse as appropriate) name, appended with ''preamble'' - e.g. ''imagePreamble.tex'' is the preamble file
+for the image.tex test file.
+Similarly, some specific elements have (intended) different behavior depending on server source (e.g. UF, OSU, KL, etc).
+In this case, you should add another test file with the intended behavior specific to the server source, and append the
+server name/code to the test file. For example, if OSU has intended behavior that differs from ximera base for hints,
+then there should be a ''hintsOSU'' or possibly a ''hintsBaseOSU'' as appropriate.
+
+* **Example of Intended Naming Scheme:** 
+To demonstrate the intended naming scheme, consider the problem-like environments. The thing being tested is the ''problem''
+environment, so all tests go into a ''problem'' folder inside the testFiles folder. We need the base case that
+demo/tests the very bare implementation of the problem like environments - but it also requires a test for how problem
+numbering is handled, and a test for how nesting problems is handled. Thus there should be three test files inside the problem
+subfolder of the testFiles folder; problemBase.tex, problemNesting.tex, and problemNumbering.tex. 
+each is a ximera documentclass that is demoing/testing the basic implementation, nesting behavior, 
+and numbering scheme respectivvely. These are in turn loaded by the
+''problemTest.tex'' file, which is the xourse documentclass that loads the content generated in the problem.dtx file.
+So just the ''problem'' related files would be in the structure as follows:
+- testXourses
+    - problemTest.tex
+- testFiles
+    - problem
+        - base.tex file (basic usage implementation/info)
+        - nesting.tex (demo/test for nesting behavior)
+        - numbering.tex (demo/test for numbering scheme)
+
+# Creating a New Test File
+If you have determined a meaningful test case that has no appropriate test file, you can do the following;
+1) You should post the issue on the github issues tab of the example repo (**NOT** the ximeraLatex repo!) with
+a detailed explanation of what you need to test - make sure to highlight exactly the things that need to be
+tested that are not currently testable using the existing test files. In other words, make sure to include:
+    - What is currently not able to be tested using existing test files.
+    - What specifically you are trying to test overall (in the case that the part that is `untestable` is 
+    only a piece of what you are trying to test overall).
+    - Why you are trying to test and/or what you are trying to change about Ximera that needs testing.
+2) Next - if you are able, you should make a branch of the main examples repo, and write your new test file. 
+Once you have the new test file written (and tested) and think it is ready to be merged, submit a pull request 
+with an explanation of what and how you are going about testing the thing you are submitting a new file for,
+along with a reference to the github issue in the examples repo that you submitted from part 1. This will
+allow another developer to quickly and easily review the file for submission and then merge it.
+    - As a general rule, a different developer (than the author of the new file) should review/merge 
+    a new test file for safety.
+    - New test files should be verified to make sure they are necessary, suitably succinct in their testing,
+    and conform to the various naming and design requirements listed in this readme.
+    - Once the merge has been completed, whomever reviewed the test file and merged the new test file into
+    the master test repo *must* be the one to close the github issue. This will help with quickly referencing
+    who did what if there are any issues later on or if someone needs to verify something (helps minimize
+    digging through the commit history).
+
+# Non-Testable dtx Files Explained
+
+Each dtx file should have its own test xourse that loads the relevant test files. However, pending a reorganization
+of dtx files and their content, there are currently many dtx files that do not contain any testable commands or environments
+(for example, the banner.dtx file is just the ascii definition of the banner that displays in the console on page load).
+Nonetheless it is important to know that a given dtx file has been parsed and any necessary content have relevant test files.
+So we still make test files for non-testable dtx files (e.g. BannerTest.tex) but place that file in a special top-level folder
+called ''untestedDTX'' which contains two different types of non-tested files. There are depreciated dtx files - those dtx
+files whose contents will be removed in an upcoming ximera version and so tests aren't needed (these are separated into
+a 'depreciated' folder inside the untestedDTX folder) as well as the dtx files that do not contain anything that can/need
+be tested (like the banner.dtx) - test files for these are put in the ''hardCoded'' subfolder of the untestedDTX folder.
+
+
+# Public Publishing Locations
+
+Content from this repo is published publically for others to see, and link to. This is mostly as a quick-ref demo resource
+for authors, but can be used by anyone - it is publically available after all. You can find these servers here:
 
-The main branch is published 
  * at [KU Leuven](https://set-p-dsb-zomercursus-latest.cloud-ext.icts.kuleuven.be/ximeraexamples/coreXimeraFeatures/environments/theoremEnvironments).
  * at [OSU](https://ximera.osu.edu/ximeraexamples).
 
 Note you can always get the TeX-code by appending .tex to the URL of an activity.
 
 
-A more detailed description of how to use this repo for testing is in the [README_testing](README_testing.md)
+
+
+# Notes from talking with Wim
+
+1) Make a ``global testing files`` type subfolder in the testFiles folder for test files that are designed
+to test more global interactions - not things that are contianed within a single dtx file.
+For example, the label/ref interactions with certain environments like theorems or problems; or 
+complicated ToC implementation with nesting sections/subsections and chapterstyle/sectionstyle commands.
+
+
+
 
diff --git a/depreciated/accordionTest.tex b/dtxTests/Deprecated/accordionTest.tex
similarity index 100%
rename from depreciated/accordionTest.tex
rename to dtxTests/Deprecated/accordionTest.tex
diff --git a/depreciated/depreciated.tex b/dtxTests/Deprecated/depreciated.tex
similarity index 100%
rename from depreciated/depreciated.tex
rename to dtxTests/Deprecated/depreciated.tex
diff --git a/depreciated/gradedTest.tex b/dtxTests/Deprecated/gradedTest.tex
similarity index 100%
rename from depreciated/gradedTest.tex
rename to dtxTests/Deprecated/gradedTest.tex
diff --git a/depreciated/includeTest.tex b/dtxTests/Deprecated/includeTest.tex
similarity index 100%
rename from depreciated/includeTest.tex
rename to dtxTests/Deprecated/includeTest.tex
diff --git a/depreciated/leashTest.tex b/dtxTests/Deprecated/leashTest.tex
similarity index 100%
rename from depreciated/leashTest.tex
rename to dtxTests/Deprecated/leashTest.tex
diff --git a/depreciated/tikzexportTest.tex b/dtxTests/Deprecated/tikzexportTest.tex
similarity index 100%
rename from depreciated/tikzexportTest.tex
rename to dtxTests/Deprecated/tikzexportTest.tex
diff --git a/depreciated/ungradedTest.tex b/dtxTests/Deprecated/ungradedTest.tex
similarity index 100%
rename from depreciated/ungradedTest.tex
rename to dtxTests/Deprecated/ungradedTest.tex
diff --git a/depreciated/xkcdTest.tex b/dtxTests/Deprecated/xkcdTest.tex
similarity index 100%
rename from depreciated/xkcdTest.tex
rename to dtxTests/Deprecated/xkcdTest.tex
diff --git a/dtxTests/Hardcoded/README.md b/dtxTests/Hardcoded/README.md
new file mode 100644
index 0000000..a3b38de
--- /dev/null
+++ b/dtxTests/Hardcoded/README.md
@@ -0,0 +1,16 @@
+# Intent/Summary of This Folder
+This folder will a xourse file for each dtx file in the ximera package,
+named after that dtx folder. This is for testing changes whose impact
+is expected to be within a specific dtx file (e.g. changing how the
+problem-like environments are rendered should only impact the problem.dtx
+file). 
+
+# Organization Scheme
+Each file in this folder should have the name of a dtx file from the 
+ximera package, appended with ``Test``, e.g. the ``hints.dtx`` file in
+the ximera package is associated with the ``hintsTest.tex`` xourse file
+in this folder. This allows developers to test changes that are only
+expected to impact single dtx file contents.
+For changes that are expected to impact how contents of *different*
+dtx files interrelate (e.g. label/ref across various environments) devs
+should use the xoure files found in the compositeTestXourses folder.
diff --git a/hardCoded/bannerTest.tex b/dtxTests/Hardcoded/bannerTest.tex
similarity index 65%
rename from hardCoded/bannerTest.tex
rename to dtxTests/Hardcoded/bannerTest.tex
index f3f82f6..3b77ed4 100644
--- a/hardCoded/bannerTest.tex
+++ b/dtxTests/Hardcoded/bannerTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/endingTest.tex b/dtxTests/Hardcoded/endingTest.tex
similarity index 65%
rename from hardCoded/endingTest.tex
rename to dtxTests/Hardcoded/endingTest.tex
index 0ce7235..5c2e0b6 100644
--- a/hardCoded/endingTest.tex
+++ b/dtxTests/Hardcoded/endingTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{depreciated}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/enumerateTest.tex b/dtxTests/Hardcoded/enumerateTest.tex
similarity index 65%
rename from hardCoded/enumerateTest.tex
rename to dtxTests/Hardcoded/enumerateTest.tex
index bf77ade..75773a4 100644
--- a/hardCoded/enumerateTest.tex
+++ b/dtxTests/Hardcoded/enumerateTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/htmlTest.tex b/dtxTests/Hardcoded/htmlTest.tex
similarity index 64%
rename from hardCoded/htmlTest.tex
rename to dtxTests/Hardcoded/htmlTest.tex
index aeb4a1e..2e31f8d 100644
--- a/hardCoded/htmlTest.tex
+++ b/dtxTests/Hardcoded/htmlTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/hyperrefTest.tex b/dtxTests/Hardcoded/hyperrefTest.tex
similarity index 65%
rename from hardCoded/hyperrefTest.tex
rename to dtxTests/Hardcoded/hyperrefTest.tex
index 345a4f0..369d696 100644
--- a/hardCoded/hyperrefTest.tex
+++ b/dtxTests/Hardcoded/hyperrefTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/jaxTest.tex b/dtxTests/Hardcoded/jaxTest.tex
similarity index 64%
rename from hardCoded/jaxTest.tex
rename to dtxTests/Hardcoded/jaxTest.tex
index ff9d4c3..942b631 100644
--- a/hardCoded/jaxTest.tex
+++ b/dtxTests/Hardcoded/jaxTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/labelsTest.tex b/dtxTests/Hardcoded/labelsTest.tex
similarity index 65%
rename from hardCoded/labelsTest.tex
rename to dtxTests/Hardcoded/labelsTest.tex
index c8bde37..370481a 100644
--- a/hardCoded/labelsTest.tex
+++ b/dtxTests/Hardcoded/labelsTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/logosTest.tex b/dtxTests/Hardcoded/logosTest.tex
similarity index 64%
rename from hardCoded/logosTest.tex
rename to dtxTests/Hardcoded/logosTest.tex
index 00b1e7a..e21e47f 100644
--- a/hardCoded/logosTest.tex
+++ b/dtxTests/Hardcoded/logosTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/macrosTest.tex b/dtxTests/Hardcoded/macrosTest.tex
similarity index 65%
rename from hardCoded/macrosTest.tex
rename to dtxTests/Hardcoded/macrosTest.tex
index 8eab158..1ca94dd 100644
--- a/hardCoded/macrosTest.tex
+++ b/dtxTests/Hardcoded/macrosTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/makeCounterTest.tex b/dtxTests/Hardcoded/makeCounterTest.tex
similarity index 66%
rename from hardCoded/makeCounterTest.tex
rename to dtxTests/Hardcoded/makeCounterTest.tex
index 3dede16..4507402 100644
--- a/hardCoded/makeCounterTest.tex
+++ b/dtxTests/Hardcoded/makeCounterTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/optionsTest.tex b/dtxTests/Hardcoded/optionsTest.tex
similarity index 63%
rename from hardCoded/optionsTest.tex
rename to dtxTests/Hardcoded/optionsTest.tex
index c721ec4..7547543 100644
--- a/hardCoded/optionsTest.tex
+++ b/dtxTests/Hardcoded/optionsTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/placeHolder}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/optionsxourseTest.tex b/dtxTests/Hardcoded/optionsxourseTest.tex
similarity index 63%
rename from hardCoded/optionsxourseTest.tex
rename to dtxTests/Hardcoded/optionsxourseTest.tex
index 958af6c..95cb7e8 100644
--- a/hardCoded/optionsxourseTest.tex
+++ b/dtxTests/Hardcoded/optionsxourseTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/placeHolder}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/packagesTest.tex b/dtxTests/Hardcoded/packagesTest.tex
similarity index 65%
rename from hardCoded/packagesTest.tex
rename to dtxTests/Hardcoded/packagesTest.tex
index 5fcd2f2..2b22535 100644
--- a/hardCoded/packagesTest.tex
+++ b/dtxTests/Hardcoded/packagesTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/pagesetupTest.tex b/dtxTests/Hardcoded/pagesetupTest.tex
similarity index 65%
rename from hardCoded/pagesetupTest.tex
rename to dtxTests/Hardcoded/pagesetupTest.tex
index 3788a2d..a3d044f 100644
--- a/hardCoded/pagesetupTest.tex
+++ b/dtxTests/Hardcoded/pagesetupTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/preambleTest.tex b/dtxTests/Hardcoded/preambleTest.tex
similarity index 65%
rename from hardCoded/preambleTest.tex
rename to dtxTests/Hardcoded/preambleTest.tex
index 6eaa976..9e9c3ca 100644
--- a/hardCoded/preambleTest.tex
+++ b/dtxTests/Hardcoded/preambleTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/sectioningTest.tex b/dtxTests/Hardcoded/sectioningTest.tex
similarity index 65%
rename from hardCoded/sectioningTest.tex
rename to dtxTests/Hardcoded/sectioningTest.tex
index 669415b..c82ae3c 100644
--- a/hardCoded/sectioningTest.tex
+++ b/dtxTests/Hardcoded/sectioningTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/suppressTest.tex b/dtxTests/Hardcoded/suppressTest.tex
similarity index 65%
rename from hardCoded/suppressTest.tex
rename to dtxTests/Hardcoded/suppressTest.tex
index b0e7427..ed5f949 100644
--- a/hardCoded/suppressTest.tex
+++ b/dtxTests/Hardcoded/suppressTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/utilityMacrosTest.tex b/dtxTests/Hardcoded/utilityMacrosTest.tex
similarity index 66%
rename from hardCoded/utilityMacrosTest.tex
rename to dtxTests/Hardcoded/utilityMacrosTest.tex
index 6090755..05b337d 100644
--- a/hardCoded/utilityMacrosTest.tex
+++ b/dtxTests/Hardcoded/utilityMacrosTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/verbatimTest.tex b/dtxTests/Hardcoded/verbatimTest.tex
similarity index 65%
rename from hardCoded/verbatimTest.tex
rename to dtxTests/Hardcoded/verbatimTest.tex
index f498a70..7cc2cdb 100644
--- a/hardCoded/verbatimTest.tex
+++ b/dtxTests/Hardcoded/verbatimTest.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
 
 
 \end{document}
\ No newline at end of file
diff --git a/dtxTests/README.md b/dtxTests/README.md
new file mode 100644
index 0000000..da17973
--- /dev/null
+++ b/dtxTests/README.md
@@ -0,0 +1,15 @@
+# Intent/Summary of This Folder
+This folder is intended to have the test files that (completely) test the
+individual dtx files in isolation. These are likely to be the most used/important
+test files as development is *usually* isolated to individual dtx files,
+rather than more sweeping composite changes that impact many different types
+of files simultaneously. 
+
+# Organization Scheme
+This folder should mirror the dtx structure of the ximera package, so that
+one can find the dtx file to test by tracing the same folder pathway as the
+dtx file that they were editing. The only difference is that the dtx file
+in the ximera package is now a folder, as individual dtx files can have
+several different test files to account for several testing aspects within
+that test file (e.g. the problem.dtx has base.tex, numbering.tex and
+nesting.tex testing files).
\ No newline at end of file
diff --git a/testXourses/testFiles/abstract.tex b/dtxTests/abstract/base.tex
similarity index 100%
rename from testXourses/testFiles/abstract.tex
rename to dtxTests/abstract/base.tex
diff --git a/testXourses/abstractTest.tex b/dtxTests/abstract/xourse.tex
similarity index 76%
rename from testXourses/abstractTest.tex
rename to dtxTests/abstract/xourse.tex
index 12722b0..8d4b0a3 100644
--- a/testXourses/abstractTest.tex
+++ b/dtxTests/abstract/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/abstract}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/activity.tex b/dtxTests/activity/base.tex
similarity index 100%
rename from testXourses/testFiles/activity.tex
rename to dtxTests/activity/base.tex
diff --git a/testXourses/testFiles/activityNoTitle.tex b/dtxTests/activity/noTitle.tex
similarity index 100%
rename from testXourses/testFiles/activityNoTitle.tex
rename to dtxTests/activity/noTitle.tex
diff --git a/testXourses/testFiles/practice.tex b/dtxTests/activity/practice.tex
similarity index 100%
rename from testXourses/testFiles/practice.tex
rename to dtxTests/activity/practice.tex
diff --git a/testXourses/activityTest.tex b/dtxTests/activity/xourse.tex
similarity index 53%
rename from testXourses/activityTest.tex
rename to dtxTests/activity/xourse.tex
index 07454c1..83058c6 100644
--- a/testXourses/activityTest.tex
+++ b/dtxTests/activity/xourse.tex
@@ -6,9 +6,9 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/activity}
-\practice{testFiles/practice}
-\activity{testFiles/activityNoTitle}
+\activity{./base}
+\practice{./practice}
+\activity{./noTitle}
 
 
 
diff --git a/testXourses/testFiles/answerBase.tex b/dtxTests/answer/base.tex
similarity index 100%
rename from testXourses/testFiles/answerBase.tex
rename to dtxTests/answer/base.tex
diff --git a/testXourses/testFiles/answerOptionals.tex b/dtxTests/answer/optionals.tex
similarity index 100%
rename from testXourses/testFiles/answerOptionals.tex
rename to dtxTests/answer/optionals.tex
diff --git a/testXourses/answerTest.tex b/dtxTests/answer/xourse.tex
similarity index 57%
rename from testXourses/answerTest.tex
rename to dtxTests/answer/xourse.tex
index 244fa05..e89d03b 100644
--- a/testXourses/answerTest.tex
+++ b/dtxTests/answer/xourse.tex
@@ -6,8 +6,8 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/answerBase}
-\activity{testFiles/answerOptionals}
+\activity{./base}
+\activity{./optionals}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/choiceBase.tex b/dtxTests/choice/base.tex
similarity index 100%
rename from testXourses/testFiles/choiceBase.tex
rename to dtxTests/choice/base.tex
diff --git a/testXourses/choiceTest.tex b/dtxTests/choice/xourse.tex
similarity index 74%
rename from testXourses/choiceTest.tex
rename to dtxTests/choice/xourse.tex
index 5471090..6050829 100644
--- a/testXourses/choiceTest.tex
+++ b/dtxTests/choice/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/choiceBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/clearHideEnv.tex b/dtxTests/clearHideEnv/base.tex
similarity index 100%
rename from testXourses/testFiles/clearHideEnv.tex
rename to dtxTests/clearHideEnv/base.tex
diff --git a/testXourses/clearEnvTest.tex b/dtxTests/clearHideEnv/xourse.tex
similarity index 75%
rename from testXourses/clearEnvTest.tex
rename to dtxTests/clearHideEnv/xourse.tex
index 79ec6e9..19aac7f 100644
--- a/testXourses/clearEnvTest.tex
+++ b/dtxTests/clearHideEnv/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/clearHideEnv}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/desmosBase.tex b/dtxTests/desmos/base.tex
similarity index 100%
rename from testXourses/testFiles/desmosBase.tex
rename to dtxTests/desmos/base.tex
diff --git a/testXourses/desmosTest.tex b/dtxTests/desmos/xourse.tex
similarity index 74%
rename from testXourses/desmosTest.tex
rename to dtxTests/desmos/xourse.tex
index fd6260d..013cab7 100644
--- a/testXourses/desmosTest.tex
+++ b/dtxTests/desmos/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/desmosBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/dialogue.tex b/dtxTests/dialogue/base.tex
similarity index 100%
rename from testXourses/testFiles/dialogue.tex
rename to dtxTests/dialogue/base.tex
diff --git a/testXourses/dialogueTest.tex b/dtxTests/dialogue/xourse.tex
similarity index 76%
rename from testXourses/dialogueTest.tex
rename to dtxTests/dialogue/xourse.tex
index 6d81255..556be10 100644
--- a/testXourses/dialogueTest.tex
+++ b/dtxTests/dialogue/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/dialogue}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/dtxFileContentInteractionList.txt b/dtxTests/dtxFileContentInteractionList.txt
similarity index 100%
rename from testXourses/dtxFileContentInteractionList.txt
rename to dtxTests/dtxFileContentInteractionList.txt
diff --git a/testXourses/testFiles/expandable.tex b/dtxTests/expandable/base.tex
similarity index 100%
rename from testXourses/testFiles/expandable.tex
rename to dtxTests/expandable/base.tex
diff --git a/testXourses/testFiles/foldableEnvironments.tex b/dtxTests/expandable/foldableEnvironments.tex
similarity index 100%
rename from testXourses/testFiles/foldableEnvironments.tex
rename to dtxTests/expandable/foldableEnvironments.tex
diff --git a/testXourses/testFiles/foldableEnvironmentsOSU.tex b/dtxTests/expandable/foldableEnvironmentsOSU.tex
similarity index 100%
rename from testXourses/testFiles/foldableEnvironmentsOSU.tex
rename to dtxTests/expandable/foldableEnvironmentsOSU.tex
diff --git a/dtxTests/expandable/xourse.tex b/dtxTests/expandable/xourse.tex
new file mode 100644
index 0000000..a840489
--- /dev/null
+++ b/dtxTests/expandable/xourse.tex
@@ -0,0 +1,14 @@
+\documentclass{xourse}
+
+\title{Tests: Expandable and Foldable}
+
+
+\begin{document}
+\maketitle
+
+\activity{./base}
+\activity{./foldableEnvironments}
+\activity{./foldableEnvironmentsOSU}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/feedbackBasic.tex b/dtxTests/feedback/base.tex
similarity index 100%
rename from testXourses/testFiles/feedbackBasic.tex
rename to dtxTests/feedback/base.tex
diff --git a/testXourses/feedbackTest.tex b/dtxTests/feedback/xourse.tex
similarity index 73%
rename from testXourses/feedbackTest.tex
rename to dtxTests/feedback/xourse.tex
index 20eaec3..84854f9 100644
--- a/testXourses/feedbackTest.tex
+++ b/dtxTests/feedback/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/feedbackBasic}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/footnotes.tex b/dtxTests/footnotes/base.tex
similarity index 100%
rename from testXourses/testFiles/footnotes.tex
rename to dtxTests/footnotes/base.tex
diff --git a/testXourses/footnotesTest.tex b/dtxTests/footnotes/xourse.tex
similarity index 75%
rename from testXourses/footnotesTest.tex
rename to dtxTests/footnotes/xourse.tex
index 00183f2..78607e1 100644
--- a/testXourses/footnotesTest.tex
+++ b/dtxTests/footnotes/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/footnotes}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/freeresponseBase.tex b/dtxTests/freeresponse/base.tex
similarity index 100%
rename from testXourses/testFiles/freeresponseBase.tex
rename to dtxTests/freeresponse/base.tex
diff --git a/testXourses/freeresponseTest.tex b/dtxTests/freeresponse/xourse.tex
similarity index 72%
rename from testXourses/freeresponseTest.tex
rename to dtxTests/freeresponse/xourse.tex
index 5b98723..809afd0 100644
--- a/testXourses/freeresponseTest.tex
+++ b/dtxTests/freeresponse/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/freeresponseBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/geogebraBase.tex b/dtxTests/geogebra/base.tex
similarity index 100%
rename from testXourses/testFiles/geogebraBase.tex
rename to dtxTests/geogebra/base.tex
diff --git a/testXourses/geogebraTest.tex b/dtxTests/geogebra/xourse.tex
similarity index 73%
rename from testXourses/geogebraTest.tex
rename to dtxTests/geogebra/xourse.tex
index 5fe9f38..f39e7f8 100644
--- a/testXourses/geogebraTest.tex
+++ b/dtxTests/geogebra/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/geogebraBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/googleBase.tex b/dtxTests/google/base.tex
similarity index 100%
rename from testXourses/testFiles/googleBase.tex
rename to dtxTests/google/base.tex
diff --git a/testXourses/googleTest.tex b/dtxTests/google/xourse.tex
similarity index 74%
rename from testXourses/googleTest.tex
rename to dtxTests/google/xourse.tex
index d3ec32a..72bde72 100644
--- a/testXourses/googleTest.tex
+++ b/dtxTests/google/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/googleBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/graph.tex b/dtxTests/graph/base.tex
similarity index 100%
rename from testXourses/testFiles/graph.tex
rename to dtxTests/graph/base.tex
diff --git a/testXourses/graphTest.tex b/dtxTests/graph/xourse.tex
similarity index 77%
rename from testXourses/graphTest.tex
rename to dtxTests/graph/xourse.tex
index 6a5b57c..66624d9 100644
--- a/testXourses/graphTest.tex
+++ b/dtxTests/graph/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/graph}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/hardCoded/hardCodedContent.tex b/dtxTests/hardCodedContent.tex
similarity index 100%
rename from hardCoded/hardCodedContent.tex
rename to dtxTests/hardCodedContent.tex
diff --git a/testXourses/testFiles/hintsBase.tex b/dtxTests/hints/base.tex
similarity index 100%
rename from testXourses/testFiles/hintsBase.tex
rename to dtxTests/hints/base.tex
diff --git a/testXourses/testFiles/hintsBaseOSU.tex b/dtxTests/hints/baseOSU.tex
similarity index 100%
rename from testXourses/testFiles/hintsBaseOSU.tex
rename to dtxTests/hints/baseOSU.tex
diff --git a/testXourses/hintsTest.tex b/dtxTests/hints/xourse.tex
similarity index 58%
rename from testXourses/hintsTest.tex
rename to dtxTests/hints/xourse.tex
index 1f0ce84..f4dec9d 100644
--- a/testXourses/hintsTest.tex
+++ b/dtxTests/hints/xourse.tex
@@ -6,8 +6,8 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/hintsBase}
-\activity{testFiles/hintsBaseOSU}
+\activity{./base}
+\activity{./baseOSU}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/imageBase.tex b/dtxTests/image/base.tex
similarity index 100%
rename from testXourses/testFiles/imageBase.tex
rename to dtxTests/image/base.tex
diff --git a/dtxTests/image/imagePreamble.tex b/dtxTests/image/imagePreamble.tex
new file mode 100644
index 0000000..4fe26a1
--- /dev/null
+++ b/dtxTests/image/imagePreamble.tex
@@ -0,0 +1,6 @@
+%\usepackage{svg}
+\graphicspath{
+{./}
+{./missionPatch/}% Path from the ximera document file to the image file(s)
+{./image/missionPatch/}% Path from the ximera document file to the image file(s)
+}
\ No newline at end of file
diff --git a/testXourses/testFiles/missionPatch/missionPatch.jpg b/dtxTests/image/missionPatch/missionPatch.jpg
similarity index 100%
rename from testXourses/testFiles/missionPatch/missionPatch.jpg
rename to dtxTests/image/missionPatch/missionPatch.jpg
diff --git a/dtxTests/image/missionPatch/missionPatch.pdf b/dtxTests/image/missionPatch/missionPatch.pdf
new file mode 100644
index 0000000..b513b65
Binary files /dev/null and b/dtxTests/image/missionPatch/missionPatch.pdf differ
diff --git a/dtxTests/image/missionPatch/missionPatch.png b/dtxTests/image/missionPatch/missionPatch.png
new file mode 100644
index 0000000..43e634e
Binary files /dev/null and b/dtxTests/image/missionPatch/missionPatch.png differ
diff --git a/testXourses/imageTest.tex b/dtxTests/image/xourse.tex
similarity index 58%
rename from testXourses/imageTest.tex
rename to dtxTests/image/xourse.tex
index 9daf03d..f3f0445 100644
--- a/testXourses/imageTest.tex
+++ b/dtxTests/image/xourse.tex
@@ -1,12 +1,12 @@
 \documentclass{xourse}
 
 \title{Tests: Image}
-\input{./testFiles/imagePreamble}
+\input{./imagePreamble}
 
 \begin{document}
 \maketitle
 
-\activity{testFiles/imageBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/instructorNotes.tex b/dtxTests/instructornotes/base.tex
similarity index 100%
rename from testXourses/testFiles/instructorNotes.tex
rename to dtxTests/instructornotes/base.tex
diff --git a/testXourses/instructornotesTest.tex b/dtxTests/instructornotes/xourse.tex
similarity index 73%
rename from testXourses/instructornotesTest.tex
rename to dtxTests/instructornotes/xourse.tex
index a4029d0..119a744 100644
--- a/testXourses/instructornotesTest.tex
+++ b/dtxTests/instructornotes/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/instructorNotes}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/javascript.tex b/dtxTests/javascript/base.tex
similarity index 100%
rename from testXourses/testFiles/javascript.tex
rename to dtxTests/javascript/base.tex
diff --git a/testXourses/javascriptTest.tex b/dtxTests/javascript/xourse.tex
similarity index 75%
rename from testXourses/javascriptTest.tex
rename to dtxTests/javascript/xourse.tex
index 0cc4529..82a776c 100644
--- a/testXourses/javascriptTest.tex
+++ b/dtxTests/javascript/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/javascript}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/link/README.md b/dtxTests/link/README.md
similarity index 100%
rename from link/README.md
rename to dtxTests/link/README.md
diff --git a/link/link.tex b/dtxTests/link/base.tex
similarity index 100%
rename from link/link.tex
rename to dtxTests/link/base.tex
diff --git a/testXourses/linkTest.tex b/dtxTests/link/xourse.tex
similarity index 79%
rename from testXourses/linkTest.tex
rename to dtxTests/link/xourse.tex
index 340b4d0..1f524e5 100644
--- a/testXourses/linkTest.tex
+++ b/dtxTests/link/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{../link/link}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/localization/basic.tex b/dtxTests/localization/basic.tex
similarity index 100%
rename from localization/basic.tex
rename to dtxTests/localization/basic.tex
diff --git a/localization/brazil/basic.tex b/dtxTests/localization/brazil/basic.tex
similarity index 100%
rename from localization/brazil/basic.tex
rename to dtxTests/localization/brazil/basic.tex
diff --git a/localization/brazil/xmPreamble.tex b/dtxTests/localization/brazil/xmPreamble.tex
similarity index 100%
rename from localization/brazil/xmPreamble.tex
rename to dtxTests/localization/brazil/xmPreamble.tex
diff --git a/localization/dutch/basic.tex b/dtxTests/localization/dutch/basic.tex
similarity index 100%
rename from localization/dutch/basic.tex
rename to dtxTests/localization/dutch/basic.tex
diff --git a/localization/dutch/xmPreamble.tex b/dtxTests/localization/dutch/xmPreamble.tex
similarity index 100%
rename from localization/dutch/xmPreamble.tex
rename to dtxTests/localization/dutch/xmPreamble.tex
diff --git a/localization/french/basic.tex b/dtxTests/localization/french/basic.tex
similarity index 100%
rename from localization/french/basic.tex
rename to dtxTests/localization/french/basic.tex
diff --git a/localization/french/xmPreamble.tex b/dtxTests/localization/french/xmPreamble.tex
similarity index 100%
rename from localization/french/xmPreamble.tex
rename to dtxTests/localization/french/xmPreamble.tex
diff --git a/testXourses/testFiles/localization.tex b/dtxTests/localization/localization.tex
similarity index 100%
rename from testXourses/testFiles/localization.tex
rename to dtxTests/localization/localization.tex
diff --git a/testXourses/testFiles/localizationPreamble.tex b/dtxTests/localization/localizationPreamble.tex
similarity index 100%
rename from testXourses/testFiles/localizationPreamble.tex
rename to dtxTests/localization/localizationPreamble.tex
diff --git a/localization/multilingual.tex b/dtxTests/localization/multilingual.tex
similarity index 100%
rename from localization/multilingual.tex
rename to dtxTests/localization/multilingual.tex
diff --git a/localization/multilingualPreamble.tex b/dtxTests/localization/multilingualPreamble.tex
similarity index 100%
rename from localization/multilingualPreamble.tex
rename to dtxTests/localization/multilingualPreamble.tex
diff --git a/testXourses/localizationTest.tex b/dtxTests/localization/xourse.tex
similarity index 74%
rename from testXourses/localizationTest.tex
rename to dtxTests/localization/xourse.tex
index 52a95b2..69ef063 100644
--- a/testXourses/localizationTest.tex
+++ b/dtxTests/localization/xourse.tex
@@ -11,7 +11,7 @@
 \maketitle
 
 %\activity{testFiles/localization}
-\activity{../localization/basic}
+\activity{./basic}
 
 
 %
@@ -22,15 +22,15 @@
 \sectionstyle
 
 \selectlanguage{french}
-\activity{../localization/french/basic}
+\activity{./basic}
 \selectlanguage{dutch}
-\activity{../localization/dutch/basic}
+\activity{./basic}
 \selectlanguage{brazil}
-\activity{../localization/brazil/basic}
+\activity{./basic}
 
 \chapterstyle
 
 \selectlanguage{english}
-\activity{../localization/multilingual}
+\activity{./multilingual}
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/metadata.tex b/dtxTests/metadata/base.tex
similarity index 100%
rename from testXourses/testFiles/metadata.tex
rename to dtxTests/metadata/base.tex
diff --git a/testXourses/testFiles/metapreamble.tex b/dtxTests/metadata/metapreamble.tex
similarity index 100%
rename from testXourses/testFiles/metapreamble.tex
rename to dtxTests/metadata/metapreamble.tex
diff --git a/testXourses/metadataTest.tex b/dtxTests/metadata/xourse.tex
similarity index 76%
rename from testXourses/metadataTest.tex
rename to dtxTests/metadata/xourse.tex
index 93d4f66..ac53f57 100644
--- a/testXourses/metadataTest.tex
+++ b/dtxTests/metadata/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/metadata}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/onlyBase.tex b/dtxTests/only/base.tex
similarity index 100%
rename from testXourses/testFiles/onlyBase.tex
rename to dtxTests/only/base.tex
diff --git a/testXourses/onlyTest.tex b/dtxTests/only/xourse.tex
similarity index 78%
rename from testXourses/onlyTest.tex
rename to dtxTests/only/xourse.tex
index 8d0dffe..71cbd46 100644
--- a/testXourses/onlyTest.tex
+++ b/dtxTests/only/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/onlyBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/outcomes/basic.tex b/dtxTests/outcomes/base.tex
similarity index 100%
rename from outcomes/basic.tex
rename to dtxTests/outcomes/base.tex
diff --git a/outcomes/outcome2.tex b/dtxTests/outcomes/styling.tex
similarity index 100%
rename from outcomes/outcome2.tex
rename to dtxTests/outcomes/styling.tex
diff --git a/testXourses/outcomesTest.tex b/dtxTests/outcomes/xourse.tex
similarity index 57%
rename from testXourses/outcomesTest.tex
rename to dtxTests/outcomes/xourse.tex
index c64c6bb..a7abaed 100644
--- a/testXourses/outcomesTest.tex
+++ b/dtxTests/outcomes/xourse.tex
@@ -8,9 +8,8 @@
 \end{abstract}
 \maketitle
 
-\activity{../outcomes/basic}
-\activity{../outcomes/outcome}
-\activity{../outcomes/outcome2}
+\activity{./base}
+\activity{./styling}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/problemBase.tex b/dtxTests/problem/base.tex
similarity index 100%
rename from testXourses/testFiles/problemBase.tex
rename to dtxTests/problem/base.tex
diff --git a/testXourses/testFiles/problemNesting.tex b/dtxTests/problem/nesting.tex
similarity index 100%
rename from testXourses/testFiles/problemNesting.tex
rename to dtxTests/problem/nesting.tex
diff --git a/testXourses/testFiles/problemNumbering.tex b/dtxTests/problem/numbering.tex
similarity index 99%
rename from testXourses/testFiles/problemNumbering.tex
rename to dtxTests/problem/numbering.tex
index 870f76a..23e2584 100644
--- a/testXourses/testFiles/problemNumbering.tex
+++ b/dtxTests/problem/numbering.tex
@@ -1,7 +1,7 @@
 \documentclass{ximera}
 \title{Problem Environment Numbering}
 
-%\input{preambleProblem.tex}% Only add a preamble file if it is actually necessary for the demo/test.
+%\input{problemPreamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
 \begin{document}
 \begin{abstract}
     A demo and test of basic problem-style environments.
diff --git a/testXourses/testFiles/preambleProblem.tex b/dtxTests/problem/problemPreamble.tex
similarity index 100%
rename from testXourses/testFiles/preambleProblem.tex
rename to dtxTests/problem/problemPreamble.tex
diff --git a/testXourses/problemTest.tex b/dtxTests/problem/xourse.tex
similarity index 66%
rename from testXourses/problemTest.tex
rename to dtxTests/problem/xourse.tex
index 568b1cc..9cbe440 100644
--- a/testXourses/problemTest.tex
+++ b/dtxTests/problem/xourse.tex
@@ -7,9 +7,9 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/problemBase}
-\activity{testFiles/problemNesting}
-\activity{testFiles/problemNumbering}
+\activity{./base}
+\activity{./nesting}
+\activity{./numbering}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/proofBase.tex b/dtxTests/proof/base.tex
similarity index 100%
rename from testXourses/testFiles/proofBase.tex
rename to dtxTests/proof/base.tex
diff --git a/testXourses/proofTest.tex b/dtxTests/proof/xourse.tex
similarity index 74%
rename from testXourses/proofTest.tex
rename to dtxTests/proof/xourse.tex
index 022e4fa..96efc71 100644
--- a/testXourses/proofTest.tex
+++ b/dtxTests/proof/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/proofBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/sagemathBase.tex b/dtxTests/sagemath/base.tex
similarity index 100%
rename from testXourses/testFiles/sagemathBase.tex
rename to dtxTests/sagemath/base.tex
diff --git a/testXourses/sagemathTest.tex b/dtxTests/sagemath/xourse.tex
similarity index 73%
rename from testXourses/sagemathTest.tex
rename to dtxTests/sagemath/xourse.tex
index 0551f58..ea23d99 100644
--- a/testXourses/sagemathTest.tex
+++ b/dtxTests/sagemath/xourse.tex
@@ -5,7 +5,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/sagemathBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/solutionBase.tex b/dtxTests/solution/base.tex
similarity index 100%
rename from testXourses/testFiles/solutionBase.tex
rename to dtxTests/solution/base.tex
diff --git a/testXourses/solutionTest.tex b/dtxTests/solution/xourse.tex
similarity index 73%
rename from testXourses/solutionTest.tex
rename to dtxTests/solution/xourse.tex
index c8208cd..ad07750 100644
--- a/testXourses/solutionTest.tex
+++ b/dtxTests/solution/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/solutionBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/textcolorBase.tex b/dtxTests/textcolor/base.tex
similarity index 100%
rename from testXourses/testFiles/textcolorBase.tex
rename to dtxTests/textcolor/base.tex
diff --git a/testXourses/testFiles/textcolorCustomColors.tex b/dtxTests/textcolor/customColors.tex
similarity index 100%
rename from testXourses/testFiles/textcolorCustomColors.tex
rename to dtxTests/textcolor/customColors.tex
diff --git a/testXourses/testFiles/textcolorpreamble.tex b/dtxTests/textcolor/textcolorpreamble.tex
similarity index 100%
rename from testXourses/testFiles/textcolorpreamble.tex
rename to dtxTests/textcolor/textcolorpreamble.tex
diff --git a/dtxTests/textcolor/xourse.tex b/dtxTests/textcolor/xourse.tex
new file mode 100644
index 0000000..e315457
--- /dev/null
+++ b/dtxTests/textcolor/xourse.tex
@@ -0,0 +1,14 @@
+\documentclass{xourse}
+
+\input{./textcolorpreamble.tex}
+\title{Tests: Text Color}
+
+
+\begin{document}
+\maketitle
+
+\activity{./base}
+\activity{./customColors}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/theoremsBasic.tex b/dtxTests/theorems/base.tex
similarity index 100%
rename from testXourses/testFiles/theoremsBasic.tex
rename to dtxTests/theorems/base.tex
diff --git a/testXourses/theoremsTest.tex b/dtxTests/theorems/xourse.tex
similarity index 73%
rename from testXourses/theoremsTest.tex
rename to dtxTests/theorems/xourse.tex
index 041b4a2..0521010 100644
--- a/testXourses/theoremsTest.tex
+++ b/dtxTests/theorems/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/theoremsBasic}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/titleBase.tex b/dtxTests/title/base.tex
similarity index 100%
rename from testXourses/testFiles/titleBase.tex
rename to dtxTests/title/base.tex
diff --git a/testXourses/titleTest.tex b/dtxTests/title/xourse.tex
similarity index 74%
rename from testXourses/titleTest.tex
rename to dtxTests/title/xourse.tex
index f2eedb2..08a4736 100644
--- a/testXourses/titleTest.tex
+++ b/dtxTests/title/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/titleBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/validator.tex b/dtxTests/validator/base.tex
similarity index 100%
rename from testXourses/testFiles/validator.tex
rename to dtxTests/validator/base.tex
diff --git a/testXourses/testFiles/validator2.tex b/dtxTests/validator/base2.tex
similarity index 100%
rename from testXourses/testFiles/validator2.tex
rename to dtxTests/validator/base2.tex
diff --git a/testXourses/validatorTest.tex b/dtxTests/validator/xourse.tex
similarity index 65%
rename from testXourses/validatorTest.tex
rename to dtxTests/validator/xourse.tex
index 407f4e9..23ff62b 100644
--- a/testXourses/validatorTest.tex
+++ b/dtxTests/validator/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/validator}
-\activity{testFiles/validator2}
+\activity{./base}
+\activity{./base2}
 
 \end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/videoBase.tex b/dtxTests/video/base.tex
similarity index 100%
rename from testXourses/testFiles/videoBase.tex
rename to dtxTests/video/base.tex
diff --git a/testXourses/videoTest.tex b/dtxTests/video/xourse.tex
similarity index 76%
rename from testXourses/videoTest.tex
rename to dtxTests/video/xourse.tex
index 6a414e5..a963cef 100644
--- a/testXourses/videoTest.tex
+++ b/dtxTests/video/xourse.tex
@@ -6,7 +6,7 @@
 \begin{document}
 \maketitle
 
-\activity{testFiles/videoBase}
+\activity{./base}
 
 
 \end{document}
\ No newline at end of file
diff --git a/dtxTests/xourseAll.tex b/dtxTests/xourseAll.tex
new file mode 100644
index 0000000..0f79edb
--- /dev/null
+++ b/dtxTests/xourseAll.tex
@@ -0,0 +1,63 @@
+\documentclass{xourse}
+
+\input{./image/imagePreamble}
+\input{./textcolor/textcolorpreamble.tex}
+
+\title{All Tests}
+
+
+\begin{document}
+\maketitle
+
+\activity{abstract/base}
+\activity{activity/base}
+\activity{activity/noTitle}
+\activity{activity/practice}
+\activity{answer/base}
+\activity{answer/optionals}
+\activity{choice/base}
+\activity{clearHideEnv/base}
+\activity{desmos/base}
+\activity{dialogue/base}
+\activity{expandable/base}
+\activity{expandable/foldableEnvironments}
+\activity{expandable/foldableEnvironmentsOSU}
+\activity{feedback/base}
+\activity{footnotes/base}
+\activity{freeresponse/base}
+\activity{geogebra/base}
+\activity{google/base}
+\activity{graph/base}
+\activity{hints/base}
+\activity{hints/baseOSU}
+\activity{image/base}
+\activity{instructornotes/base}
+\activity{javascript/base}
+\activity{link/base}
+% \activity{localization/basic}
+% \activity{localization/localization}
+% \activity{localization/localizationPreamble}
+% \activity{localization/multilingual}
+% \activity{localization/multilingualPreamble}
+\activity{metadata/base}
+% \activity{metadata/metapreamble}
+\activity{only/base}
+\activity{outcomes/base}
+\activity{outcomes/styling}
+% \activity{problem/base}
+% \activity{problem/nesting}
+% \activity{problem/numbering}
+% \activity{problem/problemPreamble}
+\activity{proof/base}
+\activity{sagemath/base}
+\activity{solution/base}
+\activity{textcolor/base}
+\activity{textcolor/customColors}
+% \activity{textcolor/textcolorpreamble}
+\activity{theorems/base}
+\activity{title/base}
+\activity{validator/base}
+\activity{validator/base2}
+\activity{video/base}
+
+\end{document}
\ No newline at end of file
diff --git a/dtxTests/xourseInteractives.tex b/dtxTests/xourseInteractives.tex
new file mode 100644
index 0000000..05ec034
--- /dev/null
+++ b/dtxTests/xourseInteractives.tex
@@ -0,0 +1,16 @@
+\documentclass{xourse}
+
+\title{Overview: Interactives tests}
+\author{Jason}
+%\input{./websiteEmbeddingsPreamble.tex}
+
+\begin{document}
+\maketitle
+
+\activity{./desmos/base.tex}
+\activity{./geogebra/base.tex}
+\activity{./google/base.tex}
+\activity{./sagemath/base.tex}
+\activity{./video/base.tex}
+
+\end{document}
\ No newline at end of file
diff --git a/outcomes/outcome.tex b/outcomes/outcome.tex
deleted file mode 100644
index 90ea29f..0000000
--- a/outcomes/outcome.tex
+++ /dev/null
@@ -1,55 +0,0 @@
-\documentclass{ximera}
-\title{Outcome Default List Test Activity}
-\date{Last Updated: 6/5/2025}
-
-% List of outcomes that should display where "\displayOutcomes" is used.
-\outcome{Answer some questions about some stuff.}
-\outcome{Do something productive.}
-\outcome{Learn how Questions work maybe.}
-\outcome{Maybe other stuff - who knows!}
-%\input{preamble.tex}
-\begin{document}
-\begin{abstract}
-    A testbed file for Outcomes.
-\end{abstract}
-\maketitle
-
-\section{Intended Outcome of Test}
-
-In the preamble we use the \verb|\outcome| command to add an outcome, and add a new outcome with each \verb|\outcome| command. 
-Then we use the \verb|\displayOutcomes| command to display the outcomes listed in this file.
-The command \verb|\displayOutcomes| takes an optional argument to load an outcome file from a different file (if it exists).
-
-So, in the preamble, we used the following commands to populate the outcomes:
-\begin{itemize}
-    \item \verb|\outcome{Answer some questions about some stuff.} |
-    \item \verb|\outcome{Do something productive.} |
-    \item \verb|\outcome{Learn how Questions work maybe.} |
-    \item \verb|\outcome{Maybe other stuff - who knows!} |
-\end{itemize}
-
-
-The test area should look (approximately) like the following:
-
-
-Goals for this Section (Hover over me to see!)\\
-At the end of this section, students should be able to...
-\begin{itemize}
-\item Answer some questions about some stuff.
-\item Do something productive.
-\item Learn how Questions work maybe.
-\item Maybe other stuff - who knows!
-\end{itemize}
-So go forth and learn!
-
-
-
-\section{Start of Test/Demo Area}
-
-\displayOutcomes
-
-\section{End of Test/Demo Area}
-
-Some ending text to ensure that there is no unintended output between end of the test/demo and the end of the document.
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses.TODO/preamble.tex b/savedArchive/Templates/preamble.tex
similarity index 100%
rename from testXourses.TODO/preamble.tex
rename to savedArchive/Templates/preamble.tex
diff --git a/testXourses.TODO/testFiles/placeHolder.tex b/savedArchive/Templates/testFiles/placeHolder.tex
similarity index 93%
rename from testXourses.TODO/testFiles/placeHolder.tex
rename to savedArchive/Templates/testFiles/placeHolder.tex
index 19720df..490cef8 100644
--- a/testXourses.TODO/testFiles/placeHolder.tex
+++ b/savedArchive/Templates/testFiles/placeHolder.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 \title{Template}
 
 %\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
diff --git a/testXourses.TODO/testFiles/preamble.tex b/savedArchive/Templates/testFiles/preamble.tex
similarity index 100%
rename from testXourses.TODO/testFiles/preamble.tex
rename to savedArchive/Templates/testFiles/preamble.tex
diff --git a/testXourses.TODO/xmPreamble.tex b/savedArchive/Templates/xmPreamble.tex
similarity index 100%
rename from testXourses.TODO/xmPreamble.tex
rename to savedArchive/Templates/xmPreamble.tex
diff --git a/coreXimeraFeatures.tex b/savedArchive/coreXimeraFeatures.tex
similarity index 96%
rename from coreXimeraFeatures.tex
rename to savedArchive/coreXimeraFeatures.tex
index 3971630..2db1280 100644
--- a/coreXimeraFeatures.tex
+++ b/savedArchive/coreXimeraFeatures.tex
@@ -1,4 +1,4 @@
-\documentclass[numbers]{xourse}
+%\documentclass[numbers]{xourse}
 
 \input{preamble.tex}
 
diff --git a/environments/answer.tex b/savedArchive/environments/answer.tex
similarity index 96%
rename from environments/answer.tex
rename to savedArchive/environments/answer.tex
index fe1db26..9951355 100644
--- a/environments/answer.tex
+++ b/savedArchive/environments/answer.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble.tex}
 
diff --git a/environments/choiceAnswer.tex b/savedArchive/environments/choiceAnswer.tex
similarity index 98%
rename from environments/choiceAnswer.tex
rename to savedArchive/environments/choiceAnswer.tex
index 0f8c27c..3ab92c2 100644
--- a/environments/choiceAnswer.tex
+++ b/savedArchive/environments/choiceAnswer.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 \input{../preamble}
 
 \title{Choice answers}
diff --git a/environments/dialogue.tex b/savedArchive/environments/dialogue.tex
similarity index 92%
rename from environments/dialogue.tex
rename to savedArchive/environments/dialogue.tex
index c433710..15f2abf 100644
--- a/environments/dialogue.tex
+++ b/savedArchive/environments/dialogue.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/environments/feedback.tex b/savedArchive/environments/feedback.tex
similarity index 98%
rename from environments/feedback.tex
rename to savedArchive/environments/feedback.tex
index 980ce5f..463a7c2 100644
--- a/environments/feedback.tex
+++ b/savedArchive/environments/feedback.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/environments/hints.tex b/savedArchive/environments/hints.tex
similarity index 93%
rename from environments/hints.tex
rename to savedArchive/environments/hints.tex
index a25fa80..6f08fc6 100644
--- a/environments/hints.tex
+++ b/savedArchive/environments/hints.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/environments/problemEnvironments.tex b/savedArchive/environments/problemEnvironments.tex
similarity index 98%
rename from environments/problemEnvironments.tex
rename to savedArchive/environments/problemEnvironments.tex
index 246f0ce..ccc51d0 100644
--- a/environments/problemEnvironments.tex
+++ b/savedArchive/environments/problemEnvironments.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/environments/theoremEnvironments.tex b/savedArchive/environments/theoremEnvironments.tex
similarity index 99%
rename from environments/theoremEnvironments.tex
rename to savedArchive/environments/theoremEnvironments.tex
index f5001b7..7ad620b 100644
--- a/environments/theoremEnvironments.tex
+++ b/savedArchive/environments/theoremEnvironments.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 \outcome{Theorem environments.}
 \input{../preamble}
 \author{Bart Snapp \and Rodney Austin}
diff --git a/examples.TODO/graphicsAndVideos/chimera.jpg b/savedArchive/examples.TODO/graphicsAndVideos/chimera.jpg
similarity index 100%
rename from examples.TODO/graphicsAndVideos/chimera.jpg
rename to savedArchive/examples.TODO/graphicsAndVideos/chimera.jpg
diff --git a/examples.TODO/graphicsAndVideos/dna.jpg b/savedArchive/examples.TODO/graphicsAndVideos/dna.jpg
similarity index 100%
rename from examples.TODO/graphicsAndVideos/dna.jpg
rename to savedArchive/examples.TODO/graphicsAndVideos/dna.jpg
diff --git a/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex b/savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
similarity index 99%
rename from examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
rename to savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
index 983ee2b..34daac9 100644
--- a/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
+++ b/savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 \title{Graphics and videos}
diff --git a/examples.TODO/hidingText/hidingText.tex b/savedArchive/examples.TODO/hidingText/hidingText.tex
similarity index 93%
rename from examples.TODO/hidingText/hidingText.tex
rename to savedArchive/examples.TODO/hidingText/hidingText.tex
index 4d533b2..df6d2e1 100644
--- a/examples.TODO/hidingText/hidingText.tex
+++ b/savedArchive/examples.TODO/hidingText/hidingText.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/examples.TODO/math/math.tex b/savedArchive/examples.TODO/math/math.tex
similarity index 95%
rename from examples.TODO/math/math.tex
rename to savedArchive/examples.TODO/math/math.tex
index 1de8117..71ae1e2 100644
--- a/examples.TODO/math/math.tex
+++ b/savedArchive/examples.TODO/math/math.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/examples.TODO/preamble.tex b/savedArchive/examples.TODO/preamble.tex
similarity index 100%
rename from examples.TODO/preamble.tex
rename to savedArchive/examples.TODO/preamble.tex
diff --git a/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex b/savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
similarity index 99%
rename from examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
rename to savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
index de5096a..0496fa2 100644
--- a/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
+++ b/savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
@@ -1,4 +1,4 @@
-\documentclass[nooutcomes]{ximera}
+%\documentclass[nooutcomes]{ximera}
 \input{../preamble.tex}
 \author{Elizabeth Miller}
 %\license{Creative Commons Attribution 4.0 International License}
diff --git a/examples.TODO/titles/titles.tex b/savedArchive/examples.TODO/titles/titles.tex
similarity index 97%
rename from examples.TODO/titles/titles.tex
rename to savedArchive/examples.TODO/titles/titles.tex
index f8dc838..bf9a1b5 100644
--- a/examples.TODO/titles/titles.tex
+++ b/savedArchive/examples.TODO/titles/titles.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/examples.TODO/xkcd/xkcd.tex b/savedArchive/examples.TODO/xkcd/xkcd.tex
similarity index 96%
rename from examples.TODO/xkcd/xkcd.tex
rename to savedArchive/examples.TODO/xkcd/xkcd.tex
index 6bcee86..4010c9e 100644
--- a/examples.TODO/xkcd/xkcd.tex
+++ b/savedArchive/examples.TODO/xkcd/xkcd.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
 
 \input{../preamble}
 
diff --git a/testXourses/foldableTest.tex b/testXourses/foldableTest.tex
deleted file mode 100644
index 07fe7e0..0000000
--- a/testXourses/foldableTest.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: Expandable and Foldable}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/expandable}
-\activity{testFiles/foldableEnvironments}
-\activity{testFiles/foldableEnvironmentsOSU}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/imagePreamble.tex b/testXourses/testFiles/imagePreamble.tex
deleted file mode 100644
index 854f518..0000000
--- a/testXourses/testFiles/imagePreamble.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-%\usepackage{svg}
-\graphicspath{
-{./}
-{./missionPatch/}
-{./testFiles/missionPatch/}
-{../missionPatch/}
-}
\ No newline at end of file
diff --git a/testXourses/testFiles/missionPatch/missionPatch-.svg b/testXourses/testFiles/missionPatch/missionPatch-.svg
deleted file mode 100644
index 9fbec41..0000000
--- a/testXourses/testFiles/missionPatch/missionPatch-.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testXourses/testFiles/missionPatch/missionPatch.pdf b/testXourses/testFiles/missionPatch/missionPatch.pdf
deleted file mode 100644
index 2988b32..0000000
Binary files a/testXourses/testFiles/missionPatch/missionPatch.pdf and /dev/null differ
diff --git a/testXourses/testFiles/missionPatch/missionPatch.png b/testXourses/testFiles/missionPatch/missionPatch.png
deleted file mode 100644
index 76c4d60..0000000
Binary files a/testXourses/testFiles/missionPatch/missionPatch.png and /dev/null differ
diff --git a/testXourses/testFiles/missionPatch/missionPatch.svg b/testXourses/testFiles/missionPatch/missionPatch.svg
deleted file mode 100644
index 656cae3..0000000
--- a/testXourses/testFiles/missionPatch/missionPatch.svg
+++ /dev/null
@@ -1,21144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/testXourses/testFiles/placeHolder.tex b/testXourses/testFiles/placeHolder.tex
deleted file mode 100644
index 2001d48..0000000
--- a/testXourses/testFiles/placeHolder.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass{ximera}
-\title{Template}
-
-%\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
-\begin{document}
-\begin{abstract}
-    A testbed file Template.
-\end{abstract}
-\maketitle
-
-{{\Huge \bfseries Last Updated: \today}} \\
-
-If you have come to this page, then the test activity you were looking into either hasn't had a testbed activity implemented for it yet, 
-or it doesn't (as of the last update of this repo) have any commands, environments, or any other aspects that require testing.
-
-\section{Basic Usage}
-
-This is a template file. The Basic Usage section should be used to describe the \textbf{basic} usage 
-of the commands/environments/etc (refered to hereafter as ``DemoCom'' for simplicity) being tested/demonstrated in the file. 
-
-In particular, it should explain any requirements of where/how the DemoCom should/must be placed (e.g. \verb|\answer| must be in mathemode 
-and the abstract must be after begin document, not the preamble). It should also explain the most basic usecase, and any 
-relevant optional parameters being tested/demo'ed in the file.
-
-\section{Intended Outcome of Test}
-
-The intended outcome section should show what the output of the demo case looks like, without actually using the DemoCom itself.
-Any inconsistencies in formating/display should be noted as well as possible here as well, but it is important to not use the 
-DemoCom itself so that we have an objective ``anticipated output'' to use as a comparison to what is \textit{actually} output in
-test. 
-
-\section{Start of Test/Demo Area}
-
-This should contain the actual test/demonstration of DemoCom, which can then be compared to the description above to look for 
-unexpected behavior.
-
-\hrulefill
-
-
-\end{document}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%     For copy/paste into new files:  %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\documentclass{ximera}
-\title{Template}
-
-%\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
-\begin{document}
-\begin{abstract}
-    
-\end{abstract}
-\maketitle
-
-{{\Huge \bfseries Last Updated: \today}} \\
-
-
-\section{Basic Usage}
-
-
-\section{Intended Outcome of Test}
-
-
-\section{Start of Test/Demo Area}
-
-
-\hrulefill
-
-
-\end{document}
diff --git a/testXourses/testFiles/preamble.tex b/testXourses/testFiles/preamble.tex
deleted file mode 100644
index e69de29..0000000
diff --git a/testXourses/textcolorTest.tex b/testXourses/textcolorTest.tex
deleted file mode 100644
index 253231e..0000000
--- a/testXourses/textcolorTest.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass{xourse}
-
-\input{testFiles/textcolorpreamble.tex}
-\title{Tests: Text Color}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/textcolorBase}
-\activity{testFiles/textcolorCustomColors}
-
-
-\end{document}
\ No newline at end of file
diff --git a/xmScripts/xmlatex b/xmScripts/xmlatex
index ef845ae..10a5610 100755
--- a/xmScripts/xmlatex
+++ b/xmScripts/xmlatex
@@ -43,7 +43,7 @@ fi
 #
 # default docker image to run; overwrite with 'export XAKE_IMAGE=myxake:0.1'
 : "${XAKE_BASE:=ximeralatex}"
-: "${XAKE_VERSION:=v2.7.0}"
+: "${XAKE_VERSION:=v2.7.2}"
 : "${XAKE_CONTAINER:=$XAKE_BASE:$XAKE_VERSION}"
 : "${DOCKER_REPO:=ghcr.io/ximeraproject/}"
 
diff --git a/xmScripts/xmlatex.bat b/xmScripts/xmlatex.bat
index af6f210..80dc645 100755
--- a/xmScripts/xmlatex.bat
+++ b/xmScripts/xmlatex.bat
@@ -1,7 +1,7 @@
 @echo off
 set str=%*
 set "str=%str:\=/%"
-set "DOCKER_IMAGE=ghcr.io/ximeraproject/ximeralatex:v2.6.8"
+set "DOCKER_IMAGE=ghcr.io/ximeraproject/ximeralatex:v2.7.2"
 echo Starting docker %DOCKER_IMAGE% with args  %str%  in directory %cd%.
 echo docker run --rm --net="host" --mount type=bind,source=%cd%,target=/code %DOCKER_IMAGE% xmlatex %str%
 docker run --rm --net="host" --mount type=bind,source=%cd%,target=/code %DOCKER_IMAGE% xmlatex %str%
\ No newline at end of file