Merge 0.9.23 release into sdl2.0

Makefile

@@ -4,7 +4,7 @@
 # Various contributors (see AUTHORS.txt)
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - August 19, 2018
+# June 14, 2002 - August 30, 2018
 
 
 # The version number, for release:
@@ -965,7 +965,9 @@ install-doc:
 	@echo "...Installing documentation..."
 	@install -d $(DOC_PREFIX)
 	@cp -R docs/* $(DOC_PREFIX)
-	@cp -R magic/magic-docs $(DOC_PREFIX)
+	@# FIXME: Needs improvement, when we add other translations -bjk 2018.08.30
+	@install -d $(DOC_PREFIX)/en/magic-docs
+	@cp -R magic/magic-docs/en/* $(DOC_PREFIX)/en/magic-docs/
 	@chmod -R a=rX,g=rX,u=rwX $(DOC_PREFIX)
 
 

docs/AUTHORS.txt

@@ -7,7 +7,7 @@ Various contributors (see below, and CHANGES.txt)
 http://www.tuxpaint.org/
 
 
-June 17, 2002 - August 18, 2018
+June 17, 2002 - August 30, 2018
 
 $Id$
 
@@ -534,10 +534,10 @@ $Id$
     Pavel Shalamitski
 
   * Bengali
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Bodo
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Bosnian
     Samir Ribić
@@ -600,7 +600,7 @@ $Id$
     Mikkel Kirkgaard Nielsen <translation@mikini.dk> [retired]
 
   * Dogri
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Dutch
     Freek de Kruijf <f.de.kruijf@hetnet.nl>
@@ -731,7 +731,7 @@ $Id$
 
   * Kashmiri (Devanagari)
   * Kashmiri (Perso-Arabic)
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Khmer
     Khoem Sokhem <khoemsokhem@khmeros.info>
@@ -930,7 +930,7 @@ $Id$
 
   * Sindhi (Devanagari)
   * Sindhi (Perso-Arabic)
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Sinhala
     Menik Prasantha <manikprasantha@gmail.com>
@@ -1018,7 +1018,7 @@ $Id$
     Serhij Dubyk <serhijdubyk@gmail.com>
 
   * Urdu
-    Provided by chandrakant dhutadmal
+    Provided by Chandrakant Dhutadmal
 
   * Valencian
     Pilar Embid Giner <embid_mar@gva.es>

docs/CHANGES.txt

@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2018.August.18 (0.9.23)
+2018.August.30 (0.9.23)
   * New tools
     ---------
     * Color selector
@@ -35,27 +35,27 @@ $Id$
   * New locales
     -----------
     * Bengali
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
     * Bodo
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
     * Dogri
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
     * Kabyle (aka Kabylian)
       Yacine Bouklif <yacine_tizi2003@yahoo.fr>
 
     * Kashmiri (Devanagari)
     * Kashmiri (Perso-Arabic)
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
     * Sindhi (Devanagari)
     * Sindhi (Perso-Arabic)
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
     * Urdu
-      Provided by chandrakant dhutadmal
+      Provided by Chandrakant Dhutadmal
 
   * Localization Updates:
     ---------------------

docs/README.txt

@@ -1,2 +1,2 @@
-See [locale]/html/README.html or [local]/README.txt.
+See [locale]/html/README.html or [locale]/README.txt.
 

macos/Info.plist

@@ -23,6 +23,6 @@
 	<key>CFBundleSignature</key>
 	<string>TXPT</string>
 	<key>CFBundleVersion</key>
-	<string>2018-06-27</string>
+	<string>2018-09-01</string>
 </dict>
 </plist>

magic/docs/en/README.txt

@@ -1,12 +1,9 @@
                      Creating Tux Paint Magic Tool Plugins
 
-                Copyright 2007-2008 by Bill Kendrick and others
+          Copyright 2007-2018 by various contributors; see AUTHORS.txt
-                               New Breed Software
-
-                           bill@newbreedsoftware.com
                             http://www.tuxpaint.org/
 
-                          July 5, 2007 - July 19, 2008
+                         July 5, 2007 - August 30, 2018
 
      ----------------------------------------------------------------------
 
@@ -90,7 +87,7 @@ Interfaces
      header files) for building a plugin. (See "Compiling", below.)
 
      The C header file and command-line tool mentioned above are included
-     with Tux Paint - or in some cases, as part of a "Tux Paint 'Magic' Tool
+     with Tux Paint — or in some cases, as part of a "Tux Paint 'Magic' Tool
      Plugin Development package".
 
   'Magic' tool plugin functions
@@ -244,14 +241,18 @@ Interfaces
              contain (by your "get_tool_count()").
 
            * int modes(magic_api * api, int which)
-             This lets you tell Tux Paint what modes your tool can be used in
+             This lets you tell Tux Paint what modes your tool can be used
-             (either as a tool the user can paint with, or a tool that
+             in; either as a tool the user can paint with, or a tool that
-             affects the entire drawing at once)
+             affects the entire drawing at once.
 
              You must return a value that's some combination of one or more
              of available modes:
-                * MODE_PAINT
+                * MODE_PAINT - freehand paint (click and drag)
-                * MODE_FULLSCREEN
+                * MODE_FULLSCREEN - applies to full image with one click
+                * MODE_PAINT_WITH_PREVIEW - freehand paint, with preview
+                  (click and drag)
+                * MODE_ONECLICK - applies to an area around the mouse, with
+                  one click
              e.g., if your tool is only one that the user can paint with,
              return "MODE_PAINT". If the user can do both, return
              "MODE_PAINT | MODE_FULLSCREEN" to tell Tux Paint it can do both.
@@ -285,7 +286,7 @@ Interfaces
              of "Magic" tools when doing some other activity (i.e., using a
              different tool, such as "Text" or "Brush", activating a
              momentary tool, such as "Undo" and "Redo", or returning from a
-             dialog - possibly with a new picture when it switches back -
+             dialog — possibly with a new picture when it switches back —
              such as "Open", "New" or "Quit"). In this case, the same Magic
              tool is first 'switched-out', and then 'switched-back-in',
              usually moments later.
@@ -295,10 +296,10 @@ Interfaces
              switchout() is called for the old mode, then switchin() is
              called for the new mode.
 
-             These functions allow users to interact in complicated ways with
+             These functions allow users to interact in complicated was with
              Magic tools (for example, a tool that lets the user draw
              multiple freehand strokes, and then uses that as input such as
-             handwriting - normally, the user could click somewhere in the
+             handwriting — normally, the user could click somewhere in the
              canvas to tell the Magic tool they are 'finished', but if they
              switch to another tool, the Magic tool may want to undo any
              temporary changes to the canvas).
@@ -523,7 +524,7 @@ Interfaces
              This function notifies Tux Paint of special events. Various
              values defined in "tp_magic_api.h" can be 'or'ed together (using
              C's boolean 'or': "|") and sent to this function.
-                * SPECIAL_FLIP - The contents of the canvas has been flipped
+                * SPECIAL_FLIP — The contents of the canvas has been flipped
                   vertically.
 
                   If a 'Starter' image was used as the basis of this image,
@@ -533,7 +534,7 @@ Interfaces
                   (or unflipped) should be recorded on disk when the current
                   drawing is saved.
 
-                * SPECIAL_MIRROR - Similar to SPECIAL_FLIP, but for magic
+                * SPECIAL_MIRROR — Similar to SPECIAL_FLIP, but for magic
                   tools that mirror the contents of the canvas horizontally.
 
     Color Conversions
@@ -624,8 +625,8 @@ Compiling
        source code.
 
        Use the "tp-magic-config --cflags" command, supplied as part of
-       Tux Paint - or in some cases, as part of a "Tux Paint 'Magic' Tool
+       Tux Paint — or in some cases, as part of a "Tux Paint 'Magic' Tool
-       Plugin Development package" - to provide additional command-line flags
+       Plugin Development package" — to provide additional command-line flags
        to your C compiler that will help it build your plugin.
 
     Command-Line Example
@@ -647,12 +648,12 @@ Compiling
          A snippet from a Makefile to compile a Tux Paint "Magic" tool plugin
          might look like this:
 
-           +------------------------------------------------------+
+           +----------------------------------------------------------------+
-           | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags)   |
+           | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags)             |
-           |                                                      |
+           |                                                                |
-           | my_plugin.so: my_plugin.c                            |
+           | my_plugin.so: my_plugin.c                                      |
-           |    gcc -shared $(CFLAGS) -o my_plugin.so my_plugin.c |
+           |    gcc -shared $(CFLAGS) -o my_plugin.so my_plugin.c           |
-           +------------------------------------------------------+
+           +----------------------------------------------------------------+
 
          The first line sets up Makefile variable ("CFLAGS") that contains
          flags for the compiler. "-Wall" asks for all compiler warnings to be
@@ -682,15 +683,15 @@ Compiling
 
          An even more generalized Makefile might look like this:
 
-           +----------------------------------------------------+
+           +----------------------------------------------------------------+
-           | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags) |
+           | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags)             |
-           |                                                    |
+           |                                                                |
-           | my_plugin_1.so: my_plugin_1.c                      |
+           | my_plugin_1.so: my_plugin_1.c                                  |
-           |    $(CC) -shared $(CFLAGS) -o $@ $<                |
+           |    $(CC) -shared $(CFLAGS) -o $@ $<                            |
-           |                                                    |
+           |                                                                |
-           | my_plugin_2.so: my_plugin_2.c                      |
+           | my_plugin_2.so: my_plugin_2.c                                  |
-           |    $(CC) -shared $(CFLAGS) -o $@ $<                |
+           |    $(CC) -shared $(CFLAGS) -o $@ $<                            |
-           +----------------------------------------------------+
+           +----------------------------------------------------------------+
 
          As before, there are lines that define the command "make" should run
          when it determines that it needs to (re)compile the ".so" file(s).
@@ -719,8 +720,8 @@ Installing
   Linux and other Unix-like Platforms
 
        Use the "tp-magic-config" command-line tool, supplied as part of
-       Tux Paint - or in some cases, as part of a "Tux Paint 'Magic' Tool
+       Tux Paint — or in some cases, as part of a "Tux Paint 'Magic' Tool
-       Plugin Development package" - to determine where your plugins' files
+       Plugin Development package" — to determine where your plugins' files
        should go.
 
     Shared Object
@@ -798,35 +799,35 @@ Installing
 
          A snippet from a more generalized Makefile might look like this:
 
-           +------------------------------------------------------------+
+           +----------------------------------------------------------------+
-           | PLUGINPREFIX=$(shell tp-magic-config --pluginprefix)       |
+           | PLUGINPREFIX=$(shell tp-magic-config --pluginprefix)           |
-           | PLUGINDOCPREFIX=$(shell tp-magic-config --plugindocprefix) |
+           | PLUGINDOCPREFIX=$(shell tp-magic-config --plugindocprefix)     |
-           | DATAPREFIX=$(shell tp-magic-config --dataprefix)           |
+           | DATAPREFIX=$(shell tp-magic-config --dataprefix)               |
-           |                                                            |
+           |                                                                |
-           | install:                                                   |
+           | install:                                                       |
-           |    #                                                       |
+           |    #                                                           |
-           |    # Install plugin                                        |
+           |    # Install plugin                                            |
-           |    mkdir -p $(PLUGINPREFIX)                                |
+           |    mkdir -p $(PLUGINPREFIX)                                    |
-           |    cp *.so $(PLUGINPREFIX)/                                |
+           |    cp *.so $(PLUGINPREFIX)/                                    |
-           |    chmod 644 $(PLUGINPREFIX)/*.so                          |
+           |    chmod 644 $(PLUGINPREFIX)/*.so                              |
-           |    #                                                       |
+           |    #                                                           |
-           |    # Install icons                                         |
+           |    # Install icons                                             |
-           |    mkdir -p $(DATAPREFIX)/images/magic                     |
+           |    mkdir -p $(DATAPREFIX)/images/magic                         |
-           |    cp icons/*.png $(DATAPREFIX)/images/magic/              |
+           |    cp icons/*.png $(DATAPREFIX)/images/magic/                  |
-           |    chmod 644 $(DATAPREFIX)/images/magic/*.png              |
+           |    chmod 644 $(DATAPREFIX)/images/magic/*.png                  |
-           |    #                                                       |
+           |    #                                                           |
-           |    # Install sound effects                                 |
+           |    # Install sound effects                                     |
-           |    mkdir -p $(DATAPREFIX)/sounds/magic                     |
+           |    mkdir -p $(DATAPREFIX)/sounds/magic                         |
-           |    cp sounds/*.ogg $(DATAPREFIX)/sounds/magic/             |
+           |    cp sounds/*.ogg $(DATAPREFIX)/sounds/magic/                 |
-           |    chmod 644 $(DATAPREFIX)/sounds/magic/*.ogg              |
+           |    chmod 644 $(DATAPREFIX)/sounds/magic/*.ogg                  |
-           |    #                                                       |
+           |    #                                                           |
-           |    # Install docs                                          |
+           |    # Install docs                                              |
-           |    mkdir -p $(PLUGINDOCPREFIX)/html                        |
+           |    mkdir -p $(PLUGINDOCPREFIX)/html                            |
-           |    cp docs/*.html $(PLUGINDOCPREFIX)/html/                 |
+           |    cp docs/*.html $(PLUGINDOCPREFIX)/html/                     |
-           |    cp docs/*.txt $(PLUGINDOCPREFIX)/                       |
+           |    cp docs/*.txt $(PLUGINDOCPREFIX)/                           |
-           |    chmod 644 $(PLUGINDOCPREFIX)/html/*.html                |
+           |    chmod 644 $(PLUGINDOCPREFIX)/html/*.html                    |
-           |    chmod 644 $(PLUGINDOCPREFIX)/*.txt                      |
+           |    chmod 644 $(PLUGINDOCPREFIX)/*.txt                          |
-           +------------------------------------------------------------+
+           +----------------------------------------------------------------+
 
          The first three lines set up Makefile variables that contain the
          paths returned by the "tp-magic-config" command-line tool. (The

magic/docs/en/html/README.html

@@ -9,13 +9,10 @@ alink="#FF00FF">
 <center>
 <h1>Creating Tux Paint Magic Tool Plugins</h1>
 
-<p>Copyright 2007-2008 by Bill Kendrick and others<br>
+<p>Copyright 2007-2018 by various contributors; see AUTHORS.txt<br/>
-New Breed Software</p>
-
-<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
 <a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
 
-<p>July 5, 2007 - July 19, 2008</p>
+<p>July 5, 2007 - August 30, 2018</p>
 </center>
 
 <hr size=2 noshade>
@@ -315,15 +312,17 @@ then the names of your functions must begin with "<code><b>zoom_</b></code>"
 
 <li><code><b>int modes(magic_api&nbsp;*&nbsp;api,
   int&nbsp;which)</b></code><br>
-  This lets you tell Tux&nbsp;Paint what modes your tool can be used in
+  This lets you tell Tux&nbsp;Paint what modes your tool can be used in;
-  (either as a tool the user can paint with, or a tool that affects
+  either as a tool the user can paint with, or a tool that affects
-  the entire drawing at once)<br>
+  the entire drawing at once.<br>
   <br>
   You must return a value that's some combination of one or more of
   available modes:
   <ul>
-  <li><code>MODE_PAINT</code>
+  <li><code>MODE_PAINT</code> - freehand paint (click and drag)</li>
-  <li><code>MODE_FULLSCREEN</code>
+  <li><code>MODE_FULLSCREEN</code> - applies to full image with one click</li>
+  <li><code>MODE_PAINT_WITH_PREVIEW</code> - freehand paint, with preview (click and drag)</li>
+  <li><code>MODE_ONECLICK</code> - applies to an area around the mouse, with one click</li>
   </ul>
   e.g., if your tool is only one that the user can paint with,
   return "<code>MODE_PAINT</code>".  If the user can do both,

magic/magic-docs/cartoon.txt

@@ -1,6 +0,0 @@
-                        Tux Paint "Magic" Tool: Cartoon
-
-                  By Bill Kendrick <bill@newbreedsoftware.com>
-
-   This makes the picture look like a cartoon - with thick outlines and
-   bright, solid colors - wherever you move the mouse.

magic/magic-docs/en/cartoon.txt

@@ -0,0 +1,6 @@
+                        Tux Paint "Magic" Tool: Cartoon
+
+                  By Bill Kendrick <bill@newbreedsoftware.com>
+
+   This makes the picture look like a cartoon — with thick outlines and
+   bright, solid colors — wherever you move the mouse.

magic/magic-docs/en/html/hexagon_mosaic.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Hexagon Mosaic</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Converts parts of your picture into a mosaic of hexagon cells.</p>
-<p>See also: <a href="irregularmosaic.html">Irregular Mosaic</a> <a href="squaremosaic.html">Square Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
+<p>See also: <a href="irregular_mosaic.html">Irregular Mosaic</a> <a href="square_mosaic.html">Square Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
 </body></html>

magic/magic-docs/en/html/index.html

@@ -11,8 +11,8 @@
 <li><a href="calligraphy.html">Calligraphy</a></li>
 <li><a href="cartoon.html">Cartoon</a></li>
 <li><a href="chalk.html">Chalk</a></li>
-<li><a href="colorandwhite.html">Color and White</a></li>
+<li><a href="color_and_white.html">Color and White</a></li>
-<li><a href="colorshift.html">Color Shift</a></li>
+<li><a href="color_shift.html">Color Shift</a></li>
 <li><a href="confetti.html">Confetti</a></li>
 <li><a href="darken.html">Darken</a></li>
 <li><a href="distortion.html">Distortion</a></li>
@@ -25,42 +25,49 @@
 <li><a href="flower.html">Flower</a></li>
 <li><a href="foam.html">Foam</a></li>
 <li><a href="fold.html">Fold</a></li>
-<li><a href="glasstile.html">Glass Tile</a></li>
+<li><a href="glass_tile.html">Glass Tile</a></li>
 <li><a href="grass.html">Grass</a></li>
 <li><a href="kaleidoscope.html">Kaleidoscope</a></li>
 <li><a href="light.html">Light</a></li>
 <li><a href="lighten.html">Lighten</a></li>
-<li><a href="metalpaint.html">Metal Paint</a></li>
+<li><a href="metal_paint.html">Metal Paint</a></li>
 <li><a href="mirror.html">Mirror</a></li>
 <li><a href="mosaic.html">Mosaic</a></li>
-<li><a href="hexagonmosaic.html">Hexagon Mosaic</a></li>
+<li><a href="hexagon_mosaic.html">Hexagon Mosaic</a></li>
-<li><a href="irregularmosaic.html">Irregular Mosaic</a></li>
+<li><a href="irregular_mosaic.html">Irregular Mosaic</a></li>
-<li><a href="squaremosaic.html">Square Mosaic</a></li>
+<li><a href="square_mosaic.html">Square Mosaic</a></li>
 <li><a href="negative.html">Negative</a></li>
 <li><a href="noise.html">Noise</a></li>
+<li><a href="pattern.html">Pattern</a></li>
 <li><a href="perspective.html">Perspective</a></li>
 <li><a href="picasso.html">Picasso</a></li>
+<li><a href="puzzle.html">Puzzle</a></li>
 <li><a href="rails.html">Rails</a></li>
 <li><a href="rain.html">Rain</a></li>
 <li><a href="rainbow.html">Rainbow</a></li>
-<li><a href="realrainbow.html">Real Rainbow</a></li>
+<li><a href="real_rainbow.html">Real Rainbow</a></li>
-<li><a href="roygbivrainbow.html">ROYGBIV Rainbow</a></li>
+<li><a href="roygbiv_rainbow.html">ROYGBIV Rainbow</a></li>
 <li><a href="ripples.html">Ripples</a></li>
 <li><a href="rosette.html">Rosette</a></li>
 <li><a href="sharpen.html">Sharpen</a></li>
 <li><a href="shift.html">Shift</a></li>
 <li><a href="silhouette.html">Silhouette</a></li>
 <li><a href="smudge.html">Smudge</a></li>
-<li><a href="snowball.html">Snow Ball</a></li>
+<li><a href="snow_ball.html">Snow Ball</a></li>
-<li><a href="snowflake.html">Snow Flake</a></li>
+<li><a href="snow_flake.html">Snow Flake</a></li>
-<li><a href="stringv.html">String V</a></li>
+<li><a href="string_v.html">String V</a></li>
-<li><a href="stringcorner.html">String Corner</a></li>
+<li><a href="string_corner.html">String Corner</a></li>
-<li><a href="stringedges.html">String Edges</a></li>
+<li><a href="string_edges.html">String Edges</a></li>
-<li><a href="tv.html">TV</a></li>
+<li><a href="symmetry_left_right.html">Symmetry Left/Right</a></li>
+<li><a href="symmetry_up_down.html">Symmetry Up/Down</a></li>
+<li><a href="tiles.html">Tiles</a></li>
 <li><a href="tint.html">Tint</a></li>
+<li><a href="tv.html">TV</a></li>
 <li><a href="toothpaste.html">Toothpaste</a></li>
+<li><a href="tornado.html">Tornado</a></li>
 <li><a href="waves.html">Waves</a></li>
 <li><a href="wavelets.html">Wavelets</a></li>
-<li><a href="wetpaint.html">Wet Paint</a></li>
+<li><a href="wet_paint.html">Wet Paint</a></li>
+<li><a href="xor_colors.html">Xor Colors</a></li>
 <li><a href="zoom.html">Zoom</a></li>
 </body></html>

magic/magic-docs/en/html/irregular_mosaic.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Irregular Mosaic</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Converts parts of your picture into a mosaic of irregularly-shaped cells.</p>
-<p>See also: <a href="hexagonmosaic.html">Hexagon Mosaic</a> <a href="squaremosaic.html">Square Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
+<p>See also: <a href="hexagon_mosaic.html">Hexagon Mosaic</a> <a href="square_mosaic.html">Square Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
 </body></html>

magic/magic-docs/en/html/kaleidoscope.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Kaleidoscope</h1>
 <h2 align="center">By Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h2>
 <p>This paint brush draws in four places at the same time, mirroring symmetrically, both horizontally and vertically.  It uses the currently selected color.</p>
-<p>See also: <a href="picasso.html">Picasso</a> <a href="kal_pattern.html">Pattern</a> <a href="kal_tiles.html">Tiles</a></p>
+<p>See also: <a href="picasso.html">Picasso</a></p>
-</body></html>
+</body></html>

magic/magic-docs/en/html/mosaic.html

@@ -8,5 +8,5 @@
 Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;<br>
 </h2>
 <p>Adds a glass mosaic effect to your picture.</p>
-<p>See also: <a href="hexagonmosaic.html">Hexagon Mosaic</a> <a href="irregularmosaic.html">Irregular Mosaic</a> <a href="squaremosaic.html">Square Mosaic</a> </p>
+<p>See also: <a href="hexagon_mosaic.html">Hexagon Mosaic</a> <a href="irregular_mosaic.html">Irregular Mosaic</a> <a href="square_mosaic.html">Square Mosaic</a> </p>
 </body></html>

magic/magic-docs/en/html/pattern.html

@@ -5,6 +5,6 @@
 <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
 <h1 align="center">Tux Paint "Magic" Tool: Pattern</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
-<p>This paint brush draws a repeating tile around the image.</p>
+<p>Draws a tiled pattern around the picture.</p>
-<p>See also: <a href="kal_pattern.html">Pattern</a> <a href="kal_pattern.html">Pattern</a></p>
+<p>See also: <a href="tiles.html">Tiles</a> </p>
-</body></html>
+</body></html>

magic/magic-docs/en/html/puzzle.html

@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<body><html><head><title>Tux Paint "Magic" Tool: Puzzle</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
+<h1 align="center">Tux Paint "Magic" Tool: Puzzle</h1>
+<h2 align="center">By Adam Rakowski &lt;<a href="mailto:foo-script@o2.pl">foo-script@o2.pl</a>&gt;</h2>
+<p>Slide parts of your picture around like a sliding puzzle.</p>
+</body></html>

magic/magic-docs/en/html/rain.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Rain</h1>
 <h2 align="center">By Andrew Corcoran &lt;<a href="mailto:akanewbie@gmail.com">akanewbie@gmail.com</a>&gt;</h2>
 <p>Paint raindrops on your picture.</p>
-<p>See also: <a href="snowball.html">Snow Ball</a> <a href="snowflake.html">Snow Flake</a> </p>
+<p>See also: <a href="snow_ball.html">Snow Ball</a> <a href="snow_flake.html">Snow Flake</a> </p>
 </body></html>

magic/magic-docs/en/html/smudge.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Smudge</h1>
 <h2 align="center">By Albert Cahalan &lt;<a href="mailto:albert@users.sf.net">albert@users.sf.net</a>&gt;</h2>
 <p>This pushes the colors around under the mouse, like finger painting with wet paint.</p>
-<p>See also: <a href="blur.html">Blur</a> <a href="wetpaint.html">Wet Paint</a> </p>
+<p>See also: <a href="blur.html">Blur</a> <a href="wet_paint.html">Wet Paint</a> </p>
 </body></html>

magic/magic-docs/en/html/snow_ball.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Snow Ball</h1>
 <h2 align="center">By Andrew Corcoran &lt;<a href="mailto:akanewbie@gmail.com">akanewbie@gmail.com</a>&gt;</h2>
 <p>Fill the picture with snowballs.</p>
-<p>See also: <a href="rain.html">Rain</a> <a href="snowflake.html">Snow Flake</a> </p>
+<p>See also: <a href="rain.html">Rain</a> <a href="snow_flake.html">Snow Flake</a> </p>
 </body></html>

magic/magic-docs/en/html/snow_flake.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Snow Flake</h1>
 <h2 align="center">By Andrew Corcoran &lt;<a href="mailto:akanewbie@gmail.com">akanewbie@gmail.com</a>&gt;</h2>
 <p>Fill the picture with snowflakes.</p>
-<p>See also: <a href="rain.html">Rain</a> <a href="snowball.html">Snow Ball</a> </p>
+<p>See also: <a href="rain.html">Rain</a> <a href="snow_ball.html">Snow Ball</a> </p>
 </body></html>

magic/magic-docs/en/html/square_mosaic.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: Square Mosaic</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Converts parts of your picture into a mosaic of square cells.</p>
-<p>See also: <a href="hexagonmosaic.html">Hexagon Mosaic</a> <a href="irregularmosaic.html">Irregular Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
+<p>See also: <a href="hexagon_mosaic.html">Hexagon Mosaic</a> <a href="irregular_mosaic.html">Irregular Mosaic</a> <a href="mosaic.html">Mosaic</a> </p>
 </body></html>

magic/magic-docs/en/html/string_corner.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: String Corner</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Draw V-shaped string art at right angles.</p>
-<p>See also: <a href="stringv.html">String V</a> <a href="stringedges.html">String Edges</a> </p>
+<p>See also: <a href="string_v.html">String V</a> <a href="string_edges.html">String Edges</a> </p>
 </body></html>

magic/magic-docs/en/html/string_edges.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: String Edges</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Draw string art around the edges of your picture.</p>
-<p>See also: <a href="stringv.html">String V</a> <a href="stringcorner.html">String Corner</a> </p>
+<p>See also: <a href="string_v.html">String V</a> <a href="string_corner.html">String Corner</a> </p>
 </body></html>

magic/magic-docs/en/html/string_v.html

@@ -6,5 +6,5 @@
 <h1 align="center">Tux Paint "Magic" Tool: String V</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
 <p>Draw V-shaped string art at any angle.</p>
-<p>See also: <a href="stringcorner.html">String Corner</a> <a href="stringedges.html">String Edges</a> </p>
+<p>See also: <a href="string_corner.html">String Corner</a> <a href="string_edges.html">String Edges</a> </p>
 </body></html>

magic/magic-docs/en/html/symmetry_left_right.html

@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<body><html><head><title>Tux Paint "Magic" Tool: Symmetry Left/Right</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
+<h1 align="center">Tux Paint "Magic" Tool: Symmetry Left/Right</h1>
+<h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
+<p>Paint with relfective symmetry across the horizontal center of the image.</p>
+<p>See also: <a href="kaleidoscope.html">Kaleidoscope</a> <a href="pattern.html">Pattern</a> <a href="symmetry_up_down.html">Symmetry Up/Down</a> <a href="tiles.html">Tiles</a> </p>
+</body></html>

magic/magic-docs/en/html/symmetry_up_down.html

@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<body><html><head><title>Tux Paint "Magic" Tool: Symmetry Up/Down</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
+<h1 align="center">Tux Paint "Magic" Tool: Symmetry Up/Down</h1>
+<h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
+<p>Paint with relfective symmetry across the vertical center of the image.</p>
+<p>See also: <a href="kaleidoscope.html">Kaleidoscope</a> <a href="pattern.html">Pattern</a> <a href="symmetry_left_right.html">Symmetry Left/Right</a> <a href="tiles.html">Tiles</a> </p>
+</body></html>

magic/magic-docs/en/html/tiles.html

@@ -5,6 +5,6 @@
 <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
 <h1 align="center">Tux Paint "Magic" Tool: Tiles</h1>
 <h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
-<p>This paint brush draws symmetrically, tiled around the image.</p>
+<p>Draws a symettric pattern around the picture.</p>
-<p>See also: <a href="kaleidoscope.html">Kaleidoscope</a> <a href="kal_pattern.html">Pattern</a></p>
+<p>See also: <a href="pattern.html">Pattern</a> </p>
-</body></html>
+</body></html>

magic/magic-docs/en/html/tornado.html

@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<body><html><head><title>Tux Paint "Magic" Tool: Tornado</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
+<h1 align="center">Tux Paint "Magic" Tool: Tornado</h1>
+<h2 align="center">By Pere Pujal i Carabantes &lt;<a href="mailto:pere@fornol.no-ip.org">pere@fornol.no-ip.org</a>&gt;</h2>
+<p>Draws a tornado effect onto the picture.</p>
+</body></html>

magic/magic-docs/en/html/xor_colors.html

@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<body><html><head><title>Tux Paint "Magic" Tool: Xor Colors</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
+<h1 align="center">Tux Paint "Magic" Tool: Xor Colors</h1>
+<h2 align="center">By Lukasz Dmitrowski &lt;<a href="mailto:lukasz.dmitrowski@gmail.com">lukasz.dmitrowski@gmail.com</a>&gt;</h2>
+<p>Colors based on the position drawn on the picture.</p>
+</body></html>

magic/magic-docs/en/index.txt

@@ -34,8 +34,10 @@
    * Square Mosaic
    * Negative
    * Noise
+   * Pattern
    * Perspective
    * Picasso
+   * Puzzle
    * Rails
    * Rain
    * Rainbow
@@ -52,10 +54,15 @@
    * String V
    * String Corner
    * String Edges
-   * TV
+   * Symmetry Left/Right
+   * Symmetry Up/Down
+   * Tiles
    * Tint
+   * TV
    * Toothpaste
+   * Tornado
    * Waves
    * Wavelets
    * Wet Paint
+   * Xor Colors
    * Zoom