Skip to content

Commit 43b6ec5

Browse files
EdditoriaEdditoria
committed
Merge branch 'RaffaeleMorganti-master'
Conflicts are resolved by adding changes from RaffaeleMorganti-master while keeping changes in master: # build/data.template.json # theme-blackboard/data.blackboard.json # theme-deep-black/data.deep-black.json # theme-default/data.default.json # theme-zenburn/data.zenburn.json Other conflicts are resolved by using the file in master branch: # docs/images/markdown-plus-plus-build-screenshot-1.png # docs/images/markdown-plus-plus-build-screenshot-2.png # docs/images/markdown-plus-plus-build-screenshot-3.png # README.md
2 parents 68a4b94 + bc58d45 commit 43b6ec5

5 files changed

Lines changed: 35 additions & 35 deletions

‎build/userDefinedLang-markdown.template.classic.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<NotepadPlus>
22
<UserLang name="Markdown [{{themeName}}]" ext="md markdown" udlVersion="2.1">
33
<Settings>
4-
<Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
4+
<Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
55
<Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="no" Keywords7="no" Keywords8="no" />
66
</Settings>
77
<KeywordLists>
88
<Keywords name="Comments">00# 01 02((EOL)) 03&lt;!-- 04--&gt;</Keywords>
99
<Keywords name="Numbers, prefix1"></Keywords>
10-
<Keywords name="Numbers, prefix2"></Keywords>
11-
<Keywords name="Numbers, extras1"></Keywords>
10+
<Keywords name="Numbers, prefix2">0x</Keywords>
11+
<Keywords name="Numbers, extras1">A B C D E F</Keywords>
1212
<Keywords name="Numbers, extras2"></Keywords>
1313
<Keywords name="Numbers, suffix1">.</Keywords>
14-
<Keywords name="Numbers, suffix2"></Keywords>
14+
<Keywords name="Numbers, suffix2">.</Keywords>
1515
<Keywords name="Numbers, range"></Keywords>
16-
<Keywords name="Operators1">@ &lt; &gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \!</Keywords>
17-
<Keywords name="Operators2">* - +</Keywords>
16+
<Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
17+
<Keywords name="Operators2">- +</Keywords>
1818
<Keywords name="Folders in code1, open"></Keywords>
1919
<Keywords name="Folders in code1, middle"></Keywords>
2020
<Keywords name="Folders in code1, close"></Keywords>
@@ -32,7 +32,7 @@
3232
<Keywords name="Keywords6"></Keywords>
3333
<Keywords name="Keywords7"></Keywords>
3434
<Keywords name="Keywords8"></Keywords>
35-
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03` 04\ 05` 06*** 07\ 08*** 09** 10\ 11** 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
35+
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03``` 03` 03~~~ 04\ 05``` 05((EOL `)) 05~~~ 06*** 07\ 08((EOL ***)) 09** 10\ 11((EOL **)) 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
3636
</KeywordLists>
3737
<Styles>
3838
<WordsStyle name="DEFAULT" fgColor="{{default.fgColor}}" bgColor="{{default.bgColor}}" {{#default.transparentBg}}colorStyle="1" {{/default.transparentBg}}fontName="" fontStyle="0" nesting="0" />

‎theme-blackboard/userDefinedLang-markdown.blackboard.classic.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<NotepadPlus>
22
<UserLang name="Markdown [Blackboard]" ext="md markdown" udlVersion="2.1">
33
<Settings>
4-
<Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
4+
<Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
55
<Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="no" Keywords7="no" Keywords8="no" />
66
</Settings>
77
<KeywordLists>
88
<Keywords name="Comments">00# 01 02((EOL)) 03&lt;!-- 04--&gt;</Keywords>
99
<Keywords name="Numbers, prefix1"></Keywords>
10-
<Keywords name="Numbers, prefix2"></Keywords>
11-
<Keywords name="Numbers, extras1"></Keywords>
10+
<Keywords name="Numbers, prefix2">0x</Keywords>
11+
<Keywords name="Numbers, extras1">A B C D E F</Keywords>
1212
<Keywords name="Numbers, extras2"></Keywords>
1313
<Keywords name="Numbers, suffix1">.</Keywords>
14-
<Keywords name="Numbers, suffix2"></Keywords>
14+
<Keywords name="Numbers, suffix2">.</Keywords>
1515
<Keywords name="Numbers, range"></Keywords>
16-
<Keywords name="Operators1">@ &lt; &gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \!</Keywords>
17-
<Keywords name="Operators2">* - +</Keywords>
16+
<Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
17+
<Keywords name="Operators2">- +</Keywords>
1818
<Keywords name="Folders in code1, open"></Keywords>
1919
<Keywords name="Folders in code1, middle"></Keywords>
2020
<Keywords name="Folders in code1, close"></Keywords>
@@ -32,7 +32,7 @@
3232
<Keywords name="Keywords6"></Keywords>
3333
<Keywords name="Keywords7"></Keywords>
3434
<Keywords name="Keywords8"></Keywords>
35-
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03` 04\ 05` 06*** 07\ 08*** 09** 10\ 11** 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
35+
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03``` 03` 03~~~ 04\ 05``` 05((EOL `)) 05~~~ 06*** 07\ 08((EOL ***)) 09** 10\ 11((EOL **)) 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
3636
</KeywordLists>
3737
<Styles>
3838
<WordsStyle name="DEFAULT" fgColor="F8F8F8" bgColor="0C1021" fontName="" fontStyle="0" nesting="0" />

‎theme-deep-black/userDefinedLang-markdown.deep-black.classic.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<NotepadPlus>
22
<UserLang name="Markdown [Deep Black]" ext="md markdown" udlVersion="2.1">
33
<Settings>
4-
<Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
4+
<Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
55
<Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="no" Keywords7="no" Keywords8="no" />
66
</Settings>
77
<KeywordLists>
88
<Keywords name="Comments">00# 01 02((EOL)) 03&lt;!-- 04--&gt;</Keywords>
99
<Keywords name="Numbers, prefix1"></Keywords>
10-
<Keywords name="Numbers, prefix2"></Keywords>
11-
<Keywords name="Numbers, extras1"></Keywords>
10+
<Keywords name="Numbers, prefix2">0x</Keywords>
11+
<Keywords name="Numbers, extras1">A B C D E F</Keywords>
1212
<Keywords name="Numbers, extras2"></Keywords>
1313
<Keywords name="Numbers, suffix1">.</Keywords>
14-
<Keywords name="Numbers, suffix2"></Keywords>
14+
<Keywords name="Numbers, suffix2">.</Keywords>
1515
<Keywords name="Numbers, range"></Keywords>
16-
<Keywords name="Operators1">@ &lt; &gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \!</Keywords>
17-
<Keywords name="Operators2">* - +</Keywords>
16+
<Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
17+
<Keywords name="Operators2">- +</Keywords>
1818
<Keywords name="Folders in code1, open"></Keywords>
1919
<Keywords name="Folders in code1, middle"></Keywords>
2020
<Keywords name="Folders in code1, close"></Keywords>
@@ -32,7 +32,7 @@
3232
<Keywords name="Keywords6"></Keywords>
3333
<Keywords name="Keywords7"></Keywords>
3434
<Keywords name="Keywords8"></Keywords>
35-
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03` 04\ 05` 06*** 07\ 08*** 09** 10\ 11** 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
35+
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03``` 03` 03~~~ 04\ 05``` 05((EOL `)) 05~~~ 06*** 07\ 08((EOL ***)) 09** 10\ 11((EOL **)) 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
3636
</KeywordLists>
3737
<Styles>
3838
<WordsStyle name="DEFAULT" fgColor="FFFFFF" bgColor="000000" fontName="" fontStyle="0" nesting="0" />

‎theme-default/userDefinedLang-markdown.default.classic.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<NotepadPlus>
22
<UserLang name="Markdown [Default]" ext="md markdown" udlVersion="2.1">
33
<Settings>
4-
<Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
4+
<Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
55
<Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="no" Keywords7="no" Keywords8="no" />
66
</Settings>
77
<KeywordLists>
88
<Keywords name="Comments">00# 01 02((EOL)) 03&lt;!-- 04--&gt;</Keywords>
99
<Keywords name="Numbers, prefix1"></Keywords>
10-
<Keywords name="Numbers, prefix2"></Keywords>
11-
<Keywords name="Numbers, extras1"></Keywords>
10+
<Keywords name="Numbers, prefix2">0x</Keywords>
11+
<Keywords name="Numbers, extras1">A B C D E F</Keywords>
1212
<Keywords name="Numbers, extras2"></Keywords>
1313
<Keywords name="Numbers, suffix1">.</Keywords>
14-
<Keywords name="Numbers, suffix2"></Keywords>
14+
<Keywords name="Numbers, suffix2">.</Keywords>
1515
<Keywords name="Numbers, range"></Keywords>
16-
<Keywords name="Operators1">@ &lt; &gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \!</Keywords>
17-
<Keywords name="Operators2">* - +</Keywords>
16+
<Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
17+
<Keywords name="Operators2">- +</Keywords>
1818
<Keywords name="Folders in code1, open"></Keywords>
1919
<Keywords name="Folders in code1, middle"></Keywords>
2020
<Keywords name="Folders in code1, close"></Keywords>
@@ -32,7 +32,7 @@
3232
<Keywords name="Keywords6"></Keywords>
3333
<Keywords name="Keywords7"></Keywords>
3434
<Keywords name="Keywords8"></Keywords>
35-
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03` 04\ 05` 06*** 07\ 08*** 09** 10\ 11** 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
35+
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03``` 03` 03~~~ 04\ 05``` 05((EOL `)) 05~~~ 06*** 07\ 08((EOL ***)) 09** 10\ 11((EOL **)) 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
3636
</KeywordLists>
3737
<Styles>
3838
<WordsStyle name="DEFAULT" fgColor="333333" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />

‎theme-zenburn/userDefinedLang-markdown.zenburn.classic.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<NotepadPlus>
22
<UserLang name="Markdown [Zenburn]" ext="md markdown" udlVersion="2.1">
33
<Settings>
4-
<Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
4+
<Global caseIgnored="yes" allowFoldOfComments="no" foldCompact="no" forcePureLC="2" decimalSeparator="0" />
55
<Prefix Keywords1="yes" Keywords2="yes" Keywords3="yes" Keywords4="yes" Keywords5="yes" Keywords6="no" Keywords7="no" Keywords8="no" />
66
</Settings>
77
<KeywordLists>
88
<Keywords name="Comments">00# 01 02((EOL)) 03&lt;!-- 04--&gt;</Keywords>
99
<Keywords name="Numbers, prefix1"></Keywords>
10-
<Keywords name="Numbers, prefix2"></Keywords>
11-
<Keywords name="Numbers, extras1"></Keywords>
10+
<Keywords name="Numbers, prefix2">0x</Keywords>
11+
<Keywords name="Numbers, extras1">A B C D E F</Keywords>
1212
<Keywords name="Numbers, extras2"></Keywords>
1313
<Keywords name="Numbers, suffix1">.</Keywords>
14-
<Keywords name="Numbers, suffix2"></Keywords>
14+
<Keywords name="Numbers, suffix2">.</Keywords>
1515
<Keywords name="Numbers, range"></Keywords>
16-
<Keywords name="Operators1">@ &lt; &gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \!</Keywords>
17-
<Keywords name="Operators2">* - +</Keywords>
16+
<Keywords name="Operators1">@ &lt; &gt; \&lt; \&gt; \\ \` \* \_ \{ \} \[ \] \( \) \# \+ \- \. \! \~ :|: |: :| | \|</Keywords>
17+
<Keywords name="Operators2">- +</Keywords>
1818
<Keywords name="Folders in code1, open"></Keywords>
1919
<Keywords name="Folders in code1, middle"></Keywords>
2020
<Keywords name="Folders in code1, close"></Keywords>
@@ -32,7 +32,7 @@
3232
<Keywords name="Keywords6"></Keywords>
3333
<Keywords name="Keywords7"></Keywords>
3434
<Keywords name="Keywords8"></Keywords>
35-
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03` 04\ 05` 06*** 07\ 08*** 09** 10\ 11** 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
35+
<Keywords name="Delimiters">00![ 00[ 01\ 02] 02] 03``` 03` 03~~~ 04\ 05``` 05((EOL `)) 05~~~ 06*** 07\ 08((EOL ***)) 09** 10\ 11((EOL **)) 12 13 14 15 16 17 18 19 20 21 22 23</Keywords>
3636
</KeywordLists>
3737
<Styles>
3838
<WordsStyle name="DEFAULT" fgColor="DCDCCC" bgColor="3F3F3F" fontName="" fontStyle="0" nesting="0" />

0 commit comments

Comments
 (0)