diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 2162b18..b82b7be 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,6 +1,6 @@ services: app: - image: ghcr.io/ximeraproject/ximeralatex:v2.7uf.8 + image: ghcr.io/ximeraproject/ximeralatex:v2.7.0 # image: ghcr.io/ximeraproject/ximeralatex:v2.6.8-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 @@ -10,4 +10,4 @@ services: ximeraserver: image: registry.gitlab.kuleuven.be/wet/ximera/ximeradocker:2.3_b ports: - - "2080:2000" # Expose Ximera on port 2080 \ No newline at end of file + - "2080:2000" # Expose Ximera on port 2080 diff --git a/.github/workflows/serve-ximera.yml b/.github/workflows/serve-ximera.yml index f4d8b69..a76eb39 100644 --- a/.github/workflows/serve-ximera.yml +++ b/.github/workflows/serve-ximera.yml @@ -49,7 +49,7 @@ jobs: GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} XIMERA_URL: ${{ vars.XIMERA_URL }} XIMERA_NAME: ${{ vars.XIMERA_NAME }}${{ github.ref_name }} - XOURSES: "./testXourses" + XOURSES: "basicLaTeX/enumerate" XM_COMPILE_SEQUENCE: "pdf,handout.pdf,html" run: | ls -alrt diff --git a/basicLaTeX/enumerate/enumerate.tex b/basicLaTeX/enumerate/enumerate.tex new file mode 100644 index 0000000..fdbc50a --- /dev/null +++ b/basicLaTeX/enumerate/enumerate.tex @@ -0,0 +1,29 @@ +\documentclass{ximera} +\title{Enumerate} + +% could optionally change the package for enumerate/itemize +\input{enumerate_preamble.tex} + +\begin{document} +\begin{abstract} +\end{abstract} +\maketitle + +\section{Basic Usage} + +An enumerate with a sub-enumerate : + +\begin{enumerate} + \item First item + \item Second item + \begin{enumerate} + \item First subitem + \item Second subitem + \end{enumerate} +\end{enumerate} + +\section{Intended Outcome of Test} + +\section{Start of Test/Demo Area} + +\end{document} \ No newline at end of file diff --git a/basicLaTeX/enumerate/enumerate_preamble.tex b/basicLaTeX/enumerate/enumerate_preamble.tex new file mode 100644 index 0000000..b0a3ef4 --- /dev/null +++ b/basicLaTeX/enumerate/enumerate_preamble.tex @@ -0,0 +1 @@ +% \usepackage{enumitem} \ No newline at end of file diff --git a/basicLaTeX/enumerate/test_cfg/enumerate.tex b/basicLaTeX/enumerate/test_cfg/enumerate.tex new file mode 120000 index 0000000..c26cb09 --- /dev/null +++ b/basicLaTeX/enumerate/test_cfg/enumerate.tex @@ -0,0 +1 @@ +../enumerate.tex \ No newline at end of file diff --git a/basicLaTeX/enumerate/test_cfg/enumerate_preamble.tex b/basicLaTeX/enumerate/test_cfg/enumerate_preamble.tex new file mode 120000 index 0000000..4abb84a --- /dev/null +++ b/basicLaTeX/enumerate/test_cfg/enumerate_preamble.tex @@ -0,0 +1 @@ +../enumerate_preamble.tex \ No newline at end of file diff --git a/basicLaTeX/enumerate/test_cfg/ximera.cfg b/basicLaTeX/enumerate/test_cfg/ximera.cfg new file mode 100644 index 0000000..d10430b --- /dev/null +++ b/basicLaTeX/enumerate/test_cfg/ximera.cfg @@ -0,0 +1,200 @@ +%% +%% 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} + + +\catcode`\:=11 +\ConfigureList{enumerate}% + {\EndP\HCode{
}\ShowPar +} + {\end:itm \gdef\end:itm{\EndP\Tg}\DeleteMark +} + {{\Configure{Link}{li}{}{ class="enumerate" id=}{}% + \let\EndLink=\empty\par\ShowPar +\AnchorLabel }% +} + +\catcode`\:=12 + + + + + +\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|
+%%% 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/basicLaTeX/enumerate/xourse.tex b/basicLaTeX/enumerate/xourse.tex
new file mode 100644
index 0000000..8de245a
--- /dev/null
+++ b/basicLaTeX/enumerate/xourse.tex
@@ -0,0 +1,20 @@
+\documentclass{xourse}
+
+\title{Tests: enumerate/itemize}
+
+
+\begin{document}
+\maketitle
+
+\activity{./enumerate}
+
+% HACK: this input only works 'by accident', ie because there was none before
+% Moreover, the ximera.cfg in test_cfg is NOT used
+% THUS: consult the individual PDF of the activity !!!
+\pdfOnly{
+ \input{test_cfg/enumerate_preamble.tex}
+}
+
+\activity{./test_cfg/enumerate}
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses.TODO/enumerateTest.tex b/testXourses.TODO/enumerateTest.tex
deleted file mode 100644
index 5173954..0000000
--- a/testXourses.TODO/enumerateTest.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass{xourse}
-
-\title{Master Enumerate Test Xourse}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/placeHolder}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/enumerateTest.tex b/testXourses/enumerateTest.tex
new file mode 100644
index 0000000..3802f1f
--- /dev/null
+++ b/testXourses/enumerateTest.tex
@@ -0,0 +1,12 @@
+\documentclass{xourse}
+
+\title{Tests: enumerate/itemize}
+
+
+\begin{document}
+\maketitle
+
+\activity{../enumerate/enumerate}
+\activity{../enumerate/test_cfg/enumerate}
+
+\end{document}
\ No newline at end of file
diff --git a/xmScripts/config.txt b/xmScripts/config.txt
index fa968d3..2f30ff4 100644
--- a/xmScripts/config.txt
+++ b/xmScripts/config.txt
@@ -2,13 +2,13 @@
# version of Ximera xake container to use (with xmlatex)
#
# : "${XAKE_BASE:=ximeralatex}"
-: "${XAKE_VERSION:=v2.7uf.8}"
+: "${XAKE_VERSION:=v2.7.2}"
# : "${XAKE_VERSION:=v2.6.8-full}" # with texlive_full
#
# For publishing you'll need a GPG Key
# To generate a key-pair, fill in your name and email, and run 'xmlatex genKey'
-YOUR_NAME="DUMMY_NAME_TEST"
-YOUR_EMAIL="DUMMY_EMAIL_TEST"
+YOUR_NAME="Just For DUMMY Testing"
+YOUR_EMAIL="noproblem@dummy.org"
#
# Current 'xmlatex genKey' logic:
# if there is no .xmKeyFile, and it is properly .gitignored,
@@ -21,7 +21,7 @@ YOUR_EMAIL="DUMMY_EMAIL_TEST"
# !! DO NOT SAVE THE KEY IN THIS config.txt FILE !!
#
-## : "${XIMERA_NAME:=myreponame}"
+: "${XIMERA_NAME:=myreponamexx}"
## : "${XIMERA_URL:=http://localhost:2000/}"
## : "${XIMERA_URL:=https://ximera.osu.edu/}"
## : "${XIMERA_URL:=https://set-p-dsb-zomercursus-latest.cloud-ext.icts.kuleuven.be/}"