CVS difference for arm/progs/arm_text.adb
--- arm/progs/arm_text.adb 2007/02/19 23:57:25 1.20
+++ arm/progs/arm_text.adb 2007/12/20 07:43:33 1.21
@@ -106,6 +106,8 @@
-- 2/ 9/07 - RLB - Changed comments on AI_Reference.
-- 2/13/07 - RLB - Revised to separate style and indent information
-- for paragraphs.
+ -- 12/18/07 - RLB - Added Plain_Annex.
+ -- 12/19/07 - RLB - Added limited colors to Text_Format.
LINE_LENGTH : constant := 78;
-- Maximum intended line length.
@@ -522,6 +524,11 @@
end if;
case Level is
+ when ARM_Contents.Plain_Annex =>
+ Put_Line_Centered (Output_Object.Output_File,
+ Clause_Number); -- Note: Clause_Number includes "Annex"
+ Put_Line_Centered (Output_Object.Output_File,
+ Header_Text);
when ARM_Contents.Normative_Annex =>
Put_Line_Centered (Output_Object.Output_File,
Clause_Number); -- Note: Clause_Number includes "Annex"
@@ -601,6 +608,11 @@
end if;
case Level is
+ when ARM_Contents.Plain_Annex =>
+ Put_Line_Centered (Output_Object.Output_File,
+ Clause_Number); -- Note: Clause_Number includes "Annex"
+ Put_Line_Centered (Output_Object.Output_File,
+ Header_Text);
when ARM_Contents.Normative_Annex =>
Put_Line_Centered (Output_Object.Output_File,
Clause_Number); -- Note: Clause_Number includes "Annex"
@@ -1181,19 +1193,8 @@
procedure Text_Format (Output_Object : in out Text_Output_Type;
- Bold : in Boolean;
- Italic : in Boolean;
- Font : in ARM_Output.Font_Family_Type;
- Size : in ARM_Output.Size_Type;
- Change : in ARM_Output.Change_Type;
- Version : in ARM_Contents.Change_Version_Type := '0';
- Added_Version : in ARM_Contents.Change_Version_Type := '0';
- Location : in ARM_Output.Location_Type) is
- -- Change the text format so that Bold, Italics, the font family,
- -- the text size, and the change state are as specified.
- -- Added_Version is only used when the change state is "Both"; it's
- -- the version of the insertion; Version is the version of the (newer)
- -- deletion.
+ Format : in ARM_Output.Format_Type) is
+ -- Change the text format so that all of the properties are as specified.
-- Note: Changes to these properties ought be stack-like; that is,
-- Bold on, Italic on, Italic off, Bold off is OK; Bold on, Italic on,
-- Bold off, Italic off should be avoided (as separate commands).
@@ -1208,13 +1209,13 @@
Ada.Exceptions.Raise_Exception (ARM_Output.Not_Valid_Error'Identity,
"Not in paragraph");
end if;
- if Location /= Output_Object.Location then
+ if Format.Location /= Output_Object.Location then
if Output_Object.Location /= ARM_Output.Normal then
Buffer(Output_Object, ')');
end if;
end if;
- if Change /= Output_Object.Change then
- if Change = ARM_Output.Both then
+ if Format.Change /= Output_Object.Change then
+ if Format.Change = ARM_Output.Both then
-- Open only the one(s) needed:
case Output_Object.Change is
-- Note: Version is not used.
@@ -1232,7 +1233,7 @@
end case;
elsif Output_Object.Change = ARM_Output.Both then
-- Close only the one(s) needed:
- case Change is
+ case Format.Change is
-- Note: Version is not used.
when ARM_Output.Insertion =>
-- Close the deletion:
@@ -1258,7 +1259,7 @@
Buffer(Output_Object, ']');
Buffer(Output_Object, '}');
end case;
- case Change is
+ case Format.Change is
-- Note: Version is not used.
when ARM_Output.Insertion =>
Buffer(Output_Object, '{');
@@ -1271,13 +1272,13 @@
Buffer(Output_Object, '[');
end case;
end if;
- Output_Object.Change := Change;
+ Output_Object.Change := Format.Change;
end if;
- if Location /= Output_Object.Location then
- if Location /= ARM_Output.Normal then
+ if Format.Location /= Output_Object.Location then
+ if Format.Location /= ARM_Output.Normal then
Buffer(Output_Object, '(');
end if;
- Output_Object.Location := Location;
+ Output_Object.Location := Format.Location;
end if;
null; -- Nothing else to do for plain text.
end Text_Format;
Questions? Ask the ACAA Technical Agent