From c2159afa9dba08009420e9195e145f4f634872aa Mon Sep 17 00:00:00 2001
From: Edditoria <edditoria@gmail.com>
Date: Sun, 25 Oct 2020 00:51:48 +0800
Subject: [PATCH] Update markdown UDL XML file

The XML file is updated from v2.x to v3.2.0
in the commit: Edditoria/markdown-plus-plus@c137918

Also rename it shorter and starting with "m".
So users can sort their UDL file-list in tidy.

Close #9058
---
 ...ern.xml => markdown._preinstalled.udl.xml} | 21 ++++++++++++++++---
 .../nsisInclude/mainSectionFuncs.nsh          |  2 +-
 .../installer/nsisInclude/uninstall.nsh       |  2 ++
 PowerEditor/installer/packageAll.bat          |  8 +++----
 4 files changed, 25 insertions(+), 8 deletions(-)
 rename PowerEditor/bin/userDefineLangs/{userDefinedLang-markdown.default.modern.xml => markdown._preinstalled.udl.xml} (86%)

diff --git a/PowerEditor/bin/userDefineLangs/userDefinedLang-markdown.default.modern.xml b/PowerEditor/bin/userDefineLangs/markdown._preinstalled.udl.xml
similarity index 86%
rename from PowerEditor/bin/userDefineLangs/userDefinedLang-markdown.default.modern.xml
rename to PowerEditor/bin/userDefineLangs/markdown._preinstalled.udl.xml
index df995af46..40705f6f2 100644
--- a/PowerEditor/bin/userDefineLangs/userDefinedLang-markdown.default.modern.xml
+++ b/PowerEditor/bin/userDefineLangs/markdown._preinstalled.udl.xml
@@ -1,5 +1,20 @@
+<!--//
+Markdown-plus-plus is a project to support Markdown syntax in Notepad++.
+All UDLs are carefully designed by human, rather than generated by machine.
+
+Want an UDL for different theme?
+Want to change its preference?
+Want to create your own?
+Go get it: https://github.com/Edditoria/markdown-plus-plus
+
+Please read the README file for details.
+Welcome issues and pull requests via the above link.
+
+Copyright (c) Edditoria. Open source under the MIT license:
+https://github.com/Edditoria/markdown-plus-plus/blob/master/LICENSE.txt
+//-->
 <NotepadPlus>
-    <UserLang name="Markdown (Default)" ext="md markdown" udlVersion="2.1">
+    <UserLang name="Markdown (preinstalled)" ext="md markdown" udlVersion="2.1">
         <Settings>
             <Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
             <Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="yes" Keywords7="yes" Keywords8="no" />
@@ -13,8 +28,8 @@
             <Keywords name="Numbers, suffix1">.</Keywords>
             <Keywords name="Numbers, suffix2">.</Keywords>
             <Keywords name="Numbers, range"></Keywords>
-            <Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
-            <Keywords name="Operators2">- +</Keywords>
+            <Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ \| |:-: |:--: |:---: | :-: :--: :---: :|: |: :|</Keywords>
+            <Keywords name="Operators2">- + :- :-- :--- :</Keywords>
             <Keywords name="Folders in code1, open"></Keywords>
             <Keywords name="Folders in code1, middle"></Keywords>
             <Keywords name="Folders in code1, close"></Keywords>
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index cadb83e27..25abc0126 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -113,7 +113,7 @@ Function copyCommonFiles
 
 	; Markdown in user defined languages
 	SetOutPath "$UPDATE_PATH\userDefineLangs\"
-	File "..\bin\userDefineLangs\userDefinedLang-markdown.default.modern.xml"
+	File "..\bin\userDefineLangs\markdown._preinstalled.udl.xml"
 
 	; Localization
 	; Default language English 
diff --git a/PowerEditor/installer/nsisInclude/uninstall.nsh b/PowerEditor/installer/nsisInclude/uninstall.nsh
index a79b7f5c1..acd9f16ed 100644
--- a/PowerEditor/installer/nsisInclude/uninstall.nsh
+++ b/PowerEditor/installer/nsisInclude/uninstall.nsh
@@ -248,6 +248,7 @@ Section Uninstall
 	Delete "$INSTDIR\NppHelp.chm"
 	Delete "$INSTDIR\userDefinedLang-markdown.default.modern.xml"
 	Delete "$INSTDIR\userDefineLangs\userDefinedLang-markdown.default.modern.xml"
+	Delete "$INSTDIR\userDefineLangs\markdown._preinstalled.udl.xml"
 	Delete "$INSTDIR\doLocalConf.xml"
 	Delete "$INSTDIR\uninstall.ini"
 	
@@ -269,6 +270,7 @@ Section Uninstall
 		Delete "$APPDATA\${APPNAME}\userDefineLang.xml"
 		Delete "$APPDATA\${APPNAME}\insertExt.ini"
 		Delete "$APPDATA\${APPNAME}\userDefineLangs\userDefinedLang-markdown.default.modern.xml"
+		Delete "$APPDATA\${APPNAME}\userDefineLangs\markdown._preinstalled.udl.xml"
 		RMDir /r "$APPDATA\${APPNAME}\plugins\"
 		RMDir /r "$APPDATA\${APPNAME}\backup\"	; Remove backup folder recursively if not empty
 		RMDir "$APPDATA\${APPNAME}\themes\"	; has no effect as not empty at this moment, but it is taken care at un.onUninstSuccess
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index 4ddb36221..9b5784cb8 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -76,7 +76,7 @@ copy /Y ..\bin\readme.txt .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist\
 If ErrorLevel 1 goto End
-copy /Y "..\bin\userDefineLangs\userDefinedLang-markdown.default.modern.xml" .\minimalist\userDefineLangs\
+copy /Y "..\bin\userDefineLangs\markdown._preinstalled.udl.xml" .\minimalist\userDefineLangs\
 If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist\
 If ErrorLevel 1 goto End
@@ -103,7 +103,7 @@ copy /Y ..\bin\readme.txt .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist64\
 If ErrorLevel 1 goto End
-copy /Y "..\bin\userDefineLangs\userDefinedLang-markdown.default.modern.xml" .\minimalist64\userDefineLangs\
+copy /Y "..\bin\userDefineLangs\markdown._preinstalled.udl.xml" .\minimalist64\userDefineLangs\
 If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist64\
 If ErrorLevel 1 goto End
@@ -237,9 +237,9 @@ copy /Y ".\functionList\*.xml" .\zipped.package.release64\functionList\
 If ErrorLevel 1 goto End
 
 rem Markdown as UserDefineLanguge: Markdown syntax highlighter into Notepad++ 32-bit/64-bit package folders
-copy /Y "..\bin\userDefineLangs\userDefinedLang-markdown.default.modern.xml" .\zipped.package.release\userDefineLangs\
+copy /Y "..\bin\userDefineLangs\markdown._preinstalled.udl.xml" .\zipped.package.release\userDefineLangs\
 If ErrorLevel 1 goto End
-copy /Y "..\bin\userDefineLangs\userDefinedLang-markdown.default.modern.xml" .\zipped.package.release64\userDefineLangs\
+copy /Y "..\bin\userDefineLangs\markdown._preinstalled.udl.xml" .\zipped.package.release64\userDefineLangs\
 If ErrorLevel 1 goto End
 
 rem theme: Copy all files into Notepad++ 32-bit/64-bit package folders