Marginal cleanups / Enter beta stage

datadiode · datadiode · commit 1081798b4ddd · 2021-02-21T18:38:37.000+01:00
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
@@ -51,7 +51,7 @@
 </head>
 <body>
 <h2>WinMerge [WinMergeTag] Release Notes</h2>
-This is an experimental release of WinMerge 2011.<br>
+This is a beta release of WinMerge 2011.<br>
 It includes the following enhancements as compared to the previous stable release:
 <ul class='features'>
 <li><p><a target='_blank' href='https://github.com/winmerge/winimerge'>WinIMergeLib</a> is used for image comparison.
diff --git a/EditorScripts/SortLines.wsc.EditorScript b/EditorScripts/SortLines.wsc.EditorScript
@@ -11,29 +11,29 @@
 // Adapted from Takashi's fork
 
 function SortLinesAscending(Text) {
-	var eol = Text.match(/\r\n|\r|\n/);
-	var lines = Text.split(/\r\n|\r|\n/);
+	var eol = Text.match(/\r\n?|\n/);
+	var lines = Text.split(/[\r\n]/);
 	lines.sort();
 	return lines.join(eol) + (/[\r\n]$/.test(Text) ? eol : "");
 }
 
 function SortLinesDescending(Text) {
-	var eol = Text.match(/\r\n|\r|\n/);
-	var lines = Text.split(/\r\n|\r|\n/);
+	var eol = Text.match(/\r\n?|\n/);
+	var lines = Text.split(/[\r\n]/);
 	lines.sort(function(a, b) { return a < b ? 1 : -1; });
 	return lines.join(eol) + (/[\r\n]$/.test(Text) ? eol : "");
 }
 
 function SortLinesAscendingNoCase(Text) {
-	var eol = Text.match(/\r\n|\r|\n/);
-	var lines = Text.split(/\r\n|\r|\n/);
+	var eol = Text.match(/\r\n?|\n/);
+	var lines = Text.split(/[\r\n]/);
 	lines.sort(function(a, b) { return a.toLowerCase() > b.toLowerCase() ? 1 : -1; });
 	return lines.join(eol) + (/[\r\n]$/.test(Text) ? eol : "");
 }
 
 function SortLinesDescendingNoCase(Text) {
-	var eol = Text.match(/\r\n|\r|\n/);
-	var lines = Text.split(/\r\n|\r|\n/);
+	var eol = Text.match(/\r\n?|\n/);
+	var lines = Text.split(/[\r\n]/);
 	lines.sort(function(a, b) { return a.toLowerCase() < b.toLowerCase() ? 1 : -1; });
 	return lines.join(eol) + (/[\r\n]$/.test(Text) ? eol : "");
 }
diff --git a/Filters/ASPNET.flt b/Filters/ASPNET.flt
@@ -1,44 +1,44 @@
-## This is a directory/file filter for WinMerge 
-## This filter lets through only files ASP.NET developers care about 
-name: ASP.NET Devel 
+## This is a directory/file filter for WinMerge
+## This filter lets through only files ASP.NET developers care about
+name: ASP.NET Devel
 desc: Lets through only files ASP.NET developer cares about
 
-## This is an exclusive filter 
-## (it lets through only matching files) 
-def: exclude 
+## This is an exclusive filter
+## (it lets through only matching files)
+def: exclude
 
-## Filters for filenames begin with f: 
-## Filters for directories begin with d: 
-## (Inline comments begin with " ##" and extend to the end of the line) 
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
 
-f: \.xml$ 
+f: \.xml$
 f: \.xlst$
 f: \.xsl$
 f: \.xslt$
-f: \.dtd$ 
-f: \.html$ 
-f: \.htm$ 
-f: \.css$ 
-f: \.gif$ 
-f: \.bmp$ 
-f: \.jpg$ 
-f: \.png$ 
-f: \.js$ 
-f: \.dll$ 
-f: \.aspx$ 
-f: \.asmx$ 
-f: \.ascx$ 
-f: \.vb$ 
-f: \.resx$ 
-f: \.cs$ 
-f: \.js$ 
-f: \.vbproj$ 
-f: \.csproj$ 
-f: \.sln$ 
-f: \.webinfo$ 
-f: \.config$ 
+f: \.dtd$
+f: \.html$
+f: \.htm$
+f: \.css$
+f: \.gif$
+f: \.bmp$
+f: \.jpg$
+f: \.png$
+f: \.js$
+f: \.dll$
+f: \.aspx$
+f: \.asmx$
+f: \.ascx$
+f: \.vb$
+f: \.resx$
+f: \.cs$
+f: \.js$
+f: \.vbproj$
+f: \.csproj$
+f: \.sln$
+f: \.webinfo$
+f: \.config$
 
-d: \\*$ ## Subdirectories 
+d: \\*$ ## Subdirectories
 
 ## Optional SQL filter
 WHERE
