From e0c3937f95e827aed031c7699a1fa78fec75e8cc Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Sun, 24 Jun 2018 18:48:37 +0200 Subject: [PATCH] Gestion des images en markdown --- AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj | 3 -- .../AideDeJeu/Tools/MarkdownExtensions.cs | 29 ++++++++++++++----- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj index c37b0dfe..fb7fc4da 100644 --- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj +++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj @@ -109,9 +109,6 @@ Designer - - Assets\database.db - diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs index 2203fcf7..a8e48dd5 100644 --- a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs +++ b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs @@ -234,7 +234,7 @@ namespace AideDeJeu.Tools } if (headingBlock.HeaderChar == '#' && headingBlock.Level == 2) { - switch(headingBlock.Inline.ToContainerString()) + switch (headingBlock.Inline.ToContainerString()) { case "Capacités": case "Special Features": @@ -372,9 +372,9 @@ namespace AideDeJeu.Tools }) }; - foreach(var property in properties) + foreach (var property in properties) { - if(str.StartsWith(property.Item1)) + if (str.StartsWith(property.Item1)) { property.Item2.Invoke(monster, str.Substring(property.Item1.Length)); break; @@ -407,7 +407,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 table = tableBlock.ToTable(); @@ -430,17 +430,25 @@ namespace AideDeJeu.Tools monster.Charisma = table["CHA"].FirstOrDefault(); } } - else if(block is Markdig.Syntax.LinkReferenceDefinitionGroup) + else if (block is Markdig.Syntax.LinkReferenceDefinitionGroup) { - + var linkReferenceDefinitionGroup = block as Markdig.Syntax.LinkReferenceDefinitionGroup; - + foreach (var linkBlock in linkReferenceDefinitionGroup) { var linkReferenceDefinition = linkBlock as Markdig.Syntax.LinkReferenceDefinition; //linkReferenceDefinition. } } + else if (block is Markdig.Syntax.LinkReferenceDefinition) + { + Debug.WriteLine(block.GetType()); + } + else + { + Debug.WriteLine(block.GetType()); + } } if (monster != null) { @@ -487,7 +495,12 @@ namespace AideDeJeu.Tools else if (inline is Markdig.Syntax.Inlines.LinkInline) { var linkInline = inline as Markdig.Syntax.Inlines.LinkInline; - add = string.Format($"[{linkInline.Label}]({linkInline.Url} \"{linkInline.Title}\")", linkInline.Label); //containerInline.ToContainerString(); + add = string.Empty; + if (linkInline.IsImage) + { + add = "!"; + } + add += string.Format($"[{linkInline.Label}]({linkInline.Url} \"{linkInline.Title}\")", linkInline.Label); //containerInline.ToContainerString(); } else if (inline is Markdig.Syntax.Inlines.ContainerInline) {