conflict resolution

[org.ibex.core.git] / doc / reference / reference.xml

diff --git a/doc/reference/reference.xml b/doc/reference/reference.xml
index 844bad6..28f8a34 100644 (file)
--- a/doc/reference/reference.xml
+++ b/doc/reference/reference.xml
@@ -255,8 +255,7 @@
       and written) from both static scripts as well as instance
       scripts in a particular template. FIXME
       </definition>
-
-    </section>
+  </section>
   
   <section title="Metadata">
 
@@ -402,8 +401,6 @@
 <!-- ----------------------------------------------------------------------- -->
 <section title="Layout and Rendering">
 
-    <section title="Visual Components">
-  
       Each box occupies a rectangular region on the surface.  The visual
       appearance of a surface is created by rendering each box in its tree.
       Unless the [[clip]] attribute is [[false]], each box will
@@ -459,9 +456,6 @@
       These eight components plus the size of a box fully specify its
       appearance.  Every single box you see in Ibex is drawn only on the
       basis of these components and its size.
-    </section>  
-
-    <section title="Size and Position">
 
       The size and position of every box is determined by its
       properties, its childrens' sizes, and its parent's size and
@@ -495,8 +489,6 @@
       resizing the surface at all.  However, not all platforms give Ibex
       enough control to do this.
       
-      <image url="alignmentpoint.pdf" caption="The effect of alignment points on layout" width="3in"/>
-
     <heading title="The alignment point"/>
   
       When talking about positioning, we will often refer to the
@@ -547,9 +539,6 @@
           <ui:box id="4" />
           <ui:box id="5" colspan="2" />
       </ui:box>
-
-
-
       </pre>
       
       </section>
@@ -582,7 +571,14 @@
 
     <section title="Placing">
   
-      <section title="Packed Boxes">
+      <heading title="Non-Packed Boxes"/>
+
+      Each non-packed box is transformed according to the parent's
+      [[transform]] property and then positioned so that its alignment
+      point is [[(child.x, child.y)]] pixels from the corresponding
+      edge/corner/center of its parent.
+
+      <heading title="Packed Boxes"/>
 
       Ibex formulates a set of constraints for placing a box's
       **packed** children as follows:
@@ -615,17 +611,9 @@
       does not (due to [[maxwidth]] or minimum width constraints), the
       box's will be placed so that its alignment point coincides with
       the alignment point of that rectangle of cells.
-      </section>
-
-      <section title="Non-Packed Boxes">
-      Each non-packed box is transformed according to the parent's
-      [[transform]] property and then positioned so that its alignment
-      point is [[(child.x, child.y)]] pixels from the corresponding
-      edge/corner/center of its parent.
-      </section>
 
   </section>
-  
+
   <section title="Rendering">
 
     Boxes are rendered in a depth-first, pre-order traversal.  Note that
@@ -663,8 +651,7 @@
     </list>
     
     </section>
-
-  </section>
+</section>
 
 <!-- ----------------------------------------------------------------------- -->
 <section title="Box Properties">
@@ -2431,5 +2418,5 @@
 Copyright (C) 2004 Adam Megacz, verbatim redistribution permitted.
 Ibex is a trademark of Adam Megacz
 **
-    
+
 </ibex-doc>
\ No newline at end of file