Update to v2.7.0

Author: Wim3000

.devcontainer/devcontainer.json

@@ -0,0 +1,40 @@
+{
+    "name": "Ximera Dev Container",
+    // "image": "ghcr.io/ximeraproject/xake2024:latest",
+    "dockerComposeFile": ["docker-compose.yml"],
+    "service": "app",
+    "workspaceFolder": "/code",
+    "forwardPorts": [2080],  // Port to access the web server
+      "portsAttributes": {
+        "2080": {
+          "label": "Web Server",
+          "onAutoForward": "notify",
+          "requireLocalPort": true
+        }
+      },    
+    // "portsAttributes": {
+    //     "2000": {
+    //        "label": "XimeraServer",
+    //        "onAutoForward": "openBrowserOnce"
+    //      }
+    //    },    
+    // "otherPortsAttributes": {
+    //     "onAutoForward": "ignore",
+    // },
+       // "remoteEnv": {
+    //   "DEV_MODE": "true"
+    // },
+    // "remoteUser": "vscode",
+    // "postStartCommand": "echo 'Ximera DevContainer started!'",
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "james-yu.latex-workshop",
+                // "ritwickdey.liveserver",
+                "spencerwmiles.vscode-task-buttons"
+            ]
+        }
+    }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,13 @@
+services:
+  app:
+    image: ghcr.io/ximeraproject/ximeralatex:v2.7.0
+    # image: ghcr.io/ximeraproject/ximeralatex:v2.7.0-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
+    command: /bin/sh -c "while sleep 1000; do :; done"   # run forever
+    network_mode: service:ximeraserver
+  ximeraserver:
+    image: registry.gitlab.kuleuven.be/wet/ximera/ximeradocker:2.3_b
+    ports:
+      - "2080:2000"          # Expose Ximera on port 2080

.gitignore

@@ -18,6 +18,7 @@ xmPictures/**
 !xmPictures/**/*.svg
 !xmPictures/**/*.pdf
 !xmPictures/**/*.png
+!xmPictures/**/*.tex
 ## Note: capital JPG/PDF/PNG should NOT be used ...
 !xmPictures/**/*.JPG
 !xmPictures/**/*.SVG

.vscode/settings.json

@@ -146,7 +146,7 @@
                 {
                     "task": "Generate GPG key",
                     "label": "Generate a (new) GPG key",
-                    "description": "First add your name/email to config.txt",
+                    "description": "It will be stored in .xmKeyfile. First edit config.txt if not-for-testing-only.",
                     "problemMatcher": [],
                 },
             ],

.vscode/tasks.json

@@ -21,16 +21,17 @@
         {
             "label": "HTML",
             "args": [
-                "bake",
+                "ghaction",
                 "--force",
-                "--compile draft.html",
+                "--compile html",
                 "${relativeFile}"
             ],
         },
         {
             "label": "SERVE",
             "args": [
-                "all"
+                "all",
+                "-s",
             ],
         },
         {
@@ -68,13 +69,15 @@
             "label": "Bake PDF",
             "args": [
                 "bake",
+                "-d",
                 "--compile pdf",
             ],
         },
         {
             "label": "Bake PDF (force rebuild)",
             "args": [
                 "bake",
+                "-d",
                 "-f",
                 "--compile pdf",
             ],

xmScripts/config.txt

@@ -2,8 +2,8 @@
 # version of Ximera xake container to use (with xmlatex)
 #
 # : "${XAKE_BASE:=ximeralatex}"
-# : "${XAKE_VERSION:=v2.5.10}"
-: "${XAKE_VERSION:=v2.5.10-full}"    # with texlive_full
+# : "${XAKE_VERSION:=v2.7.0}"
+# : "${XAKE_VERSION:=v2.7.0-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'
@@ -49,7 +49,7 @@ YOUR_EMAIL="[email protected]"
 #
 # For use in Actions, and perhaps to adapt the functionality of the PDF/HTML/SERVE buttons
 #
-# export XM_COMPILE_SEQUENCE=draft.html      # which output to generate, eg "handout.pdf,draft.html"
+# export XM_COMPILE_SEQUENCE=html            # 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

xmScripts/xmlatex

@@ -43,15 +43,15 @@ fi
 #
 # default docker image to run; overwrite with 'export XAKE_IMAGE=myxake:0.1'
 : "${XAKE_BASE:=ximeralatex}"
-: "${XAKE_VERSION:=v2.5.10}"
-# : "${XAKE_BASE:=xake2019}"
-# : "${XAKE_VERSION:=v2.1.1}"
+: "${XAKE_VERSION:=v2.7.0}"
 : "${XAKE_CONTAINER:=$XAKE_BASE:$XAKE_VERSION}"
 : "${DOCKER_REPO:=ghcr.io/ximeraproject/}"
 
 # For historic compatibility, keep supporting XAKE_IMAGE
 : "${XAKE_IMAGE:=$DOCKER_REPO$XAKE_CONTAINER}"   # TO BE OBSOLETED
 : "${DOCKER_IMAGE:=$XAKE_IMAGE}"
+: "${DOCKER_DEFAULT_PLATFORM:=linux/amd64}"      # needed for MacOS ?
+export DOCKER_DEFAULT_PLATFORM
 
 : "${SERVER_PORT:=2000}"
 : "${SERVER_NAME:=ximeraserver}"
@@ -112,6 +112,8 @@ else
     fi
 
     echo "Restarting myself in docker (from image $DOCKER_IMAGE)"	
+    tty >/dev/null && INTERACTIVE="-it"  # HACK: in termanal, run with -it, to process interrupts with CTRL-C
+
     [[ -n "$DEBUG" ]] && echo  \
     docker run --env LOCAL_IP --env XIMERA_URL --env XIMERA_NAME --env GPG_KEY --env GPG_KEY_ID --env DEBUG --network host --rm $INTERACTIVE --mount type=bind,source=$MOUNTDIR,target=/code $DOCKER_IMAGE $COMMAND $*
     docker run --env LOCAL_IP --env XIMERA_URL --env XIMERA_NAME --env GPG_KEY --env GPG_KEY_ID --env DEBUG --network host --rm $INTERACTIVE --mount type=bind,source=$MOUNTDIR,target=/code $DOCKER_IMAGE $COMMAND $*

xmScripts/xmlatex.bat

@@ -1,8 +1,7 @@
 @echo off
 set str=%*
 set "str=%str:\=/%"
-set "DOCKER_IMAGE=ghcr.io/ximeraproject/ximeralatex:v2.5.8"
-@REM set "DOCKER_IMAGE=ghcr.io/ximeraproject/xake2024:v2.4.2"
+set "DOCKER_IMAGE=ghcr.io/ximeraproject/ximeralatex:v2.6.8"
 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%