Aligning items: shapes take part in Snap and Align, a group counts as one (pending PR #1152)

aligning_items.md

@@ -59,12 +59,18 @@ what happened:
 
 ### Which items move, and to which grid
 
+> **Status: pending.** The shape changes in this section describe
+> [PR #1152](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1152),
+> not yet merged. Until it lands, shapes are left out: a selection of
+> shapes only greys the commands out, and a shape outside a group is not
+> moved. This notice will come out once it merges.
+
 | Item | Snaps to |
 |---|---|
 | Symbols | the folio grid, by the symbol's origin point: exactly where dragging it would have dropped it |
 | Pictures | the folio grid |
 | Free texts | the text grid, the finer step set under **Affichage ▸ Grille des textes** (*View ▸ Text grid*), so a text you placed on a finer step is not pulled onto the coarser folio grid |
-| Shapes (lines, rectangles, polygons) | not moved: a shape is several points, and no single one is the obvious one to snap |
+| Shapes (lines, rectangles, ellipses, polygons) | the folio grid, by the **top-left corner of the shape as drawn**: a rectangle's corner, the corner of an ellipse's box. The line thickness does not count |
 | Locked items | not moved |
 | Wires | follow their symbols, as they do when you drag |
 
@@ -91,9 +97,16 @@ Items already on the grid stay exactly where they are.
 
 ## Align
 
+> **Status: pending.** The shape changes in this section, and "a single
+> group counts as one item", describe
+> [PR #1152](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1152),
+> not yet merged. Until it lands, shapes are left out: a selection of
+> shapes only greys the commands out, and a shape outside a group is not
+> moved. This notice will come out once it merges.
+
 ### Using it
 
-1. Select **two or more** items: symbols, pictures, free texts or groups.
+1. Select **two or more** items: symbols, pictures, free texts, shapes or groups.
 2. Choose one of the six commands under **Édition ▸ Aligner** (*Edit ▸
    Align*), the same submenu as Snap to grid. It is also in the right-click
    menu of the selection, and in command search (**Ctrl+Shift+M**, type
@@ -111,7 +124,8 @@ Items already on the grid stay exactly where they are.
 | Aligner en bas | *Align bottom* | the bottom-most bottom edge |
 
 With a single item selected the six commands are greyed out; only Snap to
-grid is available.
+grid is available. A single group counts as one item, however many things
+are in it.
 
 ![Left: the steps of a grafcet knocked out of line, with bent wires. Right: the same steps after Centrer horizontalement, in one straight column with straight wires](https://raw.githubusercontent.com/wiki/qelectrotech/qelectrotech-source-mirror/images/align-centre-before-after.png)
 
@@ -121,7 +135,7 @@ The status bar says what happened:
 |---|---|
 | *4 objet(s) aligné(s)* | 4 items moved |
 | *La sélection est déjà alignée, à la grille près* | nothing needed moving (see "The grid wins" below); no undo step is added |
-| *Sélectionnez au moins deux éléments, images, textes ou groupes non verrouillés* | fewer than two items could move, usually because the others are locked |
+| *Sélectionnez au moins deux éléments, images, textes, formes ou groupes non verrouillés* | fewer than two items could move, usually because the others are locked |
 | *(1 objet(s) verrouillé(s) laissé(s) en place)* | added when locked items were in the selection; they were not moved |
 
 **One undo step** (Ctrl+Z) puts every item back where it was.
@@ -134,7 +148,7 @@ The status bar says what happened:
 | Picture | the picture itself, without its caption | the middle of the picture |
 | Free text | the text's box | the middle of the box |
 | Group ([Grouping items](grouping_items)) | the box around all its members | the middle of that box |
-| Shapes (lines, rectangles, polygons) | not moved, unless they are part of a group, in which case they move with it | — |
+| Shape (line, rectangle, ellipse, polygon) | the shape as drawn, without the line thickness | the middle of that box |
 | Locked items | not moved | — |
 | Wires | follow their symbols, as they do when you drag | — |
 
@@ -147,7 +161,7 @@ the group keeps its shape.
   or right, never up or down; *Aligner en haut* never moves anything
   sideways.
 - **The grid wins.** Every item lands on the grid its drag would have used:
-  symbols and pictures on the folio grid, free texts on the text grid. So
+  symbols, pictures and shapes on the folio grid, free texts on the text grid. So
   aligning never takes a symbol off the grid. The price: two symbols whose
   left edges are at different distances from their origin points cannot
   both sit on the grid *and* on the same left edge, so one can end up as