CVS difference for arm/progs/arm_html.ads

Differences between 1.21 and version 1.22
Log of other versions for file arm/progs/arm_html.ads

--- arm/progs/arm_html.ads	2007/02/11 07:28:56	1.21
+++ arm/progs/arm_html.ads	2007/02/16 07:27:15	1.22
@@ -94,6 +94,8 @@
     --          - RLB - Added Local_Link_Start and Local_Link_End to allow
     --			formatting in the linked text.
     --  2/ 9/07 - RLB - Changed comments on AI_Reference.
+    --  2/13/07 - RLB - Revised to separate style and indent information
+    --			for paragraphs.
 
     type HTML_Output_Type is new ARM_Output.Output_Type with private;
 
@@ -197,8 +199,9 @@
 	-- Raises Not_Valid_Error if in a paragraph.
 
     procedure Start_Paragraph (Output_Object : in out HTML_Output_Type;
-			       Format : in ARM_Output.Paragraph_Type;
-			       Number : in String;
+			       Style     : in ARM_Output.Paragraph_Style_Type;
+			       Indent    : in ARM_Output.Paragraph_Indent_Type;
+			       Number    : in String;
 			       No_Prefix : in Boolean := False;
 			       Tab_Stops : in ARM_Output.Tab_Info := ARM_Output.NO_TABS;
 			       No_Breaks : in Boolean := False;
@@ -207,12 +210,12 @@
 				   := ARM_Output.Normal;
 			       Justification : in ARM_Output.Justification_Type
 				   := ARM_Output.Default);
-	-- Start a new paragraph. The format of the paragraph is as specified.
-	-- The (AA)RM paragraph number (which might include update and version
-	-- numbers as well: [12.1/1]) is Number. If the format is a type with
-	-- a prefix (bullets, hangining items), the prefix is omitted if
-	-- No_Prefix is true. Tab_Stops defines the tab stops for the
-	-- paragraph. If No_Breaks is True, we will try to avoid page breaks
+	-- Start a new paragraph. The style and indent of the paragraph is as
+	-- specified. The (AA)RM paragraph number (which might include update
+	-- and version numbers as well: [12.1/1]) is Number. If the format is
+	-- a type with a prefix (bullets, hangining items), the prefix is
+	-- omitted if No_Prefix is true. Tab_Stops defines the tab stops for
+	-- the paragraph. If No_Breaks is True, we will try to avoid page breaks
 	-- in the paragraph. If Keep_with_Next is true, we will try to avoid
 	-- separating this paragraph and the next one. (These may have no
 	-- effect in formats that don't have page breaks). Space_After
@@ -378,8 +381,8 @@
 
     procedure End_Hang_Item (Output_Object : in out HTML_Output_Type);
 	-- Marks the end of a hanging item. Call only once per paragraph.
-	-- Raises Not_Valid_Error if the paragraph format is not
-	-- Hanging .. Small_Nested_Enumerated, or if this has already been
+	-- Raises Not_Valid_Error if the paragraph style is not in
+	-- Text_Prefixed_Style_Subtype, or if this has already been
 	-- called for the current paragraph, or if the paragraph was started
 	-- with No_Prefix = True.
 
@@ -540,8 +543,9 @@
 	ALink_Color : Color_String;
 
 	-- Current formatting properties:
-	Is_In_Paragraph : Boolean := False;
-	Paragraph_Format : ARM_Output.Paragraph_Type;
+	Is_In_Paragraph  : Boolean := False;
+	Paragraph_Style  : ARM_Output.Paragraph_Style_Type;
+	Paragraph_Indent : ARM_Output.Paragraph_Indent_Type;
 	Had_Prefix : Boolean := False; -- If in paragraph, value of not No_Prefix.
 	Column_Count : ARM_Output.Column_Count := 1;
 	Output_File : Ada.Text_IO.File_Type;

Questions? Ask the ACAA Technical Agent