Merge branch 'topic/vadim/images' into 'master'

Support of images by RST backend

See merge request eng/ide/gnatdoc!171

Author: godunko

source/backend/gnatdoc-backend-html_markup.adb

@@ -19,6 +19,7 @@ with VSS.IRIs;
 with VSS.XML.Events;
 with VSS.XML.Namespaces;
 
+with Markdown.Attribute_Lists;
 with Markdown.Inlines.Visitors;
 with Markdown.Block_Containers;
 with Markdown.Blocks.Indented_Code;
@@ -41,6 +42,9 @@ package body GNATdoc.Backend.HTML_Markup is
      (Self : in out Annotated_Text_Builder;
       Text : VSS.Strings.Virtual_String);
 
+   overriding procedure Visit_Soft_Line_Break
+     (Self : in out Annotated_Text_Builder) is null;
+
    overriding procedure Enter_Emphasis
      (Self : in out Annotated_Text_Builder);
 
@@ -62,12 +66,14 @@ package body GNATdoc.Backend.HTML_Markup is
    overriding procedure Enter_Image
      (Self        : in out Annotated_Text_Builder;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String);
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List);
 
    overriding procedure Leave_Image
      (Self        : in out Annotated_Text_Builder;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String);
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List);
 
    procedure Build_Annotated_Text
      (Result : in out VSS.XML.Event_Vectors.Vector;
@@ -229,7 +235,6 @@ package body GNATdoc.Backend.HTML_Markup is
 
    begin
       Markdown.Parsers.GNATdoc_Enable (Parser);
-      Parser.Set_Extensions ((Link_Attributes => True));
 
       for Line of Text loop
          Parser.Parse_Line (Line);
@@ -294,7 +299,8 @@ package body GNATdoc.Backend.HTML_Markup is
    overriding procedure Enter_Image
      (Self        : in out Annotated_Text_Builder;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String) is
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List) is
    begin
       Self.Image := True;
    end Enter_Image;
@@ -338,7 +344,8 @@ package body GNATdoc.Backend.HTML_Markup is
    overriding procedure Leave_Image
      (Self        : in out Annotated_Text_Builder;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String)
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List)
    is
       use type VSS.Strings.Virtual_String;
 
@@ -354,6 +361,15 @@ package body GNATdoc.Backend.HTML_Markup is
          Write_Attribute (Self.Stream, "alt", Self.Text);
       end if;
 
+      for J in 1 .. Attributes.Length loop
+         if Attributes.Name (J) = "width" then
+            Write_Attribute (Self.Stream, "width", Attributes.Value (J));
+
+         elsif Attributes.Name (J) = "height" then
+            Write_Attribute (Self.Stream, "height", Attributes.Value (J));
+         end if;
+      end loop;
+
       Write_End_Element (Self.Stream, "img");
 
       Self.Image := False;

source/backend/markdown-inlines-visitors.adb

@@ -47,6 +47,9 @@ package body Markdown.Inlines.Visitors is
             when Markdown.Inlines.Text =>
                Visitor.Visit_Text (Item.Text);
 
+            when Markdown.Inlines.Soft_Line_Break =>
+               Visitor.Visit_Soft_Line_Break;
+
             when Markdown.Inlines.Start_Emphasis =>
                Visitor.Enter_Emphasis;
 
@@ -72,12 +75,14 @@ package body Markdown.Inlines.Visitors is
 
                Visitor.Enter_Image
                  (Destination => State.Destination,
-                  Title       => State.Title);
+                  Title       => State.Title,
+                  Attributes  => State.Attributes);
 
             when Markdown.Inlines.End_Image =>
                Visitor.Leave_Image
                  (Destination => State.Destination,
-                  Title       => State.Title);
+                  Title       => State.Title,
+                  Attributes  => State.Attributes);
 
             when others =>
                null;

source/backend/markdown-inlines-visitors.ads

@@ -4,6 +4,8 @@
 --  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 --
 
+with Markdown.Attribute_Lists;
+
 package Markdown.Inlines.Visitors
   with Preelaborate
 is
@@ -14,6 +16,9 @@ is
      (Self : in out Annotated_Text_Visitor;
       Text : VSS.Strings.Virtual_String) is abstract;
 
+   not overriding procedure Visit_Soft_Line_Break
+     (Self : in out Annotated_Text_Visitor) is abstract;
+
    not overriding procedure Enter_Emphasis
      (Self : in out Annotated_Text_Visitor) is abstract;
 
@@ -35,12 +40,14 @@ is
    not overriding procedure Enter_Image
      (Self        : in out Annotated_Text_Visitor;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String) is abstract;
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List) is abstract;
 
    not overriding procedure Leave_Image
      (Self        : in out Annotated_Text_Visitor;
       Destination : VSS.Strings.Virtual_String;
-      Title       : VSS.Strings.Virtual_String) is abstract;
+      Title       : VSS.Strings.Virtual_String;
+      Attributes  : Markdown.Attribute_Lists.Attribute_List) is abstract;
 
    type Annotated_Text_Iterator is tagged limited private;