zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #377: named parameterized snippets now work even if they are on a single line.

Browse source
This commit is contained in:
Dario Solera 2009-10-13 12:51:50 +00:00
parent cd75e9df29
commit 4224a5785b
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.0.351")] [assembly: AssemblyVersion("3.0.0.352")]
[assembly: AssemblyFileVersion("3.0.0.351")] [assembly: AssemblyFileVersion("3.0.0.352")]

12
Core/Formatter.cs
View file

@ -47,7 +47,7 @@ namespace ScrewTurn.Wiki {
private static readonly Regex TransclusionRegex = new Regex(@"\{T(\:|\|).+\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); private static readonly Regex TransclusionRegex = new Regex(@"\{T(\:|\|).+\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
private static readonly Regex HRRegex = new Regex(@"(?<=(\n|^))(\ )*----(\ )*\n", RegexOptions.Compiled); private static readonly Regex HRRegex = new Regex(@"(?<=(\n|^))(\ )*----(\ )*\n", RegexOptions.Compiled);
//private static readonly Regex SnippetRegex = new Regex(@"\{S(\:|\|)(.+?)(\|(.+?))*}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); //private static readonly Regex SnippetRegex = new Regex(@"\{S(\:|\|)(.+?)(\|(.+?))*}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
private static readonly Regex SnippetRegex = new Regex(@"\{s(\:|\|)(.+?)(\|.*?)*\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline); private static readonly Regex SnippetRegex = new Regex(@"\{s\:(.+?)(\|.*?)*\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);
private static readonly Regex TableRegex = new Regex(@"\{\|(\ [^\n]*)?\n.+?\|\}", RegexOptions.Compiled | RegexOptions.Singleline); private static readonly Regex TableRegex = new Regex(@"\{\|(\ [^\n]*)?\n.+?\|\}", RegexOptions.Compiled | RegexOptions.Singleline);
private static readonly Regex IndentRegex = new Regex(@"(?<=(\n|^))\:+(\ )?.+?\n", RegexOptions.Compiled); private static readonly Regex IndentRegex = new Regex(@"(?<=(\n|^))\:+(\ )?.+?\n", RegexOptions.Compiled);
private static readonly Regex EscRegex = new Regex(@"\<esc\>(.|\n|\r)*?\<\/esc\>", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline); private static readonly Regex EscRegex = new Regex(@"\<esc\>(.|\n|\r)*?\<\/esc\>", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);
@ -1295,14 +1295,18 @@ namespace ScrewTurn.Wiki {
/// <param name="cachedToc">The TOC content (trick to allow {TOC} to be inserted in snippets).</param> /// <param name="cachedToc">The TOC content (trick to allow {TOC} to be inserted in snippets).</param>
/// <returns>The formatted result.</returns> /// <returns>The formatted result.</returns>
private static string FormatSnippet(string capturedMarkup, string cachedToc) { private static string FormatSnippet(string capturedMarkup, string cachedToc) {
// If the captured markup contains only 1 line, process using "classic" method, assuming there are only numbered parameters // If the markup does not contain equal signs, process it using the classic method, assuming there are only positional parameters
if(capturedMarkup.IndexOf("\n") == -1) { if(capturedMarkup.IndexOf("=") == -1) {
string tempRes = FormatClassicSnippet(capturedMarkup); string tempRes = FormatClassicSnippet(capturedMarkup);
return ReplaceToc(tempRes, cachedToc); return ReplaceToc(tempRes, cachedToc);
} }
// If the markup contains "=" but not new lines, simulate the required structure as shown below
if(capturedMarkup.IndexOf("\n") == -1) {
capturedMarkup = capturedMarkup.Replace("|", "\n|");
}
// The format is: // The format is:
// {s|Name | param = value -- OR // {s:Name | param = value -- OR
// | param = value -- OR // | param = value -- OR
// | param = value // | param = value
// //