diff --git a/.github/workflows/serve-ximera.yml b/.github/workflows/serve-ximera.yml index 89ef494..cd05644 100644 --- a/.github/workflows/serve-ximera.yml +++ b/.github/workflows/serve-ximera.yml @@ -48,13 +48,13 @@ jobs: GPG_KEY: ${{ secrets.GPG_KEY }} GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} XIMERA_URL: ${{ vars.XIMERA_URL }} - XIMERA_NAME: ${{ vars.XIMERA_NAME }}${{ github.ref_name }} + XIMERA_NAME: ${{ vars.XIMERA_NAME }}*${{ github.ref_name }} XOURSES: "." # "./testXourses" XM_COMPILE_SEQUENCE: "pdf,handout.pdf,html" run: | ls -alrt chmod +x xmScripts/xmlatex # Overleaf sync might reset it :-() - ./xmScripts/xmlatex veryclean + # ./xmScripts/xmlatex veryclean ./xmScripts/xmlatex ghaction $XOURSES echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY @@ -85,16 +85,25 @@ jobs: .git/** key: ximeraSERVE-${{ github.ref_name }}-${{ github.sha }} - - name: Serve + - name: Serve to XIMERA_URL env: GPG_KEY: ${{ secrets.GPG_KEY }} GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} XIMERA_URL: ${{ vars.XIMERA_URL }} XIMERA_NAME: ${{ vars.XIMERA_NAME }} run: | - chmod +x xmScripts/xmlatex # Overleaf sync might reset it :-() ./xmScripts/xmlatex name - ./xmScripts/xmlatex serve -f # NOTE: -f should not be needed ... + ./xmScripts/xmlatex serve + echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY + - name: Serve to ximera.osu.edu + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} + XIMERA_URL: "https://ximera.osu.edu/" + XIMERA_NAME: ${{ vars.XIMERA_NAME }} + run: | + ./xmScripts/xmlatex name + ./xmScripts/xmlatex serve echo "✅ Published to $XIMERA_URL$XIMERA_NAME " >> $GITHUB_STEP_SUMMARY diff --git a/README.md b/README.md index 4777c87..0617e74 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ This repo contains basic examples of Ximera constructs that can be used as * demo * tests +The main branch is published [here](https://set-p-dsb-zomercursus-latest.cloud-ext.icts.kuleuven.be/ximeraexamples/coreXimeraFeatures/environments/theoremEnvironments). +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) + diff --git a/README_testing.md b/README_testing.md new file mode 100644 index 0000000..a299988 --- /dev/null +++ b/README_testing.md @@ -0,0 +1,88 @@ +A possible testing session... + +Note: if you just want to *test* or *try* something, and do not plan to make any changes, all forking and making-new-branches can be skipped. + +* Fork, clone and checkout your copy of ximeraExamples +``` +~/git/ximera/ximeraExamples$ git pull +Already up to date. +``` +* Create a new branch for your new development/test (optional) + * The new branch is only needed if you foresee to make new test, or adapt existing ones +``` +~/git/ximera/ximeraExamples$ git checkout -b test-link +Switched to a new branch 'test-link' +``` + +* Setup the to be tested/changed ximeraLatex version: + * if testing a dockerimage, update config.txt(local PC) or docker_compose.yml (in Codespace) + * if you need to try a fix to the contents of the dockerimage, use can use 'xmlatex copySettingsLocal' to create a .ximera_local with the ximealatex contents from the current image. + * if testing an existing ximeraLatex branch (perhaps on a clone somewhere) : check it out in .ximera_local + * if making new changes to ximeraLatex: fork, clone, and checkout a new branch + +``` +~/git/ximera/ximeraExamples$ git clone https://github.com/bartsnapp/ximeraLatexFrameDev.git .ximera_local +Cloning into '.ximera_local'... +remote: Enumerating objects: 4273, done. +remote: Counting objects: 100% (284/284), done. +remote: Compressing objects: 100% (92/92), done. +remote: Total 4273 (delta 208), reused 193 (delta 192), pack-reused 3989 (from 3) +Receiving objects: 100% (4273/4273), 6.12 MiB | 4.84 MiB/s, done. +Resolving deltas: 100% (2753/2753), done. +``` +* Use, update or create a relevant test + * you can use the VSCode 'PDF' or 'HTML' buttons, or the xmlatex script (see infra) + * not the 'USING .ximera_local from local repo' line in the output when you made a .ximera_local + * the .log file wiyll contain detailed info about which files where actually used/included +``` +~/git/ximera/ximeraExamples$ xmlatex ghaction testXourses.TODO/linkTest.tex +Restarting myself in docker (from image ghcr.io/ximeraproject/ximeralatex:v2.7.0) +Starting /usr/local/bin/xmlatex ghaction testXourses.TODO/linkTest.tex (on host docker-desktop, i.e. inside a docker container) +USING .ximera_local from local repo +Starting Github-action build (name; bake/frost/serve) +[INFO ] main : Set compile_sequence=pdf,html (and output_formats=pdf,html) +[INFO ] main : Processing argument 1: testXourses.TODO/linkTest.tex +[INFO ] files: Marked source tex NO_COMPILATION for examples.TODO/links/links.tex +[INFO ] files: Marked source tex NEEDS_COMPILATIONS for testXourses.TODO/linkTest.tex +[STATUS ] main : 1 file needs compiling: testXourses.TODO/linkTest.tex +[STATUS ] main : Start bake +[INFO ] bake : Added 2 compile commands for file 1/1: testXourses.TODO/linkTest.tex +[STATUS ] bake : There are 2 commands to run for 1 files +[STATUS ] bake : Command 1/2 (1) starting for pdf of testXourses.TODO/linkTest.tex (pdf|testXourses.TODO/linkTest.tex) +[STATUS ] bake : Command 2/2 (2) starting for html of testXourses.TODO/linkTest.tex (html|testXourses.TODO/linkTest.tex) +[STATUS ] bake : Command 2/2 (2) returns OK after 7.5 seconds (0 failed) for html of testXourses.TODO/linkTest.tex +[INFO ] bake : Command html|testXourses.TODO/linkTest.tex scheduled for RETRY (was job 2 (2)) +[STATUS ] bake : Command 2r/2 (2) starting for html of testXourses.TODO/linkTest.tex (html|testXourses.TODO/linkTest.tex) +[INFO ] bake : Moving /code/testXourses.TODO/linkTest.pdf to ximera-downloads/with-answers/testXourses.TODO/linkTest.pdf +[STATUS ] bake : Command 1/2 (1) returns OK after 10.0 seconds (0 failed) for pdf of testXourses.TODO/linkTest.tex +[INFO ] html : No parts found, adding one, as this is needed in (some versions of) the ximeraServer +[INFO ] html : Adapted html being saved as testXourses.TODO/linkTest.html (/code/testXourses.TODO/linkTest.html) +[STATUS ] bake : Command 2r/2 (2) returns OK after 5.0 seconds (0 failed) for html of testXourses.TODO/linkTest.tex +[STATUS ] bake : Finished compiling 1 files in 13.6 seconds +[STATUS ] main : Bake succeeded: Baked 1 files, no errors found +[INFO ] main : Mmm, file testXourses.TODO/linkTest.tex still needs compilation. +[INFO ] main : Still 1 files to be compiled after bake. +[STATUS ] main : Start frost +[WARNING] frost: There are 2 uncommitted files; should serve only to localhost +[WARNING] frost: There are 1 file to be compiled; should serve only to localhost +[INFO ] frost: Adding XOURSE testXourses.TODO/linkTest.tex (Master link Test Xourse) +[INFO ] frost: Found publications/0333286ab0e4c1ceb1046418afcc88032080ff59 (tree:e58298d99203d801017d707c551651ab53fdce1f tag:0333286ab0e4c1ceb1046418afcc88032080ff59) +[STATUS ] frost: Creating tag publications/a40cd692e6e6af56fd0ce8fc37f7db318d567d35 for a40cd692e6e6af56fd0ce8fc37f7db318d567d35 +[STATUS ] main : Frost succeeded: Created publications/a40cd692e6e6af56fd0ce8fc37f7db318d567d35 +[STATUS ] main : Start serve +[INFO ] frost: Publishing to localhost: http://localhost:2000/ximeraexamples.git +[STATUS ] frost: Forced serving (git push -f ximera publications/a40cd692e6e6af56fd0ce8fc37f7db318d567d35) +[STATUS ] frost: Forced serving (git push -f ximera a40cd692e6e6af56fd0ce8fc37f7db318d567d35:refs/heads/master) +[STATUS ] main : Serve succeeded: Published publications/a40cd692e6e6af56fd0ce8fc37f7db318d567d35to http://localhost:2000/ximeraexamples +``` + * Verify the output + +* If yoy make useful changes in .ximera_local : commit and push, make a pull request for ximeraLatex +* If you make useful changes in ximeraExamples: commit and push, make a pull request for ximeraExamples +* when in doubt, or when this procedure does not work as advertized: contact ximera-project! + + + + + + diff --git a/coreXimeraFeatures.tex b/coreXimeraFeatures.tex index eebdcda..3971630 100644 --- a/coreXimeraFeatures.tex +++ b/coreXimeraFeatures.tex @@ -39,7 +39,7 @@ \part{Other topics} % \sectionstyle \activity{./examples.TODO/hidingText/hidingText} -\activity{./examples.TODO/links/links} +\activity{link/link} %% chapters and sections %\activity{graphicsAndVideos/graphicsAndVideos} diff --git a/testXourses/accordionTest.tex b/depreciated/accordionTest.tex similarity index 76% rename from testXourses/accordionTest.tex rename to depreciated/accordionTest.tex index d447095..864e319 100644 --- a/testXourses/accordionTest.tex +++ b/depreciated/accordionTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/depreciated} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses/clearEnvTest.tex b/depreciated/clearEnvTest.tex similarity index 76% rename from testXourses/clearEnvTest.tex rename to depreciated/clearEnvTest.tex index b84ffd6..8e7d7c9 100644 --- a/testXourses/clearEnvTest.tex +++ b/depreciated/clearEnvTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/depreciated} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses/testFiles/depreciated.tex b/depreciated/depreciated.tex similarity index 100% rename from testXourses/testFiles/depreciated.tex rename to depreciated/depreciated.tex diff --git a/testXourses.TODO/endingTest.tex b/depreciated/endingTest.tex similarity index 58% rename from testXourses.TODO/endingTest.tex rename to depreciated/endingTest.tex index 0eaa718..5e5f01f 100644 --- a/testXourses.TODO/endingTest.tex +++ b/depreciated/endingTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Ending Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/googleTest.tex b/depreciated/googleTest.tex similarity index 58% rename from testXourses.TODO/googleTest.tex rename to depreciated/googleTest.tex index dd1770d..56e2bae 100644 --- a/testXourses.TODO/googleTest.tex +++ b/depreciated/googleTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Google Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses/gradedTest.tex b/depreciated/gradedTest.tex similarity index 58% rename from testXourses/gradedTest.tex rename to depreciated/gradedTest.tex index 41c5eb3..37d9c77 100644 --- a/testXourses/gradedTest.tex +++ b/depreciated/gradedTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Graded Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/depreciated} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses/hideEnvTest.tex b/depreciated/hideEnvTest.tex similarity index 77% rename from testXourses/hideEnvTest.tex rename to depreciated/hideEnvTest.tex index 65533b5..7a46452 100644 --- a/testXourses/hideEnvTest.tex +++ b/depreciated/hideEnvTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/depreciated} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/leashTest.tex b/depreciated/leashTest.tex similarity index 58% rename from testXourses.TODO/leashTest.tex rename to depreciated/leashTest.tex index f386287..dc16ac4 100644 --- a/testXourses.TODO/leashTest.tex +++ b/depreciated/leashTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master leash Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/logosTest.tex b/depreciated/logosTest.tex similarity index 58% rename from testXourses.TODO/logosTest.tex rename to depreciated/logosTest.tex index 12b5eb8..f975f74 100644 --- a/testXourses.TODO/logosTest.tex +++ b/depreciated/logosTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master logos Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/tikzexportTest.tex b/depreciated/tikzexportTest.tex similarity index 60% rename from testXourses.TODO/tikzexportTest.tex rename to depreciated/tikzexportTest.tex index 9fba18b..f463c0b 100644 --- a/testXourses.TODO/tikzexportTest.tex +++ b/depreciated/tikzexportTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master TikzExport Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/testXourses/ungradedTest.tex b/depreciated/ungradedTest.tex similarity index 59% rename from testXourses/ungradedTest.tex rename to depreciated/ungradedTest.tex index 63b0f37..13691d1 100644 --- a/testXourses/ungradedTest.tex +++ b/depreciated/ungradedTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Ungraded Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/depreciated} +\activity{depreciated} \end{document} \ No newline at end of file diff --git a/examples.TODO/links/links.tex b/examples.TODO/links/links.tex deleted file mode 100644 index 9f91501..0000000 --- a/examples.TODO/links/links.tex +++ /dev/null @@ -1,20 +0,0 @@ -\documentclass{ximera} - -\title{Links} - -\author{Bart Snapp} - -\begin{document} -\begin{abstract} - Examples of links. -\end{abstract} -\maketitle - -Here is one link: \link{http://ximera.osu.edu} - -Here is another link: \link[ximera]{http://ximera.osu.edu}, make sure that the spacing after the period looks good. - -Here sometimes you might have a \link[ximera]{http://ximera.osu.edu} with words after it. Make sure this looks good too. - - -\end{document} diff --git a/testXourses/bannerTest.tex b/hardCoded/bannerTest.tex similarity index 73% rename from testXourses/bannerTest.tex rename to hardCoded/bannerTest.tex index 7feadab..952934b 100644 --- a/testXourses/bannerTest.tex +++ b/hardCoded/bannerTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/hardCodedContent} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses/testFiles/hardCodedContent.tex b/hardCoded/hardCodedContent.tex similarity index 100% rename from testXourses/testFiles/hardCodedContent.tex rename to hardCoded/hardCodedContent.tex diff --git a/testXourses.TODO/macrosTest.tex b/hardCoded/macrosTest.tex similarity index 58% rename from testXourses.TODO/macrosTest.tex rename to hardCoded/macrosTest.tex index e4848ab..11411ee 100644 --- a/testXourses.TODO/macrosTest.tex +++ b/hardCoded/macrosTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master macros Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/makeCounterTest.tex b/hardCoded/makeCounterTest.tex similarity index 60% rename from testXourses.TODO/makeCounterTest.tex rename to hardCoded/makeCounterTest.tex index dc8a0d8..dd30a09 100644 --- a/testXourses.TODO/makeCounterTest.tex +++ b/hardCoded/makeCounterTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master MakeCounter Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/packagesTest.tex b/hardCoded/packagesTest.tex similarity index 59% rename from testXourses.TODO/packagesTest.tex rename to hardCoded/packagesTest.tex index 982dae4..a8ead1c 100644 --- a/testXourses.TODO/packagesTest.tex +++ b/hardCoded/packagesTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Packages Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/pagesetupTest.tex b/hardCoded/pagesetupTest.tex similarity index 60% rename from testXourses.TODO/pagesetupTest.tex rename to hardCoded/pagesetupTest.tex index 0b2673b..cb5b602 100644 --- a/testXourses.TODO/pagesetupTest.tex +++ b/hardCoded/pagesetupTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Page Setup Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses.TODO/preambleTest.tex b/hardCoded/preambleTest.tex similarity index 59% rename from testXourses.TODO/preambleTest.tex rename to hardCoded/preambleTest.tex index 60d7419..a18e3fa 100644 --- a/testXourses.TODO/preambleTest.tex +++ b/hardCoded/preambleTest.tex @@ -1,4 +1,4 @@ -%\documentclass{xourse} +\documentclass{xourse} \title{Master Preamble Test Xourse} @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/placeHolder} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses/sectioningTest.tex b/hardCoded/sectioningTest.tex similarity index 74% rename from testXourses/sectioningTest.tex rename to hardCoded/sectioningTest.tex index b13ede7..6662bde 100644 --- a/testXourses/sectioningTest.tex +++ b/hardCoded/sectioningTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/hardCodedContent} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses/suppressTest.tex b/hardCoded/suppressTest.tex similarity index 73% rename from testXourses/suppressTest.tex rename to hardCoded/suppressTest.tex index d2e98fb..28f0644 100644 --- a/testXourses/suppressTest.tex +++ b/hardCoded/suppressTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/hardCodedContent} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/testXourses/utilityMacrosTest.tex b/hardCoded/utilityMacrosTest.tex similarity index 74% rename from testXourses/utilityMacrosTest.tex rename to hardCoded/utilityMacrosTest.tex index 4639be5..d1548ce 100644 --- a/testXourses/utilityMacrosTest.tex +++ b/hardCoded/utilityMacrosTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/hardCodedContent} +\activity{hardCodedContent} \end{document} \ No newline at end of file diff --git a/link/README.md b/link/README.md new file mode 100644 index 0000000..b0187ad --- /dev/null +++ b/link/README.md @@ -0,0 +1,7 @@ +Screenshot of output: + +![screenshot expected output](../xmPictures/screenshot_links.png) + + + + diff --git a/link/link.tex b/link/link.tex new file mode 100644 index 0000000..0d1168a --- /dev/null +++ b/link/link.tex @@ -0,0 +1,48 @@ +\documentclass{ximera} + +\title{Links} + +\author{Bart Snapp and Wim Obbels} + +\begin{document} +\begin{abstract} + Examples of links. +\end{abstract} +\maketitle + +\section*{Basic Usage}\label{sec:link:basicUsage} + +With \verb|\link{url}| you make a hyperlink: \link{http://ximera.osu.edu}. + +With \verb|\link[text]{url}| you display 'text', and not the url: \link[ximera]{http://ximera.osu.edu}. + + + +Notes: +\begin{itemize} + \item \label{link_spaces} Note the spaces in and after a \link[link to ximera]{http://ximera.osu.edu} in a sentence. + \item \label{link_bold} You might want a bold \textbf{\link[link to ximera]{http://ximera.osu.edu}}, or a link with a bold 'ximera' in it: \link[link to \textbf{ximera}]{http://ximera.osu.edu}. + \item \label{link_footnote} The PDF puts links in footnotes\footnote{This is just a normal footnote} at the bottom of the page. +\end{itemize} + +Alternatives: + +With \verb|\url{url}| you make a hyperlink: \url{http://ximera.osu.edu}. + +With \verb|\href{url}{text}| you display 'text', and not the url: \href{http://ximera.osu.edu}{ximera}. + +With \verb|\hypertarget{label}{text}| you can create a target to link to: \hypertarget{ht_bold}{this text is important enough to be linked to}. + +With \verb|\hyperlink{label}{text}| you can (NOT???) link to a label: see also \hyperlink{ht_bold}{the previous sentence}. + +With \verb|\hyperlink{label}{text}| you can also link to a normal \verb|label|: see the item about \hyperlink{link_bold}{bold in links}, or the section with \hyperref[sec:link:intendedOutcome]{outcomes}. + +\section*{Intended Outcome of Test}\label{sec:link:intendedOutcome} + +TODO + + +% Compiled at \today\ at \currenttime %% needs datetime + + +\end{document} diff --git a/testXourses.TODO/linkTest.tex b/testXourses.TODO/linkTest.tex deleted file mode 100644 index 7389609..0000000 --- a/testXourses.TODO/linkTest.tex +++ /dev/null @@ -1,12 +0,0 @@ -%\documentclass{xourse} - -\title{Master link Test Xourse} - - -\begin{document} -\maketitle - -\activity{testFiles/placeHolder} - - -\end{document} \ No newline at end of file diff --git a/testXourses/linkTest.tex b/testXourses/linkTest.tex new file mode 100644 index 0000000..19251f2 --- /dev/null +++ b/testXourses/linkTest.tex @@ -0,0 +1,12 @@ +\documentclass{xourse} + +\title{Test link} + + +\begin{document} +\maketitle + +\activity{../link/link} + + +\end{document} \ No newline at end of file diff --git a/testXourses/sagemathTest.tex b/testXourses/sagemathTest.tex index c64a9de..061d393 100644 --- a/testXourses/sagemathTest.tex +++ b/testXourses/sagemathTest.tex @@ -6,7 +6,7 @@ \begin{document} \maketitle -\activity{testFiles/hardCodedContent} +\activity{testFiles/placeHolder} \end{document} \ No newline at end of file diff --git a/testXourses/testFiles/localization.tex b/testXourses/testFiles/localization.tex index e6a18fb..fbe7cda 100644 --- a/testXourses/testFiles/localization.tex +++ b/testXourses/testFiles/localization.tex @@ -46,7 +46,7 @@ \section{Intended Outcome of Test} The test area should have a multiple choice problem, a select all question with feedback (correct and attempt feedback), and an exercise with a hint. Then it should have all the theorem-like environments. -The entire section described above is done twice, once in the loaded language (french by default in localizationpreamble) +\textbf{IF the babel package is loaded:} The entire section described above is done twice, once in the loaded language (french by default in localizationpreamble) and then once via the selectlanguage command (by default, Portuguese). In each section, the content that \textit{is not} author controlled (e.g. environment titles, the phrase ``feedback(correct)'', etc) @@ -168,6 +168,9 @@ \section{Start of Test/Demo Area} This is a warning Environment. \end{warning}% Used in theorems.dtx +\makeatletter +\@ifpackageloaded{babel}{ + \selectlanguage{Portuguese}%% {{\bfseries\large Second Language: I think it is \languagename{}}} @@ -284,7 +287,8 @@ \section{Start of Test/Demo Area} \begin{warning} This is a warning Environment. \end{warning}% Used in theorems.dtx - +}{} +\makeatother \hrulefill \end{document} \ No newline at end of file diff --git a/xmPictures/screenshot_links.png b/xmPictures/screenshot_links.png new file mode 100644 index 0000000..47fc626 Binary files /dev/null and b/xmPictures/screenshot_links.png differ diff --git a/xmScripts/config.txt b/xmScripts/config.txt index 9cc0341..c520dd9 100644 --- a/xmScripts/config.txt +++ b/xmScripts/config.txt @@ -49,7 +49,7 @@ YOUR_EMAIL="DUMMY_EMAIL_TEST" # # For use in Actions, and perhaps to adapt the functionality of the PDF/HTML/SERVE buttons # -# export XM_COMPILE_SEQUENCE=html # which output to generate, eg "pdf,handout.pdf,html" +export XM_COMPILE_SEQUENCE=html,pdf,handout.pdf # which output to generate, eg "pdf,handout.pdf,html" # export XM_TO_PROCESS=aFirstXourse.tex # only build/frost/serve these files/courses # export XM_CONFIGFILE=more.cfg # exotic: if you want to use a different TeX4ht config file # export XM_SETTINGSFILE=config.lua # yet another way to set some options/Settings