diff --git a/windows/AdvancedWelcomeEulaDlg_Custom.wxs b/windows/AdvancedWelcomeEulaDlg_Custom.wxs
new file mode 100644
index 000000000..61e6d8e00
--- /dev/null
+++ b/windows/AdvancedWelcomeEulaDlg_Custom.wxs
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+ NOT Installed
+
+
+
\ No newline at end of file
diff --git a/windows/Pandoc-en-us.wxl b/windows/Pandoc-en-us.wxl
new file mode 100644
index 000000000..1981f24e8
--- /dev/null
+++ b/windows/Pandoc-en-us.wxl
@@ -0,0 +1,14 @@
+
+
+ 1033
+
+
+ COPYING.rtf
+
+ [ProductName] was installed in
+
+[APPLICATIONFOLDER].
+
+You may need to restart Cmd/Powershell windows before using it.
+
+
\ No newline at end of file
diff --git a/windows/WixUI_Advanced_Custom.wxs b/windows/WixUI_Advanced_Custom.wxs
new file mode 100644
index 000000000..6f85d9961
--- /dev/null
+++ b/windows/WixUI_Advanced_Custom.wxs
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
+ ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))
+
+
+
+
+ ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
+ ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+ 1
+ "1"]]>
+
+
+
+
+
+ ALLUSERS = 1
+ ALLUSERS = 1
+ !(wix.WixUISupportPerMachine) AND !(wix.WixUISupportPerUser)
+
+ ALLUSERS = 1
+ ALLUSERS = 1
+
+ NOT (ALLUSERS = 1)
+ NOT (ALLUSERS = 1)
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 1
+ NOT WIXUI_DONTVALIDATEPATH
+ "1"]]>
+ WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
+ 1
+ 1
+
+
+ NOT Installed AND WixAppFolder = "WixPerMachineFolder"
+ Installed
+
+ 1
+
+ 1
+ 1
+ 1
+
+ Installed AND NOT PATCH
+ Installed AND PATCH
+
+ Installed AND PATCH
+
+
+
+ Installed AND PATCH
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index d3d9bb71c..2f0bf4b88 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -18,9 +18,9 @@ if "%VERSION%" == "" (
)
echo Detected version %VERSION%
echo Creating msi...
-candle -dVERSION=%VERSION% -dBINPATH=%BINPATH% pandoc.wxs
+candle -dVERSION=%VERSION% -dBINPATH=%BINPATH% *.wxs -out wixobj\
if %errorlevel% neq 0 exit /b %errorlevel%
-light -sw1076 -ext WixUIExtension -ext WixUtilExtension -out pandoc-%VERSION%-windows.msi pandoc.wixobj
+light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out pandoc-%VERSION%-windows.msi wixobj\*.wixobj
if %errorlevel% neq 0 exit /b %errorlevel%
echo Starting kSign: sign, then quit kSign to complete the build...
kSign
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index d19ed81e1..878800149 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -1,18 +1,16 @@
-
-
+
-
+
-
-
@@ -21,7 +19,6 @@
Minimum='0.0.0.0' IncludeMinimum='yes'
Maximum="99.0.0.0" IncludeMaximum="no" />
-
@@ -126,92 +123,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ Property="WIXUI_EXITDIALOGOPTIONALTEXT"
+ Value="!(loc.ExitDialogText)" />
+
+
+
+
+ MsiNTProductType > 1
+
+
+ MsiNTProductType = 1
+
+
+ MsiNTProductType > 1
+
+
+ MsiNTProductType = 1
+
+
+ MsiNTProductType = 1
+
+
+ MsiNTProductType > 1
+
-
-
-
-
-
- ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
-
-
+
+
+
NOT Installed
-
- ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- WixAppFolder = "WixPerUserFolder"
-
- WixAppFolder = "WixPerMachineFolder"
-
- WixAppFolder = "WixPerUserFolder"
-
- WixAppFolder = "WixPerMachineFolder" AND ALLUSERS = 1
- WixAppFolder = "WixPerUserFolder" AND ALLUSERS = 2
- WixAppFolder = "WixPerUserFolder"
-
-
-
- WIXUI_DONTVALIDATEPATH OR
- WIXUI_INSTALLDIR_VALID="1"
-
-
-
- WixAppFolder = "WixPerUserFolder"
-
-
- WixAppFolder = "WixPerMachineFolder"
-
-
-
+
+
+
-
+
+