Merge branch 'topic/update_md' into 'master'

Update after Markdown API changes

See merge request eng/ide/gnatdoc!169

Author: reznikmm

source/backend/gnatdoc-backend-html_markup.adb

@@ -19,7 +19,7 @@ with VSS.IRIs;
 with VSS.XML.Events;
 with VSS.XML.Namespaces;
 
-with Markdown.Annotations.Visitors;
+with Markdown.Inlines.Visitors;
 with Markdown.Block_Containers;
 with Markdown.Blocks.Indented_Code;
 with Markdown.Blocks.Lists;
@@ -30,7 +30,7 @@ with Markdown.Parsers.GNATdoc_Enable;
 package body GNATdoc.Backend.HTML_Markup is
 
    type Annotated_Text_Builder is
-     limited new Markdown.Annotations.Visitors.Annotated_Text_Visitor with
+     limited new Markdown.Inlines.Visitors.Annotated_Text_Visitor with
    record
       Image  : Boolean := False;
       Text   : VSS.Strings.Virtual_String;
@@ -71,7 +71,7 @@ package body GNATdoc.Backend.HTML_Markup is
 
    procedure Build_Annotated_Text
      (Result : in out VSS.XML.Event_Vectors.Vector;
-      Item   : Markdown.Annotations.Annotated_Text'Class);
+      Item   : Markdown.Inlines.Inline_Vector'Class);
 
    procedure Build_Block
      (Result : in out VSS.XML.Event_Vectors.Vector;
@@ -126,10 +126,10 @@ package body GNATdoc.Backend.HTML_Markup is
 
    procedure Build_Annotated_Text
      (Result : in out VSS.XML.Event_Vectors.Vector;
-      Item   : Markdown.Annotations.Annotated_Text'Class)
+      Item   : Markdown.Inlines.Inline_Vector'Class)
    is
       Visitor  : Annotated_Text_Builder;
-      Iterator : Markdown.Annotations.Visitors.Annotated_Text_Iterator;
+      Iterator : Markdown.Inlines.Visitors.Annotated_Text_Iterator;
 
    begin
       Iterator.Iterate (Item, Visitor);
@@ -229,6 +229,7 @@ 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);

source/backend/markdown-annotations-visitors.adb

@@ -0,0 +1,94 @@
+--
+--  Copyright (C) 2025, AdaCore
+--
+--  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+--
+
+package body Markdown.Inlines.Visitors is
+
+   -------------
+   -- Iterate --
+   -------------
+
+   procedure Iterate
+     (Self    : in out Annotated_Text_Iterator'Class;
+      Text    : Markdown.Inlines.Inline_Vector'Class;
+      Visitor : in out Annotated_Text_Visitor'Class)
+   is
+      pragma Unreferenced (Self);
+
+      type Iteration_State is record
+         Destination : VSS.Strings.Virtual_String;
+         --  Link/image url
+         Title       : VSS.Strings.Virtual_String;
+         --  Link/image title
+         Attributes  : Markdown.Attribute_Lists.Attribute_List;
+         --  Link/image attributes if Link_Attributes extension is on
+      end record;
+      --  Suppose we don't have nested images for now.
+
+      procedure Iterate
+        (State : in out Iteration_State;
+         Item  : Markdown.Inlines.Inline);
+
+      -------------
+      -- Iterate --
+      -------------
+
+      procedure Iterate
+        (State : in out Iteration_State;
+         Item  : Markdown.Inlines.Inline)
+      is
+
+         Ignore : Boolean;
+
+      begin
+         case Item.Kind is
+            when Markdown.Inlines.Text =>
+               Visitor.Visit_Text (Item.Text);
+
+            when Markdown.Inlines.Start_Emphasis =>
+               Visitor.Enter_Emphasis;
+
+            when Markdown.Inlines.End_Emphasis =>
+               Visitor.Leave_Emphasis;
+
+            when Markdown.Inlines.Start_Strong =>
+               Visitor.Enter_Strong;
+
+            when Markdown.Inlines.End_Strong =>
+               Visitor.Leave_Strong;
+
+            when Markdown.Inlines.Code_Span =>
+               Visitor.Enter_Code_Span;
+               Visitor.Visit_Text (Item.Code_Span);
+               Visitor.Leave_Code_Span;
+
+            when Markdown.Inlines.Start_Image =>
+               State :=
+                 (Destination => Item.Destination,
+                  Title       => Item.Title.Join_Lines (VSS.Strings.LF),
+                  Attributes  => Item.Attributes);
+
+               Visitor.Enter_Image
+                 (Destination => State.Destination,
+                  Title       => State.Title);
+
+            when Markdown.Inlines.End_Image =>
+               Visitor.Leave_Image
+                 (Destination => State.Destination,
+                  Title       => State.Title);
+
+            when others =>
+               null;
+         end case;
+      end Iterate;
+
+      State : Iteration_State;
+   begin
+      for Item of Text loop
+         Iterate (State, Item);
+      end loop;
+   end Iterate;
+
+end Markdown.Inlines.Visitors;

source/backend/markdown-inlines-visitors.adb

@@ -4,7 +4,7 @@
 --  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 --
 
-package Markdown.Annotations.Visitors
+package Markdown.Inlines.Visitors
   with Preelaborate
 is
 
@@ -46,7 +46,7 @@ is
 
    procedure Iterate
      (Self    : in out Annotated_Text_Iterator'Class;
-      Text    : Markdown.Annotations.Annotated_Text'Class;
+      Text    : Markdown.Inlines.Inline_Vector'Class;
       Visitor : in out Annotated_Text_Visitor'Class);
 
 private
@@ -55,4 +55,4 @@ private
       null;
    end record;
 
-end Markdown.Annotations.Visitors;
+end Markdown.Inlines.Visitors;