5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-11-04 09:10:47 +00:00
Code Issues Projects Releases Wiki Activity

Abandon \r

Browse source
This commit is contained in:
Yan Maniez 2018-06-29 12:21:13 +02:00
parent 49b0fe6ba7
commit 348b1dd107
5 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu/AideDeJeu/Models/Spells/Spell.cs
View file

@ -58,7 +58,7 @@ namespace AideDeJeuLib.Spells
{ {
get get
{ {
return DescriptionDiv?.InnerText?.Replace("\n", "\r\n\r\n"); return DescriptionDiv?.InnerText?.Replace("\n", "\n\n");
} }
} }
[IgnoreDataMember] [IgnoreDataMember]

4
AideDeJeu/AideDeJeu/Tools/Converters.cs
View file

@ -70,7 +70,7 @@ namespace AideDeJeu.Tools
var cstring = string.Empty; var cstring = string.Empty;
foreach (var str in strings) foreach (var str in strings)
{ {
cstring += str + "\r\n"; cstring += str + "\n";
} }
return cstring; return cstring;
// var fs = new FormattedString(); // var fs = new FormattedString();
@ -80,7 +80,7 @@ namespace AideDeJeu.Tools
// doc.LoadXml("<div>" + str + "</div>"); // doc.LoadXml("<div>" + str + "</div>");
// FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentElement, fs); // FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentElement, fs);
// fs.Spans.Add(new Span() { Text = "\r\n" }); // fs.Spans.Add(new Span() { Text = "\n" });
// } // }
// return fs; // return fs;
//} //}

8
AideDeJeu/AideDeJeu/Tools/FormatedTextHelpers.cs
View file

@ -40,7 +40,7 @@ namespace AideDeJeu.Tools
} }
else if (node.NodeType == XmlNodeType.Element && node.Name == "br") else if (node.NodeType == XmlNodeType.Element && node.Name == "br")
{ {
fs.Spans.Add(new Span() { Text = "\r\n" }); fs.Spans.Add(new Span() { Text = "\n" });
} }
else if (node.NodeType == XmlNodeType.Element && node.Name == "strong") else if (node.NodeType == XmlNodeType.Element && node.Name == "strong")
{ {
@ -53,8 +53,8 @@ namespace AideDeJeu.Tools
else if (node.NodeType == XmlNodeType.Element && node.Name == "p") else if (node.NodeType == XmlNodeType.Element && node.Name == "p")
{ {
HtmlNodesToFormatedString(node.ChildNodes, fs, attributes); HtmlNodesToFormatedString(node.ChildNodes, fs, attributes);
fs.Spans.Add(new Span() { Text = "\r\n" }); fs.Spans.Add(new Span() { Text = "\n" });
fs.Spans.Add(new Span() { Text = "\r\n" }); fs.Spans.Add(new Span() { Text = "\n" });
} }
else if (node.NodeType == XmlNodeType.Element) else if (node.NodeType == XmlNodeType.Element)
{ {
@ -88,7 +88,7 @@ namespace AideDeJeu.Tools
// } // }
// else if (node.NodeType == HtmlNodeType.Element && node.Name == "br") // else if (node.NodeType == HtmlNodeType.Element && node.Name == "br")
// { // {
// fs.Spans.Add(new Span() { Text = "\r\n" }); // fs.Spans.Add(new Span() { Text = "\n" });
// } // }
// else if (node.NodeType == HtmlNodeType.Element && node.Name == "strong") // else if (node.NodeType == HtmlNodeType.Element && node.Name == "strong")
// { // {

28
AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
View file

@ -188,7 +188,7 @@ namespace AideDeJeu.Tools
else if (block is Markdig.Extensions.Tables.Table) else if (block is Markdig.Extensions.Tables.Table)
{ {
var tableBlock = block as Markdig.Extensions.Tables.Table; var tableBlock = block as Markdig.Extensions.Tables.Table;
spell.DescriptionHtml += "\r\n\r\n" + tableBlock.ToMarkdownString().Replace("\n","") + "\r\n\r\n"; spell.DescriptionHtml += "\n\n" + tableBlock.ToMarkdownString().Replace("\n","") + "\n\n";
} }
@ -565,13 +565,13 @@ namespace AideDeJeu.Tools
} }
if(row.IsHeader) if(row.IsHeader)
{ {
line += "\r\n|"; line += "\n|";
for(int i = 0; i < row.Count; i++) for(int i = 0; i < row.Count; i++)
{ {
line += "---|"; line += "---|";
} }
} }
ret += line + "\r\n"; ret += line + "\n";
} }
return ret; return ret;
} }
@ -645,13 +645,13 @@ namespace AideDeJeu.Tools
.Replace("</em>", "_") .Replace("</em>", "_")
.Replace("<li>", "* ") .Replace("<li>", "* ")
.Replace("</li>", "") .Replace("</li>", "")
//.Replace("\n", "\r\n\r\n") //.Replace("\n", "\n\n")
//.Replace("<br/>", "\r\n\r\n") //.Replace("<br/>", "\n\n")
.Replace("\n", "\r\n") .Replace("\n", "\n")
.Replace("<br/>", "\r\n") .Replace("<br/>", "\n")
; ;
md += string.Format("[{0}]: spells_hd.md#{1}\n", spell.NameVO, Helpers.IdFromName(spell.NameVO)); md += string.Format("[{0}]: spells_hd.md#{1}\n", spell.NameVO, Helpers.IdFromName(spell.NameVO));
md += "\r\n\r\n"; md += "\n\n";
return md; return md;
} }
@ -744,8 +744,8 @@ namespace AideDeJeu.Tools
// .Replace("</em>", "_") // .Replace("</em>", "_")
// .Replace("<li>", "* ") // .Replace("<li>", "* ")
// .Replace("</li>", "") // .Replace("</li>", "")
// .Replace("\n", "\r\n\r\n") // .Replace("\n", "\n\n")
// .Replace("<br/>", "\r\n\r\n") // .Replace("<br/>", "\n\n")
// ; // ;
md += string.Format("[{0}]: monsters_hd.md#{1}\n", monster.NameVO, Helpers.IdFromName(monster.NameVO)); md += string.Format("[{0}]: monsters_hd.md#{1}\n", monster.NameVO, Helpers.IdFromName(monster.NameVO));
md += "\n\n"; md += "\n\n";
@ -764,11 +764,11 @@ namespace AideDeJeu.Tools
.Replace("</em>", "_") .Replace("</em>", "_")
.Replace("<li>", "* ") .Replace("<li>", "* ")
.Replace("</li>", "") .Replace("</li>", "")
.Replace("\n", "\r\n\r\n") .Replace("\n", "\n\n")
.Replace("<br/>", "\r\n\r\n") .Replace("<br/>", "\n\n")
.Replace("<br />", "\r\n\r\n") .Replace("<br />", "\n\n")
.Replace("<p>", "") .Replace("<p>", "")
.Replace("</p>", "\r\n\r\n") .Replace("</p>", "\n\n")
; ;
} }

12
AideDeJeu/AideDeJeuCmd/Program.cs
View file

@ -108,16 +108,16 @@ namespace AideDeJeuCmd
foreach (var classe in classes) foreach (var classe in classes)
{ {
//Console.WriteLine(classe); //Console.WriteLine(classe);
result += string.Format("## {0}\r\n\r\n", classe); result += string.Format("## {0}\n\n", classe);
foreach (var level in levels) foreach (var level in levels)
{ {
//Console.WriteLine(level); //Console.WriteLine(level);
var spells = items.Where(s => s.Level == level && s.Source.Contains(classe)).OrderBy(s => s.Name).Select(s => string.Format("* [{0}](spells_hd.md#{1})", s.Name, Helpers.IdFromName(s.Name))).ToList(); var spells = items.Where(s => s.Level == level && s.Source.Contains(classe)).OrderBy(s => s.Name).Select(s => string.Format("* [{0}](spells_hd.md#{1})", s.Name, Helpers.IdFromName(s.Name))).ToList();
if (spells.Count > 0) if (spells.Count > 0)
{ {
result += string.Format("### {0}\r\n\r\n", level == "0" ? "Tours de magie" : "Niveau " + level); result += string.Format("### {0}\n\n", level == "0" ? "Tours de magie" : "Niveau " + level);
result += spells.Aggregate((s1, s2) => s1 + "\r\n" + s2); result += spells.Aggregate((s1, s2) => s1 + "\n" + s2);
result += "\r\n\r\n"; result += "\n\n";
} }
} }
} }
@ -205,7 +205,7 @@ namespace AideDeJeuCmd
// } // }
// } // }
//} //}
/*var regex = new Regex("- NameVO: (?<name>.*?)\r\n"); /*var regex = new Regex("- NameVO: (?<name>.*?)\n");
var matches = regex.Matches(md); var matches = regex.Matches(md);
foreach(Match match in matches) foreach(Match match in matches)
{ {
@ -224,7 +224,7 @@ namespace AideDeJeuCmd
//await SaveStringAsync(dataDir + "spells_vo_tmp.md", md); //await SaveStringAsync(dataDir + "spells_vo_tmp.md", md);
//var regex = new Regex("(\\[[a-z].*?\\])"); //var regex = new Regex("(\\[[a-z].*?\\])");
//var matches = regex.Matches(monstersVOmd); //var matches = regex.Matches(monstersVOmd);
//var links = matches.OrderBy(m => m.Value).Select(m => m.Value + string.Format(": spells_vo.md#{0}", m.Value.Replace("[", "").Replace("]","").Replace(" ","-"))).Distinct().ToList().Aggregate((a, b) => a + "\r\n" + b); //var links = matches.OrderBy(m => m.Value).Select(m => m.Value + string.Format(": spells_vo.md#{0}", m.Value.Replace("[", "").Replace("]","").Replace(" ","-"))).Distinct().ToList().Aggregate((a, b) => a + "\n" + b);
return; return;
//var mdhd = spellsHD.ToMarkdownString(); //var mdhd = spellsHD.ToMarkdownString();