CVS difference for arm/progs/arm_db.adb

Differences between 1.19 and version 1.20
Log of other versions for file arm/progs/arm_db.adb

--- arm/progs/arm_db.adb	2022/06/21 06:09:11	1.19
+++ arm/progs/arm_db.adb	2022/09/23 04:28:51	1.20
@@ -413,10 +413,13 @@
 		Format_Text ("@begin(intro)" & Ascii.LF, "Prefix");
 		Temp := Database_Object.List;
 		while Temp /= null loop
- 		    Format_Text ("@subnumber" & Ascii.LF & Ascii.LF, "number for " & Temp.Sort_Key);
+ 		    --Format_Text ("@subnumber@*", "number for " & Temp.Sort_Key); -- Included below.
                         -- For ISO, these need to be numbered, based on the
                         -- enclosing subclause number. The subnumber command was
-                        -- added for this purpose.
+                        -- added for this purpose. Also, note that the number,
+                        -- term, and definition should not have spacing between
+                        -- them (we use "@*" rather than a paragraph end for
+                        -- separating), but the notes are separated.
                     -- First, the item name:                   
 		    case Temp.Change_Kind is
 			when None |
@@ -426,20 +429,28 @@
 --Ada.Text_IO.Put_Line("Format " & Change_if_Needed (Temp) &
 --			"@defn{" & Ada.Strings.Fixed.Trim (Temp.Sort_Key, Ada.Strings.Right) & "}");
 			    -- Index this item.
-		            Format_Text (Change_if_Needed (Temp) &
+		            --Format_Text (Change_if_Needed (Temp) &
+			    --    "@defn{" & Ada.Strings.Fixed.Trim (Temp.Sort_Key, Ada.Strings.Right) & "}@b{" & 
+                            --    Temp.Hang(1..Temp.Hang_Len) & "}@*", Temp.Sort_Key);
+		            Format_Text ("@subnumber@*" & Change_if_Needed (Temp) &
 			        "@defn{" & Ada.Strings.Fixed.Trim (Temp.Sort_Key, Ada.Strings.Right) & "}@b{" & 
-                                Temp.Hang(1..Temp.Hang_Len) & "}" & Ascii.LF & Ascii.LF, Temp.Sort_Key);
+                                Temp.Hang(1..Temp.Hang_Len) & "}@*" &
+                                Temp.Text.all & Ascii.LF & Ascii.LF, Temp.Sort_Key);
 			when Deleted | Deleted_Inserted_Number |
 			     Deleted_No_Delete_Message |
 			     Deleted_Inserted_Number_No_Delete_Message =>
 --** Debug:
 --Ada.Text_IO.Put_Line("Format " & Change_if_Needed (Temp));
 			    -- Don't index deleted items.
-		            Format_Text (Change_if_Needed (Temp) & "@b{" & 
-                                Temp.Hang(1..Temp.Hang_Len) & "}" & Ascii.LF & Ascii.LF, Temp.Sort_Key);
+		            --Format_Text (Change_if_Needed (Temp) & "@b{" & 
+                            --    Temp.Hang(1..Temp.Hang_Len) & "}@*", Temp.Sort_Key);
+		            Format_Text ("@subnumber@*" & Change_if_Needed (Temp) & "@b{" & 
+                                Temp.Hang(1..Temp.Hang_Len) & "}@*" &
+                                Temp.Text.all & Ascii.LF & Ascii.LF, Temp.Sort_Key);
 		    end case;
                     -- Now, the definition:
-	            Format_Text (Temp.Text.all & Ascii.LF & Ascii.LF, Temp.Sort_Key);
+	            --Format_Text (Temp.Text.all & Ascii.LF & Ascii.LF, Temp.Sort_Key); - Included above.
+                    -- Finally, the notes:
                     if Temp.Note1_Text /= null or else
                        Temp.Note2_Text /= null or else
                        Temp.Note3_Text /= null then

Questions? Ask the ACAA Technical Agent