[gimp-help] Prepare layer-modes.xml for update. Small changes in layer-dialog.xml and toolbox/introduction.xml



commit aee4d4be25eab0932a352ce3610ca724ad617bc0
Author: Julien Hardelin <jhardlin orange fr>
Date:   Thu Apr 23 06:50:33 2020 +0200

    Prepare layer-modes.xml for update. Small changes in layer-dialog.xml and toolbox/introduction.xml

 src/concepts/layer-modes.xml   | 1144 +++++++++++++++++++++++++---------------
 src/dialogs/layer-dialog.xml   |    2 +-
 src/introduction/whats-new.xml |    3 +-
 src/toolbox/intro.xml          |    6 +-
 4 files changed, 740 insertions(+), 415 deletions(-)
---
diff --git a/src/concepts/layer-modes.xml b/src/concepts/layer-modes.xml
index 48959337a..b469fcbc3 100644
--- a/src/concepts/layer-modes.xml
+++ b/src/concepts/layer-modes.xml
@@ -24,8 +24,48 @@
   </indexterm>
 
   <para>
-    <acronym>GIMP</acronym> has twenty-one layer modes. Layer modes are also
-    sometimes called <quote>blending modes</quote>.
+    <acronym>GIMP</acronym> has thirty-eight layer modes, split up in seven 
+    types:
+    <itemizedlist>
+      <listitem>
+        <para>
+          Normal
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Lighten
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Darken
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Contrast
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Inversion
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          HSV components
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Lch components
+        </para>
+      </listitem>
+    </itemizedlist>
+  </para>
+  <para>
+    Layer modes are also sometimes called <quote>blending modes</quote>.
     Selecting a layer mode changes the appearance of the layer or image,
     based on the layer or layers beneath it. If there is only one layer, the
     layer mode has no effect. There must therefore be at least two layers in
@@ -146,7 +186,8 @@
     and seeing what happens with the layer modes.
   </para>
 
-  <variablelist>
+ <variablelist>
+   <title>Normal Layer Modes</title>
     <varlistentry>
       <term>Normal</term>
       <listitem>
@@ -154,6 +195,10 @@
           <primary>Layer Modes</primary>
           <secondary>Normal</secondary>
         </indexterm>
+        <para>
+        In this group, only <quote>Normal</quote> is normal. Most other modes are 
+        rather <emphasis>cancellation</emphasis> modes.
+        </para>
         <figure>
           <title>Example for layer mode <quote>Normal</quote></title>
           <mediaobject>
@@ -271,130 +316,194 @@
         </figure>
       </listitem>
     </varlistentry>
-
-    <varlistentry id="layer-mode-multiply">
-      <term>Multiply</term>
+    <varlistentry id="layer-mode-color-erase">
+      <term>Color Erase</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Multiply</secondary>
+          <secondary>Color Erase</secondary>
         </indexterm>
         <indexterm>
-          <primary>Multiply</primary>
+          <primary>Color Erase</primary>
         </indexterm>
-        <figure>
-          <title>Example for layer mode <quote>Multiply</quote></title>
+        <!--<figure>
+          <title>Example for layer mode <quote>Color Erase</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-multiply-mask1.jpg"/>
+                fileref="images/using/layer-mode-color-erase-50.jpg"/>
             </imageobject>
             <caption>
               <para>
-                Mask 1 is used as upper layer with 100% opacity.
+                Both images are blended into each other with the same
+                intensity.
               </para>
             </caption>
           </mediaobject>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-multiply-mask2.jpg"/>
+                fileref="images/using/layer-mode-color-erase-100.jpg"/>
             </imageobject>
             <caption>
               <para>
-                Mask 2 is used as upper layer with 100% opacity.
+                With 100% opacity only the upper layer is shown when blending
+                with <quote>Color Erase</quote>.
               </para>
             </caption>
           </mediaobject>
-        </figure>
+        </figure>-->
         <para>
-          <guilabel>Multiply</guilabel>
-          mode multiplies the pixel values of the upper layer with those of
-          the layer below it and then divides the result by 255. The result is
-          usually a darker image. If either layer is white, the resulting
-          image is the same as the other layer (1 * I = I). If either layer
-          is black, the resulting image is completely black (0 * I = 0).
+          TODO
         </para>
-        <para>The equation is:</para>
-        <equation>
-          <title>Equation for layer mode <quote>Multiply</quote></title>
-          <alt role="latex">$$E = \frac{M \times I}{255}$$</alt>
-          <graphic fileref="images/math/layer-mode-multiply.png" format="PNG"/>
-        </equation>
+      </listitem>
+    </varlistentry>
+    <varlistentry id="layer-mode-erase">
+      <term>Erase</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Erase</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Erase</primary>
+        </indexterm>
+      <!--<figure>
+          <title>Example for layer mode <quote>Erase</quote></title>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-color-erase-50.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                Both images are blended into each other with the same
+                intensity.
+              </para>
+            </caption>
+          </mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-erase-100.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                With 100% opacity only the upper layer is shown when blending
+                with <quote>Erase</quote>.
+              </para>
+            </caption>
+          </mediaobject>
+        </figure>-->
         <para>
-          The mode is commutative; the order of the two layers doesn't matter.
+          TODO
         </para>
       </listitem>
     </varlistentry>
-
-    <varlistentry>
-      <term>Divide</term>
+    <varlistentry id="layer-mode-merge">
+      <term>Merge</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Divide</secondary>
+          <secondary>Merge</secondary>
         </indexterm>
         <indexterm>
-          <primary>Divide</primary>
+          <primary>Merge</primary>
         </indexterm>
-        <figure>
-          <title>Example for layer mode <quote>Divide</quote></title>
+        <!--<figure>
+          <title>Example for layer mode <quote>Merge</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-divide-mask1.jpg"/>
+                fileref="images/using/layer-mode-color-merge-50.jpg"/>
             </imageobject>
             <caption>
               <para>
-                Mask 1 is used as upper layer with 100% opacity.
+                Both images are blended into each other with the same
+                intensity.
               </para>
             </caption>
           </mediaobject>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-divide-mask2.jpg"/>
+                fileref="images/using/layer-mode-merge-100.jpg"/>
             </imageobject>
             <caption>
               <para>
-                Mask 2 is used as upper layer with 100% opacity.
+                With 100% opacity only the upper layer is shown when blending
+                with <quote>merge</quote>.
               </para>
             </caption>
           </mediaobject>
-        </figure>
+        </figure>-->
         <para>
-          <guilabel>Divide</guilabel>
-          mode multiplies each pixel value in the lower layer by 256 and then
-          divides that by the corresponding pixel value of the upper layer
-          plus one. (Adding one to the denominator avoids dividing by zero.)
-          The resulting image is often lighter, and sometimes looks
-          <quote>burned out</quote>.
+          TODO
         </para>
-        <para>The equation is:</para>
-        <equation>
-          <title>Equation for layer mode <quote>Divide</quote></title>
-          <alt role="latex">$$E = \frac{256 \times I}{M + 1}$$</alt>
-          <graphic fileref="images/math/layer-mode-divide.png" format="JPG"/>
-        </equation>
       </listitem>
     </varlistentry>
-
+    <varlistentry id="layer-mode-split">
+      <term>Erase</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Split</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Split</primary>
+        </indexterm>
+        <!--<figure>
+          <title>Example for layer mode <quote>Split</quote></title>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-split-50.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                Both images are blended into each other with the same
+                intensity.
+              </para>
+            </caption>
+          </mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-split-100.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                With 100% opacity only the upper layer is shown when blending
+                with <quote>Erase</quote>.
+              </para>
+            </caption>
+          </mediaobject>
+        </figure>-->
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+      
+  <variablelist>
+    <title>Lighten Layer Modes</title>
     <varlistentry>
-      <term>Screen</term>
+      <term>Lighten only</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Screen</secondary>
+          <secondary>Lighten only</secondary>
         </indexterm>
         <indexterm>
-          <primary>Screen</primary>
+          <primary>Lighten only</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Screen</quote></title>
+          <title>Example for layer mode <quote>Lighten only</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-screen-mask1.jpg"/>
+                fileref="images/using/layer-mode-lighten-only-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -405,7 +514,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-screen-mask2.jpg"/>
+                fileref="images/using/layer-mode-lighten-only-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -415,47 +524,57 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Screen</guilabel>
-          mode inverts the values of each of the visible pixels in the two
-          layers of the image. (That is, it subtracts each of them from 255.)
-          Then it multiplies them together, divides by 255 and inverts
-          this value again. The resulting image is usually brighter, and
-          sometimes <quote>washed out</quote>
-          in appearance. The exceptions to this are a black layer, which does
-          not change the other layer, and a white layer, which results in a
-          white image. Darker colors in the image appear to be more
-          transparent.
+          <guimenuitem>Lighten only</guimenuitem>
+          mode compares each component of each pixel in the upper layer with
+          the corresponding one in the lower layer and uses the larger value
+          in the resulting image. Completely black layers have no effect on
+          the final image and completely white layers result in a white image.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Screen</quote></title>
-          <alt role="latex">
-            $$E = 255 - \frac{(255-M)\times (255-I)}{255}$$
-          </alt>
-          <graphic fileref="images/math/layer-mode-screen.png"/>
+          <title>Equation for layer mode <quote>Lighten only</quote></title>
+          <alt role="latex">$$E = \max(M, I)$$</alt>
+          <graphic fileref="images/math/layer-mode-lighten.png"/>
         </equation>
         <para>
           The mode is commutative; the order of the two layers doesn't matter.
         </para>
       </listitem>
     </varlistentry>
+    
+    <varlistentry>
+      <term>Luma/Luminance lighten only</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Luma/Luminance lighten only</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Luma/luminance lighten only</primary>
+        </indexterm>
+        
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
 
-    <varlistentry id="layer-mode-overlay">
-      <term>Overlay</term>
+    <varlistentry>
+      <term>Screen</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Overlay</secondary>
+          <secondary>Screen</secondary>
         </indexterm>
         <indexterm>
-          <primary>Overlay</primary>
+          <primary>Screen</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Overlay</quote></title>
+          <title>Example for layer mode <quote>Screen</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-overlay-mask1.jpg"/>
+                fileref="images/using/layer-mode-screen-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -466,7 +585,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-overlay-mask2.jpg"/>
+                fileref="images/using/layer-mode-screen-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -476,37 +595,31 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Overlay</guilabel>
-          mode inverts the pixel value of the lower layer, multiplies it by
-          two times the pixel value of the upper layer, adds that to the
-          original pixel value of the lower layer, divides by 255, and then
-          multiplies by the pixel value of the original lower layer and
-          divides by 255 again. It darkens the image, but not as much as with
-          <quote>Multiply</quote> mode.
-        </para>
-        <para>
-          The equation is:
-          <footnote id="gimp-layer-mode-bug162395">
-            <para>
-              The equation is the *theoretical* equation. Due to
-              <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=162395";> Bug
-              #162395 </ulink>, the actual equation is equivalent to Soft
-              light. It is difficult to fix this bug without changing the
-              appearance of existing images.
-            </para>
-          </footnote>
+          <guilabel>Screen</guilabel>
+          mode inverts the values of each of the visible pixels in the two
+          layers of the image. (That is, it subtracts each of them from 255.)
+          Then it multiplies them together, divides by 255 and inverts
+          this value again. The resulting image is usually brighter, and
+          sometimes <quote>washed out</quote>
+          in appearance. The exceptions to this are a black layer, which does
+          not change the other layer, and a white layer, which results in a
+          white image. Darker colors in the image appear to be more
+          transparent.
         </para>
+        <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Overlay</quote></title>
+          <title>Equation for layer mode <quote>Screen</quote></title>
           <alt role="latex">
-            $$E = \frac{I}{255} \times
-              \left(I + \frac{2\times M}{255} \times (255 - I)\right)$$
+            $$E = 255 - \frac{(255-M)\times (255-I)}{255}$$
           </alt>
-          <graphic fileref="images/math/layer-mode-overlay.png"/>
+          <graphic fileref="images/math/layer-mode-screen.png"/>
         </equation>
+        <para>
+          The mode is commutative; the order of the two layers doesn't matter.
+        </para>
       </listitem>
     </varlistentry>
-
+    
     <varlistentry>
       <term>Dodge</term>
       <listitem>
@@ -563,23 +676,23 @@
         </equation>
       </listitem>
     </varlistentry>
-
+        
     <varlistentry>
-      <term>Burn</term>
+      <term>Addition</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Burn</secondary>
+          <secondary>Addition</secondary>
         </indexterm>
         <indexterm>
-          <primary>Burn</primary>
+          <primary>Addition</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Burn</quote></title>
+          <title>Example for layer mode <quote>Addition</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-burn-mask1.jpg"/>
+                fileref="images/using/layer-mode-addition-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -590,7 +703,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-burn-mask2.jpg"/>
+                fileref="images/using/layer-mode-addition-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -600,44 +713,43 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Burn</guilabel>
-          mode inverts the pixel value of the lower layer, multiplies it by
-          256, divides that by one plus the pixel value of the upper layer,
-          then inverts the result. It tends to make the image darker, somewhat
-          similar to <quote>Multiply</quote> mode.
-        </para>
-        <para>
-          In photography, burning is a technique used in a darkroom to
-          increase the exposure in particular areas of the image. This brings
-          out details in the highlights. When used for this purpose, burn may
-          work best on Grayscale images and with a painting tool, rather than
-          as a layer mode.
+          <guilabel>Addition</guilabel>
+          mode is very simple. The pixel values of the upper and lower layers
+          are added to each other. The resulting image is usually lighter. The
+          equation can result in color values greater than 255, so some of the
+          light colors may be set to the maximum value of 255.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Burn</quote></title>
-          <alt role="latex">$$E = 255 - \frac{256\times(255 - I)}{M + 1}$$</alt>
-          <graphic fileref="images/math/layer-mode-burn.png"/>
+          <title>Equation for layer mode <quote>Addition</quote></title>
+          <alt role="latex">$$E = \min\bigl( (M + I), 255\bigr)$$</alt>
+          <graphic fileref="images/math/layer-mode-addition.png"/>
         </equation>
+        <para>
+          The mode is commutative; the order of the two layers doesn't matter.
+        </para>
       </listitem>
     </varlistentry>
-
+  </variablelist>
+      
+  <variablelist>
+    <title>Darken Layer Modes</title>
     <varlistentry>
-      <term>Hard light</term>
+      <term>Darken only</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Hard light</secondary>
+          <secondary>Darken only</secondary>
         </indexterm>
         <indexterm>
-          <primary>Hard light</primary>
+          <primary>Darken only</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Hard light</quote></title>
+          <title>Example for layer mode <quote>Darken only</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-hard-light-mask1.jpg"/>
+                fileref="images/using/layer-mode-darken-only-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -648,7 +760,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-hard-light-mask2.jpg"/>
+                fileref="images/using/layer-mode-darken-only-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -658,56 +770,56 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Hard light</guilabel>
-          mode is rather complicated because the equation consists of two
-          parts, one for darker colors and one for brighter colors. If the
-          pixel color of the upper layer is greater than 128, the layers are
-          combined according to the first formula shown below. Otherwise, the
-          pixel values of the upper and lower layers are multiplied together
-          and multiplied by two, then divided by 256. You might use this mode
-          to combine two photographs and obtain bright colors and sharp edges.
+          <guimenuitem>Darken only</guimenuitem>
+          mode compares each component of each pixel in the upper layer with
+          the corresponding one in the lower layer and uses the smaller value
+          in the resulting image. Completely white layers have no effect on
+          the final image and completely black layers result in a black image.
         </para>
-        <para>
-          The equation is complex and different according to
-          the value &gt;128 or &le; 128:</para>
-        <equation>
-          <title>
-            Equation for layer mode <quote>Hard light</quote>, M &gt; 128
-          </title>
-          <alt role="latex">
-            $$E = 255 - \frac{\big(255 - 2\times (M-128)\big)\times (255 - I)}
-              {256}, \qquad M > 128$$
-          </alt>
-          <graphic fileref="images/math/layer-mode-hard-light1.png"/>
-        </equation>
+        <para>The equation is:</para>
         <equation>
-          <title>
-            Equation for layer mode <quote>Hard light</quote>, M &le; 128
-          </title>
-          <alt role="latex">
-            $$E = \frac{2 \times M \times I}{256}, \qquad M \le 128$$
-          </alt>
-          <graphic fileref="images/math/layer-mode-hard-light2.png"/>
+          <title>Equation for layer mode <quote>Darken only</quote></title>
+          <alt role="latex">$$E = \min(M, I)$$</alt>
+          <graphic fileref="images/math/layer-mode-darken.png"/>
         </equation>
+        <para>
+          The mode is commutative; the order of the two layers doesn't matter.
+        </para>
       </listitem>
     </varlistentry>
-
+    
     <varlistentry>
-      <term>Soft light</term>
+      <term>Luma/Luminance darken only</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Soft light</secondary>
+          <secondary>Luma/Luminance darken only</secondary>
         </indexterm>
         <indexterm>
-          <primary>Soft light</primary>
+          <primary>Luma/luminance darken only</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry id="layer-mode-multiply">
+      <term>Multiply</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Multiply</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Multiply</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Soft light</quote></title>
+          <title>Example for layer mode <quote>Multiply</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-soft-light-mask1.jpg"/>
+                fileref="images/using/layer-mode-multiply-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -718,7 +830,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-soft-light-mask2.jpg"/>
+                fileref="images/using/layer-mode-multiply-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -728,49 +840,41 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Soft light</guilabel> is not related to
-          <quote>Hard light</quote> in anything but the name, but it
-          does tend to make the edges softer and the colors not so
-          bright. It is similar to <quote>Overlay</quote> mode. In some
-          versions of <acronym>GIMP</acronym>, <quote>Overlay</quote>
-          mode and <quote>Soft light</quote> mode are identical.
-        </para>
-        <para>The equation is complicated. It needs Rs, the
-          result of Screen mode :
+          <guilabel>Multiply</guilabel>
+          mode multiplies the pixel values of the upper layer with those of
+          the layer below it and then divides the result by 255. The result is
+          usually a darker image. If either layer is white, the resulting
+          image is the same as the other layer (1 * I = I). If either layer
+          is black, the resulting image is completely black (0 * I = 0).
         </para>
+        <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Screen</quote></title>
-          <alt role="latex">
-              $$R_{s} = 255 - \frac{(255-M)\times(255-I)}{255}$$
-            </alt>
-          <graphic fileref="images/math/layer-mode-soft-light1.png"/>
-        </equation>
-        <equation>
-          <title>Equation for layer mode <quote>Soft light</quote></title>
-          <alt role="latex">
-            $$E = \frac{(255-I)\times M + R_{s}}{255} \times I$$
-          </alt>
-          <graphic fileref="images/math/layer-mode-soft-light2.png"/>
+          <title>Equation for layer mode <quote>Multiply</quote></title>
+          <alt role="latex">$$E = \frac{M \times I}{255}$$</alt>
+          <graphic fileref="images/math/layer-mode-multiply.png" format="PNG"/>
         </equation>
+        <para>
+          The mode is commutative; the order of the two layers doesn't matter.
+        </para>
       </listitem>
     </varlistentry>
-
-    <varlistentry>
-      <term>Grain extract</term>
+    
+    <varlistentry id="layer-mode-burn">
+      <term>Burn</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Grain extract</secondary>
+          <secondary>Burn</secondary>
         </indexterm>
         <indexterm>
-          <primary>Grain extract</primary>
+          <primary>Burn</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Grain extract</quote></title>
+          <title>Example for layer mode <quote>Burn</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-grain-extract-mask1.jpg"/>
+                fileref="images/using/layer-mode-burn-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -781,7 +885,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-grain-extract-mask2.jpg"/>
+                fileref="images/using/layer-mode-burn-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -791,44 +895,63 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Grain extract</guilabel>
-          mode is supposed to extract the <quote>film grain</quote>
-          from a layer to produce a new layer that is pure grain, but it can
-          also be useful for giving images an embossed appearance. It
-          subtracts the pixel value of the upper layer from that of the lower
-          layer and adds 128.
+          <guilabel>Burn</guilabel>
+          mode inverts the pixel value of the lower layer, multiplies it by
+          256, divides that by one plus the pixel value of the upper layer,
+          then inverts the result. It tends to make the image darker, somewhat
+          similar to <quote>Multiply</quote> mode.
+        </para>
+        <para>
+          In photography, burning is a technique used in a darkroom to
+          increase the exposure in particular areas of the image. This brings
+          out details in the highlights. When used for this purpose, burn may
+          work best on Grayscale images and with a painting tool, rather than
+          as a layer mode.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Grain extract</quote></title>
-          <alt role="latex">$$E = I - M + 128$$</alt>
-          <graphic fileref="images/math/layer-mode-grainextract.png"/>
+          <title>Equation for layer mode <quote>Burn</quote></title>
+          <alt role="latex">$$E = 255 - \frac{256\times(255 - I)}{M + 1}$$</alt>
+          <graphic fileref="images/math/layer-mode-burn.png"/>
         </equation>
       </listitem>
     </varlistentry>
-
+    
     <varlistentry>
-      <term>Grain merge</term>
+      <term>Linear burn</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Grain merge</secondary>
+          <secondary>Linear burn</secondary>
         </indexterm>
         <indexterm>
-          <primary>Grain merge</primary>
+          <primary>Linear burn</primary>
         </indexterm>
         <para>
-          There are two more layer modes, but these are available only for
-          painting tools. See
-          <link linkend="gimp-tool-painting-modes">Painting Modes</link>
-          for detailed information.
+          TODO
         </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  
+  <variablelist>
+    <title>Contrast Layer Modes</title>
+    <varlistentry id="layer-mode-overlay">
+      <term>Overlay</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Overlay</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Overlay</primary>
+        </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Grain merge</quote></title>
+          <title>Example for layer mode <quote>Overlay</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-grain-merge-mask1.jpg"/>
+                fileref="images/using/layer-mode-overlay-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -839,7 +962,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-grain-merge-mask2.jpg"/>
+                fileref="images/using/layer-mode-overlay-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -849,38 +972,53 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Grain merge</guilabel> mode merges a grain layer
-          (possibly one created from the <quote>Grain extract</quote>
-          mode) into the current layer, leaving a grainy version of the
-          original layer. It does just the opposite of
-          <quote>Grain extract</quote>. It adds the pixel values of the
-          upper and lower layers together and subtracts 128.
+          <guilabel>Overlay</guilabel>
+          mode inverts the pixel value of the lower layer, multiplies it by
+          two times the pixel value of the upper layer, adds that to the
+          original pixel value of the lower layer, divides by 255, and then
+          multiplies by the pixel value of the original lower layer and
+          divides by 255 again. It darkens the image, but not as much as with
+          <quote>Multiply</quote> mode.
+        </para>
+        <para>
+          The equation is:
+          <footnote id="gimp-layer-mode-bug162395">
+            <para>
+              The equation is the *theoretical* equation. Due to
+              <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=162395";> Bug
+              #162395 </ulink>, the actual equation is equivalent to Soft
+              light. It is difficult to fix this bug without changing the
+              appearance of existing images.
+            </para>
+          </footnote>
         </para>
-        <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Grain merge</quote></title>
-          <alt role="latex">$$E = I + M - 128$$</alt>
-          <graphic fileref="images/math/layer-mode-grainmerge.png"/>
+          <title>Equation for layer mode <quote>Overlay</quote></title>
+          <alt role="latex">
+            $$E = \frac{I}{255} \times
+              \left(I + \frac{2\times M}{255} \times (255 - I)\right)$$
+          </alt>
+          <graphic fileref="images/math/layer-mode-overlay.png"/>
         </equation>
       </listitem>
     </varlistentry>
-
-    <varlistentry id="layer-mode-difference">
-      <term>Difference</term>
+    
+    <varlistentry id="layer-modes-soft-light">
+      <term>Soft light</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Difference</secondary>
+          <secondary>Soft light</secondary>
         </indexterm>
         <indexterm>
-          <primary>Difference</primary>
+          <primary>Soft light</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Difference</quote></title>
+          <title>Example for layer mode <quote>Soft light</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-difference-mask1.jpg"/>
+                fileref="images/using/layer-mode-soft-light-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -891,7 +1029,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-difference-mask2.jpg"/>
+                fileref="images/using/layer-mode-soft-light-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -901,40 +1039,186 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Difference</guilabel>
-          mode subtracts the pixel value of the upper layer from that of the
-          lower layer and then takes the absolute value of the result. No
-          matter what the original two layers look like, the result looks
-          rather odd. You can use it to invert elements of an image.
+          <guilabel>Soft light</guilabel> is not related to
+          <quote>Hard light</quote> in anything but the name, but it
+          does tend to make the edges softer and the colors not so
+          bright. It is similar to <quote>Overlay</quote> mode. In some
+          versions of <acronym>GIMP</acronym>, <quote>Overlay</quote>
+          mode and <quote>Soft light</quote> mode are identical.
+        </para>
+        <para>The equation is complicated. It needs Rs, the
+          result of Screen mode :
         </para>
-        <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Difference</quote></title>
-          <alt role="latex">$$E = |I - M|$$</alt>
-          <graphic fileref="images/math/layer-mode-difference.png"/>
+          <title>Equation for layer mode <quote>Screen</quote></title>
+          <alt role="latex">
+              $$R_{s} = 255 - \frac{(255-M)\times(255-I)}{255}$$
+            </alt>
+          <graphic fileref="images/math/layer-mode-soft-light1.png"/>
+        </equation>
+        <equation>
+          <title>Equation for layer mode <quote>Soft light</quote></title>
+          <alt role="latex">
+            $$E = \frac{(255-I)\times M + R_{s}}{255} \times I$$
+          </alt>
+          <graphic fileref="images/math/layer-mode-soft-light2.png"/>
         </equation>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry id="layer-modes-hard-light">
+      <term>Hard light</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Hard light</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Hard light</primary>
+        </indexterm>
+        <figure>
+          <title>Example for layer mode <quote>Hard light</quote></title>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-hard-light-mask1.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                Mask 1 is used as upper layer with 100% opacity.
+              </para>
+            </caption>
+          </mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata format="JPG"
+                fileref="images/using/layer-mode-hard-light-mask2.jpg"/>
+            </imageobject>
+            <caption>
+              <para>
+                Mask 2 is used as upper layer with 100% opacity.
+              </para>
+            </caption>
+          </mediaobject>
+        </figure>
         <para>
-          The mode is commutative; the order of the two layers doesn't matter.
+          <guilabel>Hard light</guilabel>
+          mode is rather complicated because the equation consists of two
+          parts, one for darker colors and one for brighter colors. If the
+          pixel color of the upper layer is greater than 128, the layers are
+          combined according to the first formula shown below. Otherwise, the
+          pixel values of the upper and lower layers are multiplied together
+          and multiplied by two, then divided by 256. You might use this mode
+          to combine two photographs and obtain bright colors and sharp edges.
         </para>
+        <para>
+          The equation is complex and different according to
+          the value &gt;128 or &lt; 128:</para>
+        <equation>
+          <title>
+            Equation for layer mode <quote>Hard light</quote>, M &gt; 128
+          </title>
+          <alt role="latex">
+            $$E = 255 - \frac{\big(255 - 2\times (M-128)\big)\times (255 - I)}
+              {256}, \qquad M > 128$$
+          </alt>
+          <graphic fileref="images/math/layer-mode-hard-light1.png"/>
+        </equation>
+        <equation>
+          <title>
+            Equation for layer mode <quote>Hard light</quote>, M &lt; 128
+          </title>
+          <alt role="latex">
+            $$E = \frac{2 \times M \times I}{256}, \qquad M \le 128$$
+          </alt>
+          <graphic fileref="images/math/layer-mode-hard-light2.png"/>
+        </equation>
       </listitem>
     </varlistentry>
-
-    <varlistentry>
-      <term>Addition</term>
+    
+    <varlistentry id="layer-modes-vivid-light">
+      <term>Vivid light</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Addition</secondary>
+          <secondary>Vivid light</secondary>
         </indexterm>
         <indexterm>
-          <primary>Addition</primary>
+          <primary>Vivid light</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry id="layer-modes-pin-light">
+      <term>Pin light</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Pin light</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Pin light</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry id="layer-modes-linear-light">
+      <term>Linear light</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Linear light</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Linear light</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    
+    <varlistentry id="layer-modes-hard-mix">
+      <term>Hard mix</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Hard mix</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Hard mix</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  
+  <variablelist>
+    <title>Inversion Layer Modes</title>
+    <varlistentry id="layer-mode-difference">
+      <term>Difference</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Difference</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Difference</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Addition</quote></title>
+          <title>Example for layer mode <quote>Difference</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-addition-mask1.jpg"/>
+                fileref="images/using/layer-mode-difference-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -945,7 +1229,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-addition-mask2.jpg"/>
+                fileref="images/using/layer-mode-difference-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -955,17 +1239,17 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Addition</guilabel>
-          mode is very simple. The pixel values of the upper and lower layers
-          are added to each other. The resulting image is usually lighter. The
-          equation can result in color values greater than 255, so some of the
-          light colors may be set to the maximum value of 255.
+          <guilabel>Difference</guilabel>
+          mode subtracts the pixel value of the upper layer from that of the
+          lower layer and then takes the absolute value of the result. No
+          matter what the original two layers look like, the result looks
+          rather odd. You can use it to invert elements of an image.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Addition</quote></title>
-          <alt role="latex">$$E = \min\bigl( (M + I), 255\bigr)$$</alt>
-          <graphic fileref="images/math/layer-mode-addition.png"/>
+          <title>Equation for layer mode <quote>Difference</quote></title>
+          <alt role="latex">$$E = |I - M|$$</alt>
+          <graphic fileref="images/math/layer-mode-difference.png"/>
         </equation>
         <para>
           The mode is commutative; the order of the two layers doesn't matter.
@@ -973,7 +1257,23 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry id="layer-modes-exclusion">
+      <term>Exclusion</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Exclusion</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Exclusion</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="layer-modes-subtract">
       <term>Subtract</term>
       <listitem>
         <indexterm>
@@ -1024,23 +1324,23 @@
         </equation>
       </listitem>
     </varlistentry>
-
-    <varlistentry>
-      <term>Darken only</term>
+    
+    <varlistentry id="layer-modes-grain-extract">
+      <term>Grain extract</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Darken only</secondary>
+          <secondary>Grain extract</secondary>
         </indexterm>
         <indexterm>
-          <primary>Darken only</primary>
+          <primary>Grain extract</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Darken only</quote></title>
+          <title>Example for layer mode <quote>Grain extract</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-darken-only-mask1.jpg"/>
+                fileref="images/using/layer-mode-grain-extract-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1051,7 +1351,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-darken-only-mask2.jpg"/>
+                fileref="images/using/layer-mode-grain-extract-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1061,40 +1361,44 @@
           </mediaobject>
         </figure>
         <para>
-          <guimenuitem>Darken only</guimenuitem>
-          mode compares each component of each pixel in the upper layer with
-          the corresponding one in the lower layer and uses the smaller value
-          in the resulting image. Completely white layers have no effect on
-          the final image and completely black layers result in a black image.
+          <guilabel>Grain extract</guilabel>
+          mode is supposed to extract the <quote>film grain</quote>
+          from a layer to produce a new layer that is pure grain, but it can
+          also be useful for giving images an embossed appearance. It
+          subtracts the pixel value of the upper layer from that of the lower
+          layer and adds 128.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Darken only</quote></title>
-          <alt role="latex">$$E = \min(M, I)$$</alt>
-          <graphic fileref="images/math/layer-mode-darken.png"/>
+          <title>Equation for layer mode <quote>Grain extract</quote></title>
+          <alt role="latex">$$E = I - M + 128$$</alt>
+          <graphic fileref="images/math/layer-mode-grainextract.png"/>
         </equation>
-        <para>
-          The mode is commutative; the order of the two layers doesn't matter.
-        </para>
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Lighten only</term>
+    <varlistentry id="layer-modes-grain-merge">
+      <term>Grain merge</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Lighten only</secondary>
+          <secondary>Grain merge</secondary>
         </indexterm>
         <indexterm>
-          <primary>Lighten only</primary>
+          <primary>Grain merge</primary>
         </indexterm>
+        <para>
+          There are two more layer modes, but these are available only for
+          painting tools. See
+          <link linkend="gimp-tool-painting-modes">Painting Modes</link>
+          for detailed information.
+        </para>
         <figure>
-          <title>Example for layer mode <quote>Lighten only</quote></title>
+          <title>Example for layer mode <quote>Grain merge</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-lighten-only-mask1.jpg"/>
+                fileref="images/using/layer-mode-grain-merge-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1105,7 +1409,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-lighten-only-mask2.jpg"/>
+                fileref="images/using/layer-mode-grain-merge-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1115,40 +1419,38 @@
           </mediaobject>
         </figure>
         <para>
-          <guimenuitem>Lighten only</guimenuitem>
-          mode compares each component of each pixel in the upper layer with
-          the corresponding one in the lower layer and uses the larger value
-          in the resulting image. Completely black layers have no effect on
-          the final image and completely white layers result in a white image.
+          <guilabel>Grain merge</guilabel> mode merges a grain layer
+          (possibly one created from the <quote>Grain extract</quote>
+          mode) into the current layer, leaving a grainy version of the
+          original layer. It does just the opposite of
+          <quote>Grain extract</quote>. It adds the pixel values of the
+          upper and lower layers together and subtracts 128.
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>Equation for layer mode <quote>Lighten only</quote></title>
-          <alt role="latex">$$E = \max(M, I)$$</alt>
-          <graphic fileref="images/math/layer-mode-lighten.png"/>
+          <title>Equation for layer mode <quote>Grain merge</quote></title>
+          <alt role="latex">$$E = I + M - 128$$</alt>
+          <graphic fileref="images/math/layer-mode-grainmerge.png"/>
         </equation>
-        <para>
-          The mode is commutative; the order of the two layers doesn't matter.
-        </para>
       </listitem>
     </varlistentry>
-
+    
     <varlistentry>
-      <term>Hue</term>
+      <term>Divide</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Hue</secondary>
+          <secondary>Divide</secondary>
         </indexterm>
         <indexterm>
-          <primary>Hue</primary>
+          <primary>Divide</primary>
         </indexterm>
         <figure>
-          <title>Example for layer mode <quote>Hue</quote></title>
+          <title>Example for layer mode <quote>Divide</quote></title>
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-hue-mask1.jpg"/>
+                fileref="images/using/layer-mode-divide-mask1.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1159,7 +1461,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="JPG"
-                fileref="images/using/layer-mode-hue-mask2.jpg"/>
+                fileref="images/using/layer-mode-divide-mask2.jpg"/>
             </imageobject>
             <caption>
               <para>
@@ -1169,147 +1471,166 @@
           </mediaobject>
         </figure>
         <para>
-          <guilabel>Hue</guilabel>
-          mode uses the hue of the upper layer and the saturation and value of
-          the lower layer to form the resulting image. However, if the
-          saturation of the upper layer is zero, the hue is taken from the
-          lower layer, too.
+          <guilabel>Divide</guilabel>
+          mode multiplies each pixel value in the lower layer by 256 and then
+          divides that by the corresponding pixel value of the upper layer
+          plus one. (Adding one to the denominator avoids dividing by zero.)
+          The resulting image is often lighter, and sometimes looks
+          <quote>burned out</quote>.
         </para>
+        <para>The equation is:</para>
+        <equation>
+          <title>Equation for layer mode <quote>Divide</quote></title>
+          <alt role="latex">$$E = \frac{256 \times I}{M + 1}$$</alt>
+          <graphic fileref="images/math/layer-mode-divide.png" format="JPG"/>
+        </equation>
       </listitem>
     </varlistentry>
-
+  </variablelist>
+  
+  <variablelist>
+    <title>HSV Components Layer Modes</title>
     <varlistentry>
-      <term>Saturation</term>
+      <term>HSV Hue</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Saturation</secondary>
+          <secondary>HSV Hue</secondary>
         </indexterm>
         <indexterm>
-          <primary>Saturation</primary>
+          <primary>HSV Hue</primary>
         </indexterm>
-        <figure>
-          <title>Example for layer mode <quote>Saturation</quote></title>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-saturation-mask1.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 1 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-saturation-mask2.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 2 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-        </figure>
         <para>
-          <guilabel>Saturation</guilabel>
-          mode uses the saturation of the upper layer and the hue and value of
-          the lower layer to form the resulting image.
+          TODO
         </para>
       </listitem>
     </varlistentry>
-
     <varlistentry>
-      <term>Color</term>
+      <term>HSV Saturation</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Color</secondary>
+          <secondary>HSV Saturation</secondary>
         </indexterm>
         <indexterm>
-          <primary>Color</primary>
+          <primary>HSV Saturation</primary>
         </indexterm>
-        <figure>
-          <title>Example for layer mode <quote>Color</quote></title>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-color-mask1.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 1 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-color-mask2.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 2 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-        </figure>
         <para>
-          <guilabel>Color</guilabel>
-          mode uses the hue and saturation of the upper layer and the value of
-          the lower layer to form the resulting image.
+          TODO
         </para>
       </listitem>
     </varlistentry>
-
     <varlistentry>
-      <term>Value</term>
+      <term>HSL Color</term>
       <listitem>
         <indexterm>
           <primary>Layer Modes</primary>
-          <secondary>Value</secondary>
+          <secondary>HSL Color</secondary>
         </indexterm>
         <indexterm>
-          <primary>Value</primary>
+          <primary>HSL Color</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>HSV Value</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>HSV Value</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>HSV Value</primary>
         </indexterm>
-        <figure>
-          <title>Example for layer mode <quote>Value</quote></title>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-value-mask1.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 1 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-          <mediaobject>
-            <imageobject>
-              <imagedata format="JPG"
-                fileref="images/using/layer-mode-value-mask2.jpg"/>
-            </imageobject>
-            <caption>
-              <para>
-                Mask 2 is used as upper layer with 100% opacity.
-              </para>
-            </caption>
-          </mediaobject>
-        </figure>
         <para>
-          <guilabel>Value</guilabel>
-          mode uses the value of the upper layer and the saturation and hue of
-          the lower layer to form the resulting image. You can use this mode
-          to reveal details in dark and light areas of an image without
-          changing the saturation.
+          TODO
         </para>
       </listitem>
     </varlistentry>
   </variablelist>
-
+  
+  <variablelist>
+    <title>LCh Components Layer Modes</title>
+    <varlistentry>
+      <term>LCh Hue</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>LCh Hue</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>LCh Hue</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>LCh Chroma</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>LCh Chroma</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>LCh Chroma</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>LCh Color</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>LCh Color</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>LCh Color</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>LCh Lightness</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>LCh Lightness</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>LCh Lightness</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Luminance</term>
+      <listitem>
+        <indexterm>
+          <primary>Layer Modes</primary>
+          <secondary>Luminance</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>LCh Luminance</primary>
+        </indexterm>
+        <para>
+          TODO
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  
   <para>
     Each layer in an image can have a different layer mode. (Of course, the
     layer mode of the bottom layer of an image has no effect.) The effects of
@@ -1344,4 +1665,5 @@
     See <xref linkend="gimp-paint-mode-examples"/> for a description of the
     two additional painting modes.
   </para>
+
 </sect1>
diff --git a/src/dialogs/layer-dialog.xml b/src/dialogs/layer-dialog.xml
index d94c0ebea..905788701 100644
--- a/src/dialogs/layer-dialog.xml
+++ b/src/dialogs/layer-dialog.xml
@@ -489,7 +489,7 @@
               </listitem>
             </varlistentry>
             
-            <varlistentry>
+            <varlistentry id="gimp-layers-merge">
               <term>
                 <guiicon>
                   <inlinemediaobject>
diff --git a/src/introduction/whats-new.xml b/src/introduction/whats-new.xml
index 55a3d7425..6e853b36b 100644
--- a/src/introduction/whats-new.xml
+++ b/src/introduction/whats-new.xml
@@ -78,7 +78,8 @@
       </listitem>
       <listitem>
         <para>
-          Consolidated user interface for merging down and anchoring layers
+          Consolidated user interface for merging down and anchoring layers:
+            <xref linkend="gimp-layers-merge"/>
         </para>
       </listitem>
       <listitem>
diff --git a/src/toolbox/intro.xml b/src/toolbox/intro.xml
index 44a40ff9d..25822e74b 100644
--- a/src/toolbox/intro.xml
+++ b/src/toolbox/intro.xml
@@ -77,8 +77,10 @@
     <title>Tool Icons</title>
     <para>
       With GIMP-2.10.18, tool icons can be grouped, and this option is enabled  by 
-      default. The group icon displayed is the first icon in the group. Right 
-      click on the group icon to display the list of tools in the group.
+      default. Tools groups are marked with a small dark triangle at the bottom 
+      right corner of the icon. The group icon displayed is the first icon in the 
+      group. Right click on the group icon to display the list of tools in the 
+      group.
       <mediaobject>
         <imageobject>
        <imagedata format="JPEG" fileref="images/toolbox/toolbox-icon-group.jpg"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]