diff --git a/AideDeJeu/AideDeJeu/Models/Spells/Spell.cs b/AideDeJeu/AideDeJeu/Models/Spells/Spell.cs index ac5a0442..e525987b 100644 --- a/AideDeJeu/AideDeJeu/Models/Spells/Spell.cs +++ b/AideDeJeu/AideDeJeu/Models/Spells/Spell.cs @@ -58,7 +58,7 @@ namespace AideDeJeuLib.Spells { get { - return DescriptionDiv?.InnerText?.Replace("\n", "\r\n\r\n"); + return DescriptionDiv?.InnerText?.Replace("\n", "\n\n"); } } [IgnoreDataMember] diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs index 7339503d..88038c1d 100644 --- a/AideDeJeu/AideDeJeu/Tools/Converters.cs +++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs @@ -70,7 +70,7 @@ namespace AideDeJeu.Tools var cstring = string.Empty; foreach (var str in strings) { - cstring += str + "\r\n"; + cstring += str + "\n"; } return cstring; // var fs = new FormattedString(); @@ -80,7 +80,7 @@ namespace AideDeJeu.Tools // doc.LoadXml("
" + str + "
"); // FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentElement, fs); - // fs.Spans.Add(new Span() { Text = "\r\n" }); + // fs.Spans.Add(new Span() { Text = "\n" }); // } // return fs; //} diff --git a/AideDeJeu/AideDeJeu/Tools/FormatedTextHelpers.cs b/AideDeJeu/AideDeJeu/Tools/FormatedTextHelpers.cs index aca4a902..70100b94 100644 --- a/AideDeJeu/AideDeJeu/Tools/FormatedTextHelpers.cs +++ b/AideDeJeu/AideDeJeu/Tools/FormatedTextHelpers.cs @@ -40,7 +40,7 @@ namespace AideDeJeu.Tools } 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") { @@ -53,8 +53,8 @@ namespace AideDeJeu.Tools else if (node.NodeType == XmlNodeType.Element && node.Name == "p") { HtmlNodesToFormatedString(node.ChildNodes, fs, attributes); - fs.Spans.Add(new Span() { Text = "\r\n" }); - fs.Spans.Add(new Span() { Text = "\r\n" }); + fs.Spans.Add(new Span() { Text = "\n" }); + fs.Spans.Add(new Span() { Text = "\n" }); } else if (node.NodeType == XmlNodeType.Element) { @@ -88,7 +88,7 @@ namespace AideDeJeu.Tools // } // 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") // { diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs index bbc51dc0..7ab0ef96 100644 --- a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs +++ b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs @@ -188,7 +188,7 @@ namespace AideDeJeu.Tools else if (block is 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) { - line += "\r\n|"; + line += "\n|"; for(int i = 0; i < row.Count; i++) { line += "---|"; } } - ret += line + "\r\n"; + ret += line + "\n"; } return ret; } @@ -645,13 +645,13 @@ namespace AideDeJeu.Tools .Replace("", "_") .Replace("
  • ", "* ") .Replace("
  • ", "") - //.Replace("\n", "\r\n\r\n") - //.Replace("
    ", "\r\n\r\n") - .Replace("\n", "\r\n") - .Replace("
    ", "\r\n") + //.Replace("\n", "\n\n") + //.Replace("
    ", "\n\n") + .Replace("\n", "\n") + .Replace("
    ", "\n") ; 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; } @@ -744,8 +744,8 @@ namespace AideDeJeu.Tools // .Replace("", "_") // .Replace("
  • ", "* ") // .Replace("
  • ", "") - // .Replace("\n", "\r\n\r\n") - // .Replace("
    ", "\r\n\r\n") + // .Replace("\n", "\n\n") + // .Replace("
    ", "\n\n") // ; md += string.Format("[{0}]: monsters_hd.md#{1}\n", monster.NameVO, Helpers.IdFromName(monster.NameVO)); md += "\n\n"; @@ -764,11 +764,11 @@ namespace AideDeJeu.Tools .Replace("", "_") .Replace("
  • ", "* ") .Replace("
  • ", "") - .Replace("\n", "\r\n\r\n") - .Replace("
    ", "\r\n\r\n") - .Replace("
    ", "\r\n\r\n") + .Replace("\n", "\n\n") + .Replace("
    ", "\n\n") + .Replace("
    ", "\n\n") .Replace("

    ", "") - .Replace("

    ", "\r\n\r\n") + .Replace("

    ", "\n\n") ; } diff --git a/AideDeJeu/AideDeJeuCmd/Program.cs b/AideDeJeu/AideDeJeuCmd/Program.cs index 36e523da..1a546b4e 100644 --- a/AideDeJeu/AideDeJeuCmd/Program.cs +++ b/AideDeJeu/AideDeJeuCmd/Program.cs @@ -108,16 +108,16 @@ namespace AideDeJeuCmd foreach (var classe in classes) { //Console.WriteLine(classe); - result += string.Format("## {0}\r\n\r\n", classe); + result += string.Format("## {0}\n\n", classe); foreach (var level in levels) { //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(); if (spells.Count > 0) { - result += string.Format("### {0}\r\n\r\n", level == "0" ? "Tours de magie" : "Niveau " + level); - result += spells.Aggregate((s1, s2) => s1 + "\r\n" + s2); - result += "\r\n\r\n"; + result += string.Format("### {0}\n\n", level == "0" ? "Tours de magie" : "Niveau " + level); + result += spells.Aggregate((s1, s2) => s1 + "\n" + s2); + result += "\n\n"; } } } @@ -205,7 +205,7 @@ namespace AideDeJeuCmd // } // } //} - /*var regex = new Regex("- NameVO: (?.*?)\r\n"); + /*var regex = new Regex("- NameVO: (?.*?)\n"); var matches = regex.Matches(md); foreach(Match match in matches) { @@ -224,7 +224,7 @@ namespace AideDeJeuCmd //await SaveStringAsync(dataDir + "spells_vo_tmp.md", md); //var regex = new Regex("(\\[[a-z].*?\\])"); //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; //var mdhd = spellsHD.ToMarkdownString();