CVS difference for ais/ai-00433.txt

--- ais/ai-00433.txt	2005/10/31 05:18:44	1.5
+++ ais/ai-00433.txt	2005/12/15 02:44:20	1.6
@@ -98,8 +98,8 @@
 @xcode<'A'     '*'     '''     ' '>
 @dby
 @xcode<'A'     '*'     '''     ' '
-'L'     '@unicode<1051>'     '@unicode<923>'     --@ft<@i< Various els.>>
-'@unicode<8734>'     '@unicode<1488>'           --@ft<@i< Big numbers - infinity and aleph.>>>
+'L'     '@unicode<1051>'     '@unicode<923>'    --@ft<@i< Various els.>>
+'@unicode<8734>'     '@unicode<1488>'            --@ft<@i< Big numbers - infinity and aleph.>>>
 
 
 !corrigendum 2.6(9)
@@ -282,7 +282,8 @@
 
 @xcode<@b<type> Queue @b<is limited interface>;
 @b<procedure> Append(Q : @b<in out> Queue; Person : @b<in> Person_Name) @b<is abstract>;
-@b<procedure> Remove_First(Q : @b<in out> Queue; Person : @b<out> Person_Name) @b<is abstract>;
+@b<procedure> Remove_First(Q      : @b<in out> Queue;
+                       Person : @b<out> Person_Name) @b<is abstract>;
 @b<function> Cur_Count(Q : @b<in> Queue) @b<return> Natural @b<is abstract>;
 @b<function> Max_Count(Q : @b<in> Queue) @b<return> Natural @b<is abstract>;
 -- @ft<@i<See 3.10.1 for Person_Name.>>
@@ -292,8 +293,10 @@
 --@ft<@i< Remove_First raises Queue_Error if Count(Q) = 0>>
 
 @b<type> Synchronized_Queue @b<is synchronized interface and> Queue; --@ft<@i< see 9.11>>
-@b<procedure> Append_Wait(Q : @b<in out> Synchronized_Queue; Person : @b<in> Person_Name) @b<is abstract>;
-@b<procedure> Remove_First_Wait(Q : @b<in out> Synchronized_Queue; Person : @b<out> Person_Name) @b<is abstract>;
+@b<procedure> Append_Wait(Q      : @b<in out> Synchronized_Queue;
+                      Person : @b<in> Person_Name) @b<is abstract>;
+@b<procedure> Remove_First_Wait(Q      : @b<in out> Synchronized_Queue;
+                            Person : @b<out> Person_Name) @b<is abstract>;
 
 ...
 
@@ -329,7 +332,7 @@
 
 @i<Example use of the interface:>
 
-@b<type> Fast_Food_Queue @b<is new> Queue @b<with record> ...;
+@xcode<@b<type> Fast_Food_Queue @b<is new> Queue @b<with record> ...;
 @b<procedure> Append(Q : @b<in out> Fast_Food_Queue; Person : @b<in> Person_Name);
 @b<procedure> Remove_First(Q : @b<in out> Fast_Food_Queue; Person : @b<in> Person_Name);
 @b<function> Cur_Count(Q : @b<in> Fast_Food_Queue) @b<return> Natural;
@@ -344,7 +347,7 @@
 Append (Cashier, George);
 -- @ft<@i<After payment, move George to the sandwich counter queue:>>
 Transfer (Cashier, Counter);
-...
+...>
 
 An interface such as Queue can be used directly as the parent of a new type
 (as shown here), or can be used as a progenitor when a type is derived.
@@ -904,15 +907,17 @@
    @b<type> String_Id @b<is> ...
 
    @b<type> Symbol_Info @b<is> ...
-
-   @b<package> String_Table @b<is new> Ada.Containers.Ordered_Maps(Key_Type =@> String,
-                                                           Element_Type =@> String_Id);
 
-   @b<package> Symbol_Table @b<is new> Ada.Containers.Ordered_Maps(Key_Type =@> String_Id,
-                                                            Element_Type =@> Symbol_Info);
+   @b<package> String_Table @b<is new> Ada.Containers.Ordered_Maps
+           (Key_Type =@> String,
+            Element_Type =@> String_Id);
+
+   @b<package> Symbol_Table @b<is new> Ada.Containers.Ordered_Maps
+           (Key_Type =@> String_Id,
+            Element_Type =@> Symbol_Info);
 
    @b<package> String_Info @b<is new> Ordered_Join(Mapping_1 =@> String_Table,
-                                            Mapping_2 =@> Symbol_Table);
+                                           Mapping_2 =@> Symbol_Table);
 
    Apple_Info : @b<constant> Symbol_Info := String_Info.Lookup("Apple");>