hl7-eu · gcangioli · May 11, 2026 · May 7, 2026 · May 10, 2026 · May 10, 2026
diff --git a/FHIR-eu-mpd.xml b/FHIR-eu-mpd.xml
@@ -2,7 +2,7 @@
 <specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.eu/fhir/mpd/0.1.0-ballot" ciUrl="https://build.fhir.org/ig/hl7-eu/mpd" defaultVersion="1.0.0" defaultWorkgroup="eu" gitUrl="https://github.com/HL7-eu/mpd" url="http://hl7.eu/fhir/mpd">
 <version code="current" url="https://build.fhir.org/ig/hl7-eu/mpd"/>
 <version code="1.0.0" url="http://hl7.eu/fhir/mpd/1.0.0"/>
-<version deprecated="true" code="0.1.0-ballot" url="http://hl7.eu/fhir/mpd/0.1.0-ballot"/>
+<version code="0.1.0-ballot" deprecated="true" url="http://hl7.eu/fhir/mpd/0.1.0-ballot"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>

diff --git a/_build.bat b/_build.bat
@@ -25,38 +25,54 @@ IF EXIST "%input_cache_path%%publisher_jar%" (
     ) ELSE (
         SET "jar_location=not_found"
         SET "default_choice=1"
+        SET "default_reason=publisher not found"
         ECHO publisher.jar not found in input-cache or parent folder
     )
 )
 
 
 :: Handle command-line argument to bypass the menu
-IF NOT "%~1"=="" (
-    IF /I "%~1"=="update" SET "userChoice=1"
-    IF /I "%~1"=="build" SET "userChoice=2"
-    IF /I "%~1"=="nosushi" SET "userChoice=3"
-    IF /I "%~1"=="notx" SET "userChoice=4"
-    IF /I "%~1"=="jekyll" SET "userChoice=5"
-    IF /I "%~1"=="clean" SET "userChoice=6"
-    IF /I "%~1"=="exit" SET "userChoice=0"
-    GOTO executeChoice
-)
+:: Known first arguments select a menu option; anything else is passed through to the publisher
+SET "extraArgs="
+IF "%~1"=="" GOTO showMenu
+IF /I "%~1"=="update" SET "userChoice=1" & GOTO parseExtra
+IF /I "%~1"=="build" SET "userChoice=2" & GOTO parseExtra
+IF /I "%~1"=="nosushi" SET "userChoice=3" & GOTO parseExtra
+IF /I "%~1"=="notx" SET "userChoice=4" & GOTO parseExtra
+IF /I "%~1"=="jekyll" SET "userChoice=5" & GOTO parseExtra
+IF /I "%~1"=="clean" SET "userChoice=6" & GOTO parseExtra
+IF /I "%~1"=="exit" SET "userChoice=0" & GOTO parseExtra
+:: Unknown first arg - default to build, pass all args through
+SET "userChoice=2"
+GOTO collectArgs
+:parseExtra
+SHIFT
+:collectArgs
+IF "%~1"=="" GOTO executeChoice
+SET "extraArgs=!extraArgs! %1"
+SHIFT
+GOTO collectArgs
+:showMenu
 
 echo ---------------------------------------------------------------
 ECHO Checking internet connection...
 PING tx.fhir.org -4 -n 1 -w 4000 >nul 2>&1 && SET "online_status=true" || SET "online_status=false"
 
 IF "%online_status%"=="true" (
-    ECHO We're online and tx.fhir.org is available.
+    ECHO We are online and tx.fhir.org is available.
     FOR /F "tokens=2 delims=:" %%a IN ('curl -s https://api.github.com/repos/HL7/fhir-ig-publisher/releases/latest ^| findstr "tag_name"') DO SET "latest_version=%%a"
     SET "latest_version=!latest_version:"=!"
     SET "latest_version=!latest_version: =!"
     SET "latest_version=!latest_version:~0,-1!"
 ) ELSE (
-    ECHO We're offline or tx.fhir.org is not available, can only run the publisher without TX...
+    ECHO.
+    ECHO *** WARNING: Working offline - this is not the normal mode.
+    ECHO     Some features including terminology rendering will not work.
+    ECHO.
     SET "txoption=-tx n/a"
     SET "latest_version=unknown"
     SET "default_choice=4"
+    SET "default_reason=working offline"
 )
 
 echo ---------------------------------------------------------------
@@ -74,14 +90,16 @@ IF NOT "%jar_location%"=="not_found" (
 ECHO Publisher version: !publisher_version!; Latest is !latest_version!
 
 IF NOT "%online_status%"=="true" (
-   ECHO We're offline.
+   ECHO We are offline.
 ) ELSE (
     IF NOT "!publisher_version!"=="!latest_version!" (
         ECHO An update is recommended.
         SET "default_choice=1"
+        SET "default_reason=newer version available"
     ) ELSE (
         ECHO Publisher is up to date.
         SET "default_choice=2"
+        SET "default_reason=publisher is up to date"
     )
 )
 
@@ -96,12 +114,9 @@ echo 4. Build IG - force no TX server
 echo 5. Jekyll build
 echo 6. Clean up temp directories
 echo 0. Exit
-:: echo [Press Enter for default (%default_choice%) or type an option number:]
 echo.
 
-:: Using CHOICE to handle input with timeout
-:: ECHO [Enter=Continue, 1-7=Option, 0=Exit]
-choice /C 12345670 /N /CS /D %default_choice% /T 5 /M "Choose an option number or wait 5 seconds for default (%default_choice%):"
+choice /C 12345670 /N /CS /D %default_choice% /T 5 /M "Choose an option number or wait 5 seconds for default (%default_choice% - %default_reason%):"
 SET "userChoice=%ERRORLEVEL%"
 
 
@@ -115,15 +130,12 @@ IF "%userChoice%"=="4" GOTO publish_notx
 IF "%userChoice%"=="5" GOTO debugjekyll
 IF "%userChoice%"=="6" GOTO clean
 IF "%userChoice%"=="0" EXIT /B
-
-:end
-
-
+GOTO endscript
 
 :debugjekyll
     echo Running Jekyll build...
     jekyll build -s temp/pages -d output
-GOTO end
+GOTO endscript
 
 
 :clean
@@ -152,10 +164,7 @@ GOTO end
         echo Removed: .\template
     )
 
-GOTO end
-
-
-
+GOTO endscript
 
 
 :downloadpublisher
@@ -198,7 +207,7 @@ IF DEFINED FORCE (
 	GOTO download
 )
 
-IF "%skipPrompts%"=="y" (
+IF "%skipPrompts%"=="true" (
 	SET create=Y
 ) ELSE (
 	SET /p create="Download? (Y/N) "
@@ -211,7 +220,7 @@ IF /I "%create%"=="Y" (
 GOTO done
 
 :upgrade
-IF "%skipPrompts%"=="y" (
+IF "%skipPrompts%"=="true" (
 	SET overwrite=Y
 ) ELSE (
 	SET /p overwrite="Overwrite %jarlocation%? (Y/N) "
@@ -265,15 +274,15 @@ GOTO done
 
 ECHO.
 ECHO Updating scripts
-IF "%skipPrompts%"=="y" (
+IF "%skipPrompts%"=="true" (
 	SET updateScripts=Y
 ) ELSE (
 	SET /p updateScripts="Update scripts? (Y/N) "
 )
 IF /I "%updateScripts%"=="Y" (
 	GOTO scripts
 )
-GOTO end
+GOTO endscript
 
 
 :scripts
@@ -299,27 +308,28 @@ ECHO Updating _build.bat
 call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%build_bat_url%\",\"_build.new.bat\") } else { Invoke-WebRequest -Uri "%build_bat_url%" -Outfile "_build.new.bat" }
 if %ERRORLEVEL% == 0 goto upd_script_2
 echo "Errors encountered during download: %errorlevel%"
-goto end
+goto endscript
 :upd_script_2
 start copy /y "_build.new.bat" "_build.bat" ^&^& del "_build.new.bat" ^&^& exit
 
 
-GOTO end
+GOTO endscript
 
 
 :publish_once
 
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO 1jar_location is: %jar_location%
+ECHO jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %*
+	ECHO IG Publisher FOUND, Publishing...
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %extraArgs%
 ) ELSE (
-	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
+	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run the script and update the publisher.  Aborting...
 )
 
-GOTO end
+GOTO endscript
 
 
 
@@ -328,14 +338,14 @@ GOTO end
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO 3jar_location is: %jar_location%
+ECHO jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -no-sushi %*
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -no-sushi %extraArgs%
 ) ELSE (
-	ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher.  Aborting...
+	ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run the script and update the publisher.  Aborting...
 )
 
-GOTO end
+GOTO endscript
 
 
 :publish_notx
@@ -344,43 +354,33 @@ SET txoption=-tx n/a
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO 2jar_location is: %jar_location%
+ECHO jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %*
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %extraArgs%
 ) ELSE (
-	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
+	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run the script and update the publisher.  Aborting...
 )
 
-GOTO end
-
-
+GOTO endscript
 
 
 :publish_continuous
 
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
-:: Debugging statements before running publisher
-ECHO Checking %input_cache_path% for publisher.jar
-IF EXIST "%input_cache_path%\%publisher_jar%" (
-	java %JAVA_OPTS% -jar "%input_cache_path%\%publisher_jar%" -ig . %txoption% -watch %*
+ECHO jar_location is: %jar_location%
+IF NOT "%jar_location%"=="not_found" (
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -watch %extraArgs%
 ) ELSE (
-    ECHO Checking %upper_path% for publisher.jar
-    IF EXIST "..\%publisher_jar%" (
-	    java %JAVA_OPTS% -jar "..\%publisher_jar%" -ig . %txoption% -watch %*
-    ) ELSE (
-	    ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
-    )
+	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run the script and update the publisher.  Aborting...
 )
 
-GOTO end
+GOTO endscript
 
 
-:end
+:endscript
 
 :: Pausing at the end
-
-
 IF NOT "%skipPrompts%"=="true" (
   PAUSE
 )