diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 58085c3..a6a2a50 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,8 +1,7 @@ services: app: - image: ghcr.io/ximeraproject/ximeralatex:v2.5.5 - # image: ghcr.io/ximeraproject/ximeralatex:v2.5.5-full - # image: ghcr.io/ximeraproject/xake2024:v2.4.3-full + image: ghcr.io/ximeraproject/ximeralatex:v2.5.8 + # image: ghcr.io/ximeraproject/ximeralatex:v2.5.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 - ..:/code:cached diff --git a/.github/workflows/serve-ximera.yml b/.github/workflows/serve-ximera.yml index 74a4561..534648f 100644 --- a/.github/workflows/serve-ximera.yml +++ b/.github/workflows/serve-ximera.yml @@ -1,12 +1,11 @@ -name: Build and publish a Ximera repo +name: Ximera Workflow on: - push: - branches: - - master + push: jobs: build-ximera: + name: Build and preview Ximera Courses runs-on: ubuntu-latest permissions: @@ -33,16 +32,61 @@ jobs: !xmPictures/** !.git/** !.github/** - key: ximera-buildx-${{ github.sha }} + key: ximera-${{ github.ref_name }}-${{ github.sha }} restore-keys: | - ximera-buildx- + ximera-${{ github.ref_name }}- ximera- + - name: Build and publish Ximera courses env: GPG_KEY: ${{ secrets.GPG_KEY }} GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} - XIMERA_NAME: uccalc - XIMERA_URL: https://ximera.osu.edu/ + XIMERA_URL: ${{ vars.XIMERA_URL }} + XIMERA_NAME: ${{ vars.XIMERA_NAME }}*${{ github.ref_name }} run: | + ls -alrt ./xmScripts/xmlatex ghaction + echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY + + - name: Setup ximera serve cache (only .git) + id: serve-cache + uses: actions/cache/save@v4 + with: + path: | + xmScripts/** + .git/** + key: ximeraSERVE-${{ github.ref_name }}-${{ github.sha }} + + + publish-ximera: + name: Publish Ximera Courses + needs: build-ximera # Waits for the build job to complete + runs-on: ubuntu-latest + environment: production + steps: + + + - name: Restore ximera serve cache (only .git) + id: serve-cache-restore + uses: actions/cache/restore@v4 + with: + fail-on-cache-miss: true + path: | + xmScripts/** + .git/** + key: ximeraSERVE-${{ github.ref_name }}-${{ github.sha }} + + - name: Serve + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} + XIMERA_URL: ${{ vars.XIMERA_URL }} + XIMERA_NAME: ${{ vars.XIMERA_NAME }} + run: | + ./xmScripts/xmlatex name + ./xmScripts/xmlatex serve -f # NOTE: -f should not be needed ... + echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY + + + diff --git a/derivativeRules/derivativeRules.tex b/derivativeRules/derivativeRules.tex index b4bfb53..1cee66a 100644 --- a/derivativeRules/derivativeRules.tex +++ b/derivativeRules/derivativeRules.tex @@ -9,6 +9,15 @@ \end{abstract} \maketitle + +% HACK: in ximeralatex v2.5.5, TeX4HTis configured to use luatex, +% and pictures-with-luatex somehow redefine \d so that \d x becomes x-underdot (presumable at \BeginDocument or so) +% This is only a problem when using \d inside a tikzpicture +% TEMPORARY FIX: redefine it once more +% (in this case, anothjer fix might be to remove the \tikzpicture: it does not seem to be needed (anymore?) to get the formatting correct) +% TODO: implement a better solution +\renewcommand{\d}{\mathop{}\!d} + Here are a few derivatives we may have calculated using the definition (all of them can be verified with a factoring limit - try it!) { \renewcommand*{\arraystretch}{1.3} @@ -108,10 +117,10 @@ \section{The constant rule} the tangent line is $0$. \item If $s(t)$ represents the position of an object with respect to time and $s(t)$ is constant, then the object is not moving, so its - velocity is zero. Hence $\dd{t} s(t) = 0$. + velocity is zero. Hence $\ddt s(t) = 0$. \item If $v(t)$ represents the velocity of an object with respect to time and $v(t)$ is constant, then the object's acceleration is - zero. Hence $\dd{t} v(t) = 0$. + zero. Hence $\ddt v(t) = 0$. \end{itemize} The examples above lead us to our next theorem. To gain intuition, you should compute the derivative of diff --git a/global.css b/global.css index 134274a..5243093 100644 --- a/global.css +++ b/global.css @@ -1047,4 +1047,16 @@ span#prev-activity-label { /* fix \begin{center} for tabular; to be done properly...) */ div.center > .tabular { margin: auto; +} + + +/* OVERWRITE 'explanation' */ +.explanation::before { + content: "Explanation: "; +} + +.explanation, .explanation-content { + background-color: transparent; + border: none; + border-left: none; } \ No newline at end of file diff --git a/test.tex b/test.tex index a569610..f67ffbf 100644 --- a/test.tex +++ b/test.tex @@ -2,7 +2,7 @@ \usepgfplotslibrary{fillbetween} % needed in areaBetweenCurves -\title{CalculusIA and Calculus IB} +\title{Dummy test course} \input{preamble.tex} \begin{document} \begin{abstract}\end{abstract} diff --git a/xmScripts/config.txt b/xmScripts/config.txt index 5563e86..9ad5d7e 100644 --- a/xmScripts/config.txt +++ b/xmScripts/config.txt @@ -2,8 +2,7 @@ # version of Ximera xake container to use (with xmlatex) # # : "${XAKE_BASE:=ximeralatex}" -: "${XAKE_VERSION:=v2.5.5-full}" - +: "${XAKE_VERSION:=v2.5.8}" # # # For publishing locally, a default key in .xmKeyFile is sufficient.