diff --git a/Makefile b/Makefile index cdada6912..83e3ea168 100644 --- a/Makefile +++ b/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) diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index f503cac34..d19d0f541 100644 --- a/docs/AUTHORS.txt +++ b/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 [retired] * Dogri - Provided by chandrakant dhutadmal + Provided by Chandrakant Dhutadmal * Dutch Freek de Kruijf @@ -731,7 +731,7 @@ $Id$ * Kashmiri (Devanagari) * Kashmiri (Perso-Arabic) - Provided by chandrakant dhutadmal + Provided by Chandrakant Dhutadmal * Khmer Khoem Sokhem @@ -930,7 +930,7 @@ $Id$ * Sindhi (Devanagari) * Sindhi (Perso-Arabic) - Provided by chandrakant dhutadmal + Provided by Chandrakant Dhutadmal * Sinhala Menik Prasantha @@ -1018,7 +1018,7 @@ $Id$ Serhij Dubyk * Urdu - Provided by chandrakant dhutadmal + Provided by Chandrakant Dhutadmal * Valencian Pilar Embid Giner diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index a6e1a5310..3e704a12b 100644 --- a/docs/CHANGES.txt +++ b/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 * 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: --------------------- diff --git a/docs/README.txt b/docs/README.txt index 00e1e072f..8b23d044b 100644 --- a/docs/README.txt +++ b/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. diff --git a/macos/Info.plist b/macos/Info.plist index e876c304a..c6b496330 100644 --- a/macos/Info.plist +++ b/macos/Info.plist @@ -23,6 +23,6 @@ CFBundleSignature TXPT CFBundleVersion - 2018-06-27 + 2018-09-01 diff --git a/magic/docs/README.txt b/magic/docs/en/README.txt similarity index 96% rename from magic/docs/README.txt rename to magic/docs/en/README.txt index 3e7e59623..4e9418868 100644 --- a/magic/docs/README.txt +++ b/magic/docs/en/README.txt @@ -1,12 +1,9 @@ Creating Tux Paint Magic Tool Plugins - Copyright 2007-2008 by Bill Kendrick and others - New Breed Software - - bill@newbreedsoftware.com + Copyright 2007-2018 by various contributors; see AUTHORS.txt 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 - (either as a tool the user can paint with, or a tool that - affects the entire drawing at once) + This lets you tell Tux Paint what modes your tool can be used + in; either as a tool the user can paint with, or a tool that + 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_FULLSCREEN + * MODE_PAINT - freehand paint (click and drag) + * 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 - Plugin Development package" - to provide additional command-line flags + Tux Paint — or in some cases, as part of a "Tux Paint 'Magic' Tool + 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) | - | | - | my_plugin.so: my_plugin.c | - | gcc -shared $(CFLAGS) -o my_plugin.so my_plugin.c | - +------------------------------------------------------+ + +----------------------------------------------------------------+ + | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags) | + | | + | 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) | - | | - | my_plugin_1.so: my_plugin_1.c | - | $(CC) -shared $(CFLAGS) -o $@ $< | - | | - | my_plugin_2.so: my_plugin_2.c | - | $(CC) -shared $(CFLAGS) -o $@ $< | - +----------------------------------------------------+ + +----------------------------------------------------------------+ + | CFLAGS=-Wall -O2 $(shell tp-magic-config --cflags) | + | | + | my_plugin_1.so: my_plugin_1.c | + | $(CC) -shared $(CFLAGS) -o $@ $< | + | | + | my_plugin_2.so: my_plugin_2.c | + | $(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 - Plugin Development package" - to determine where your plugins' files + Tux Paint — or in some cases, as part of a "Tux Paint 'Magic' Tool + 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) | - | PLUGINDOCPREFIX=$(shell tp-magic-config --plugindocprefix) | - | DATAPREFIX=$(shell tp-magic-config --dataprefix) | - | | - | install: | - | # | - | # Install plugin | - | mkdir -p $(PLUGINPREFIX) | - | cp *.so $(PLUGINPREFIX)/ | - | chmod 644 $(PLUGINPREFIX)/*.so | - | # | - | # Install icons | - | mkdir -p $(DATAPREFIX)/images/magic | - | cp icons/*.png $(DATAPREFIX)/images/magic/ | - | chmod 644 $(DATAPREFIX)/images/magic/*.png | - | # | - | # Install sound effects | - | mkdir -p $(DATAPREFIX)/sounds/magic | - | cp sounds/*.ogg $(DATAPREFIX)/sounds/magic/ | - | chmod 644 $(DATAPREFIX)/sounds/magic/*.ogg | - | # | - | # Install docs | - | mkdir -p $(PLUGINDOCPREFIX)/html | - | cp docs/*.html $(PLUGINDOCPREFIX)/html/ | - | cp docs/*.txt $(PLUGINDOCPREFIX)/ | - | chmod 644 $(PLUGINDOCPREFIX)/html/*.html | - | chmod 644 $(PLUGINDOCPREFIX)/*.txt | - +------------------------------------------------------------+ + +----------------------------------------------------------------+ + | PLUGINPREFIX=$(shell tp-magic-config --pluginprefix) | + | PLUGINDOCPREFIX=$(shell tp-magic-config --plugindocprefix) | + | DATAPREFIX=$(shell tp-magic-config --dataprefix) | + | | + | install: | + | # | + | # Install plugin | + | mkdir -p $(PLUGINPREFIX) | + | cp *.so $(PLUGINPREFIX)/ | + | chmod 644 $(PLUGINPREFIX)/*.so | + | # | + | # Install icons | + | mkdir -p $(DATAPREFIX)/images/magic | + | cp icons/*.png $(DATAPREFIX)/images/magic/ | + | chmod 644 $(DATAPREFIX)/images/magic/*.png | + | # | + | # Install sound effects | + | mkdir -p $(DATAPREFIX)/sounds/magic | + | cp sounds/*.ogg $(DATAPREFIX)/sounds/magic/ | + | chmod 644 $(DATAPREFIX)/sounds/magic/*.ogg | + | # | + | # Install docs | + | mkdir -p $(PLUGINDOCPREFIX)/html | + | cp docs/*.html $(PLUGINDOCPREFIX)/html/ | + | cp docs/*.txt $(PLUGINDOCPREFIX)/ | + | chmod 644 $(PLUGINDOCPREFIX)/html/*.html | + | 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 diff --git a/magic/docs/html/README.html b/magic/docs/en/html/README.html similarity index 99% rename from magic/docs/html/README.html rename to magic/docs/en/html/README.html index 6523caee7..a83ffa026 100644 --- a/magic/docs/html/README.html +++ b/magic/docs/en/html/README.html @@ -9,13 +9,10 @@ alink="#FF00FF">

Creating Tux Paint Magic Tool Plugins

-

Copyright 2007-2008 by Bill Kendrick and others
-New Breed Software

- -

bill@newbreedsoftware.com
+

Copyright 2007-2018 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/

-

July 5, 2007 - July 19, 2008

+

July 5, 2007 - August 30, 2018

@@ -315,15 +312,17 @@ then the names of your functions must begin with "zoom_"
  • int modes(magic_api * api, int which)
    - This lets you tell Tux Paint what modes your tool can be used in - (either as a tool the user can paint with, or a tool that affects - the entire drawing at once)
    + This lets you tell Tux Paint what modes your tool can be used in; + either as a tool the user can paint with, or a tool that 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_FULLSCREEN +
    • MODE_PAINT - freehand paint (click and drag)
      • +
    • 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, diff --git a/magic/magic-docs/cartoon.txt b/magic/magic-docs/cartoon.txt deleted file mode 100644 index b71a1d622..000000000 --- a/magic/magic-docs/cartoon.txt +++ /dev/null @@ -1,6 +0,0 @@ - Tux Paint "Magic" Tool: Cartoon - - By Bill Kendrick - - This makes the picture look like a cartoon - with thick outlines and - bright, solid colors - wherever you move the mouse. diff --git a/magic/magic-docs/blinds.txt b/magic/magic-docs/en/blinds.txt similarity index 100% rename from magic/magic-docs/blinds.txt rename to magic/magic-docs/en/blinds.txt diff --git a/magic/magic-docs/blocks.txt b/magic/magic-docs/en/blocks.txt similarity index 100% rename from magic/magic-docs/blocks.txt rename to magic/magic-docs/en/blocks.txt diff --git a/magic/magic-docs/blur.txt b/magic/magic-docs/en/blur.txt similarity index 100% rename from magic/magic-docs/blur.txt rename to magic/magic-docs/en/blur.txt diff --git a/magic/magic-docs/bricks.txt b/magic/magic-docs/en/bricks.txt similarity index 100% rename from magic/magic-docs/bricks.txt rename to magic/magic-docs/en/bricks.txt diff --git a/magic/magic-docs/calligraphy.txt b/magic/magic-docs/en/calligraphy.txt similarity index 100% rename from magic/magic-docs/calligraphy.txt rename to magic/magic-docs/en/calligraphy.txt diff --git a/magic/magic-docs/en/cartoon.txt b/magic/magic-docs/en/cartoon.txt new file mode 100644 index 000000000..50ec691b7 --- /dev/null +++ b/magic/magic-docs/en/cartoon.txt @@ -0,0 +1,6 @@ + Tux Paint "Magic" Tool: Cartoon + + By Bill Kendrick + + This makes the picture look like a cartoon — with thick outlines and + bright, solid colors — wherever you move the mouse. diff --git a/magic/magic-docs/chalk.txt b/magic/magic-docs/en/chalk.txt similarity index 100% rename from magic/magic-docs/chalk.txt rename to magic/magic-docs/en/chalk.txt diff --git a/magic/magic-docs/colorandwhite.txt b/magic/magic-docs/en/color_and_white.txt similarity index 100% rename from magic/magic-docs/colorandwhite.txt rename to magic/magic-docs/en/color_and_white.txt diff --git a/magic/magic-docs/colorshift.txt b/magic/magic-docs/en/color_shift.txt similarity index 100% rename from magic/magic-docs/colorshift.txt rename to magic/magic-docs/en/color_shift.txt diff --git a/magic/magic-docs/confetti.txt b/magic/magic-docs/en/confetti.txt similarity index 100% rename from magic/magic-docs/confetti.txt rename to magic/magic-docs/en/confetti.txt diff --git a/magic/magic-docs/darken.txt b/magic/magic-docs/en/darken.txt similarity index 100% rename from magic/magic-docs/darken.txt rename to magic/magic-docs/en/darken.txt diff --git a/magic/magic-docs/distortion.txt b/magic/magic-docs/en/distortion.txt similarity index 100% rename from magic/magic-docs/distortion.txt rename to magic/magic-docs/en/distortion.txt diff --git a/magic/magic-docs/drip.txt b/magic/magic-docs/en/drip.txt similarity index 100% rename from magic/magic-docs/drip.txt rename to magic/magic-docs/en/drip.txt diff --git a/magic/magic-docs/edges.txt b/magic/magic-docs/en/edges.txt similarity index 100% rename from magic/magic-docs/edges.txt rename to magic/magic-docs/en/edges.txt diff --git a/magic/magic-docs/emboss.txt b/magic/magic-docs/en/emboss.txt similarity index 100% rename from magic/magic-docs/emboss.txt rename to magic/magic-docs/en/emboss.txt diff --git a/magic/magic-docs/fill.txt b/magic/magic-docs/en/fill.txt similarity index 100% rename from magic/magic-docs/fill.txt rename to magic/magic-docs/en/fill.txt diff --git a/magic/magic-docs/fisheye.txt b/magic/magic-docs/en/fisheye.txt similarity index 100% rename from magic/magic-docs/fisheye.txt rename to magic/magic-docs/en/fisheye.txt diff --git a/magic/magic-docs/flip.txt b/magic/magic-docs/en/flip.txt similarity index 100% rename from magic/magic-docs/flip.txt rename to magic/magic-docs/en/flip.txt diff --git a/magic/magic-docs/flower.txt b/magic/magic-docs/en/flower.txt similarity index 100% rename from magic/magic-docs/flower.txt rename to magic/magic-docs/en/flower.txt diff --git a/magic/magic-docs/foam.txt b/magic/magic-docs/en/foam.txt similarity index 100% rename from magic/magic-docs/foam.txt rename to magic/magic-docs/en/foam.txt diff --git a/magic/magic-docs/fold.txt b/magic/magic-docs/en/fold.txt similarity index 100% rename from magic/magic-docs/fold.txt rename to magic/magic-docs/en/fold.txt diff --git a/magic/magic-docs/glasstile.txt b/magic/magic-docs/en/glass_tile.txt similarity index 100% rename from magic/magic-docs/glasstile.txt rename to magic/magic-docs/en/glass_tile.txt diff --git a/magic/magic-docs/grass.txt b/magic/magic-docs/en/grass.txt similarity index 100% rename from magic/magic-docs/grass.txt rename to magic/magic-docs/en/grass.txt diff --git a/magic/magic-docs/hexagonmosaic.txt b/magic/magic-docs/en/hexagon_mosaic.txt similarity index 100% rename from magic/magic-docs/hexagonmosaic.txt rename to magic/magic-docs/en/hexagon_mosaic.txt diff --git a/magic/magic-docs/html/blinds.html b/magic/magic-docs/en/html/blinds.html similarity index 100% rename from magic/magic-docs/html/blinds.html rename to magic/magic-docs/en/html/blinds.html diff --git a/magic/magic-docs/html/blocks.html b/magic/magic-docs/en/html/blocks.html similarity index 100% rename from magic/magic-docs/html/blocks.html rename to magic/magic-docs/en/html/blocks.html diff --git a/magic/magic-docs/html/blur.html b/magic/magic-docs/en/html/blur.html similarity index 100% rename from magic/magic-docs/html/blur.html rename to magic/magic-docs/en/html/blur.html diff --git a/magic/magic-docs/html/bricks.html b/magic/magic-docs/en/html/bricks.html similarity index 100% rename from magic/magic-docs/html/bricks.html rename to magic/magic-docs/en/html/bricks.html diff --git a/magic/magic-docs/html/calligraphy.html b/magic/magic-docs/en/html/calligraphy.html similarity index 100% rename from magic/magic-docs/html/calligraphy.html rename to magic/magic-docs/en/html/calligraphy.html diff --git a/magic/magic-docs/html/cartoon.html b/magic/magic-docs/en/html/cartoon.html similarity index 100% rename from magic/magic-docs/html/cartoon.html rename to magic/magic-docs/en/html/cartoon.html diff --git a/magic/magic-docs/html/chalk.html b/magic/magic-docs/en/html/chalk.html similarity index 100% rename from magic/magic-docs/html/chalk.html rename to magic/magic-docs/en/html/chalk.html diff --git a/magic/magic-docs/html/colorandwhite.html b/magic/magic-docs/en/html/color_and_white.html similarity index 100% rename from magic/magic-docs/html/colorandwhite.html rename to magic/magic-docs/en/html/color_and_white.html diff --git a/magic/magic-docs/html/colorshift.html b/magic/magic-docs/en/html/color_shift.html similarity index 100% rename from magic/magic-docs/html/colorshift.html rename to magic/magic-docs/en/html/color_shift.html diff --git a/magic/magic-docs/html/confetti.html b/magic/magic-docs/en/html/confetti.html similarity index 100% rename from magic/magic-docs/html/confetti.html rename to magic/magic-docs/en/html/confetti.html diff --git a/magic/magic-docs/html/darken.html b/magic/magic-docs/en/html/darken.html similarity index 100% rename from magic/magic-docs/html/darken.html rename to magic/magic-docs/en/html/darken.html diff --git a/magic/magic-docs/html/distortion.html b/magic/magic-docs/en/html/distortion.html similarity index 100% rename from magic/magic-docs/html/distortion.html rename to magic/magic-docs/en/html/distortion.html diff --git a/magic/magic-docs/html/drip.html b/magic/magic-docs/en/html/drip.html similarity index 100% rename from magic/magic-docs/html/drip.html rename to magic/magic-docs/en/html/drip.html diff --git a/magic/magic-docs/html/edges.html b/magic/magic-docs/en/html/edges.html similarity index 100% rename from magic/magic-docs/html/edges.html rename to magic/magic-docs/en/html/edges.html diff --git a/magic/magic-docs/html/emboss.html b/magic/magic-docs/en/html/emboss.html similarity index 100% rename from magic/magic-docs/html/emboss.html rename to magic/magic-docs/en/html/emboss.html diff --git a/magic/magic-docs/html/fill.html b/magic/magic-docs/en/html/fill.html similarity index 100% rename from magic/magic-docs/html/fill.html rename to magic/magic-docs/en/html/fill.html diff --git a/magic/magic-docs/html/fisheye.html b/magic/magic-docs/en/html/fisheye.html similarity index 100% rename from magic/magic-docs/html/fisheye.html rename to magic/magic-docs/en/html/fisheye.html diff --git a/magic/magic-docs/html/flip.html b/magic/magic-docs/en/html/flip.html similarity index 100% rename from magic/magic-docs/html/flip.html rename to magic/magic-docs/en/html/flip.html diff --git a/magic/magic-docs/html/flower.html b/magic/magic-docs/en/html/flower.html similarity index 100% rename from magic/magic-docs/html/flower.html rename to magic/magic-docs/en/html/flower.html diff --git a/magic/magic-docs/html/foam.html b/magic/magic-docs/en/html/foam.html similarity index 100% rename from magic/magic-docs/html/foam.html rename to magic/magic-docs/en/html/foam.html diff --git a/magic/magic-docs/html/fold.html b/magic/magic-docs/en/html/fold.html similarity index 100% rename from magic/magic-docs/html/fold.html rename to magic/magic-docs/en/html/fold.html diff --git a/magic/magic-docs/html/glasstile.html b/magic/magic-docs/en/html/glass_tile.html similarity index 100% rename from magic/magic-docs/html/glasstile.html rename to magic/magic-docs/en/html/glass_tile.html diff --git a/magic/magic-docs/html/grass.html b/magic/magic-docs/en/html/grass.html similarity index 100% rename from magic/magic-docs/html/grass.html rename to magic/magic-docs/en/html/grass.html diff --git a/magic/magic-docs/html/hexagonmosaic.html b/magic/magic-docs/en/html/hexagon_mosaic.html similarity index 79% rename from magic/magic-docs/html/hexagonmosaic.html rename to magic/magic-docs/en/html/hexagon_mosaic.html index 0b6dbfba0..c43b3ef7d 100644 --- a/magic/magic-docs/html/hexagonmosaic.html +++ b/magic/magic-docs/en/html/hexagon_mosaic.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Hexagon Mosaic

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Converts parts of your picture into a mosaic of hexagon cells.

    -

    See also: Irregular Mosaic Square Mosaic Mosaic

    +

    See also: Irregular Mosaic Square Mosaic Mosaic

    \ No newline at end of file diff --git a/magic/magic-docs/html/index.html b/magic/magic-docs/en/html/index.html similarity index 66% rename from magic/magic-docs/html/index.html rename to magic/magic-docs/en/html/index.html index 0569d687b..dee3ad42e 100644 --- a/magic/magic-docs/html/index.html +++ b/magic/magic-docs/en/html/index.html @@ -11,8 +11,8 @@
  • Calligraphy
  • Cartoon
  • Chalk
    • -
  • Color and White
    • -
  • Color Shift
    • +
  • Color and White
    • +
  • Color Shift
  • Confetti
  • Darken
  • Distortion
    • @@ -25,42 +25,49 @@
  • Flower
  • Foam
  • Fold
    • -
  • Glass Tile
    • +
  • Glass Tile
  • Grass
  • Kaleidoscope
  • Light
  • Lighten
    • -
  • Metal Paint
    • +
  • Metal Paint
  • Mirror
  • Mosaic
    • -
  • Hexagon Mosaic
    • -
  • Irregular Mosaic
    • -
  • Square Mosaic
    • +
  • Hexagon Mosaic
    • +
  • Irregular Mosaic
    • +
  • Square Mosaic
  • Negative
  • Noise
    • +
  • Pattern
  • Perspective
  • Picasso
    • +
  • Puzzle
  • Rails
  • Rain
  • Rainbow
    • -
  • Real Rainbow
    • -
  • ROYGBIV Rainbow
    • +
  • Real Rainbow
    • +
  • ROYGBIV Rainbow
  • Ripples
  • Rosette
  • Sharpen
  • Shift
  • Silhouette
  • Smudge
    • -
  • Snow Ball
    • -
  • Snow Flake
    • -
  • String V
    • -
  • String Corner
    • -
  • String Edges
    • -
  • TV
    • +
  • Snow Ball
    • +
  • Snow Flake
    • +
  • String V
    • +
  • String Corner
    • +
  • String Edges
    • +
  • Symmetry Left/Right
    • +
  • Symmetry Up/Down
    • +
  • Tiles
  • Tint
    • +
  • TV
  • Toothpaste
    • +
  • Tornado
  • Waves
  • Wavelets
    • -
  • Wet Paint
    • +
  • Wet Paint
    • +
  • Xor Colors
  • Zoom
    • \ No newline at end of file diff --git a/magic/magic-docs/html/irregularmosaic.html b/magic/magic-docs/en/html/irregular_mosaic.html similarity index 80% rename from magic/magic-docs/html/irregularmosaic.html rename to magic/magic-docs/en/html/irregular_mosaic.html index 3bda59f61..a7308fe07 100644 --- a/magic/magic-docs/html/irregularmosaic.html +++ b/magic/magic-docs/en/html/irregular_mosaic.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Irregular Mosaic

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Converts parts of your picture into a mosaic of irregularly-shaped cells.

    -

    See also: Hexagon Mosaic Square Mosaic Mosaic

    +

    See also: Hexagon Mosaic Square Mosaic Mosaic

    \ No newline at end of file diff --git a/magic/magic-docs/html/kaleidoscope.html b/magic/magic-docs/en/html/kaleidoscope.html similarity index 82% rename from magic/magic-docs/html/kaleidoscope.html rename to magic/magic-docs/en/html/kaleidoscope.html index 1ec1bc581..339764a34 100644 --- a/magic/magic-docs/html/kaleidoscope.html +++ b/magic/magic-docs/en/html/kaleidoscope.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Kaleidoscope

    By Bill Kendrick <bill@newbreedsoftware.com>

    This paint brush draws in four places at the same time, mirroring symmetrically, both horizontally and vertically. It uses the currently selected color.

    -

    See also: Picasso Pattern Tiles

    - +

    See also: Picasso

    + \ No newline at end of file diff --git a/magic/magic-docs/html/light.html b/magic/magic-docs/en/html/light.html similarity index 100% rename from magic/magic-docs/html/light.html rename to magic/magic-docs/en/html/light.html diff --git a/magic/magic-docs/html/lighten.html b/magic/magic-docs/en/html/lighten.html similarity index 100% rename from magic/magic-docs/html/lighten.html rename to magic/magic-docs/en/html/lighten.html diff --git a/magic/magic-docs/html/metalpaint.html b/magic/magic-docs/en/html/metal_paint.html similarity index 100% rename from magic/magic-docs/html/metalpaint.html rename to magic/magic-docs/en/html/metal_paint.html diff --git a/magic/magic-docs/html/mirror.html b/magic/magic-docs/en/html/mirror.html similarity index 100% rename from magic/magic-docs/html/mirror.html rename to magic/magic-docs/en/html/mirror.html diff --git a/magic/magic-docs/html/mosaic.html b/magic/magic-docs/en/html/mosaic.html similarity index 78% rename from magic/magic-docs/html/mosaic.html rename to magic/magic-docs/en/html/mosaic.html index 5a8bcf1f2..5892c8649 100644 --- a/magic/magic-docs/html/mosaic.html +++ b/magic/magic-docs/en/html/mosaic.html @@ -8,5 +8,5 @@ Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Adds a glass mosaic effect to your picture.

    -

    See also: Hexagon Mosaic Irregular Mosaic Square Mosaic

    +

    See also: Hexagon Mosaic Irregular Mosaic Square Mosaic

    \ No newline at end of file diff --git a/magic/magic-docs/html/negative.html b/magic/magic-docs/en/html/negative.html similarity index 100% rename from magic/magic-docs/html/negative.html rename to magic/magic-docs/en/html/negative.html diff --git a/magic/magic-docs/html/noise.html b/magic/magic-docs/en/html/noise.html similarity index 100% rename from magic/magic-docs/html/noise.html rename to magic/magic-docs/en/html/noise.html diff --git a/magic/magic-docs/html/kal_pattern.html b/magic/magic-docs/en/html/pattern.html similarity index 73% rename from magic/magic-docs/html/kal_pattern.html rename to magic/magic-docs/en/html/pattern.html index f4df3a8a4..64c37763b 100644 --- a/magic/magic-docs/html/kal_pattern.html +++ b/magic/magic-docs/en/html/pattern.html @@ -5,6 +5,6 @@

    Tux Paint "Magic" Tool: Pattern

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    -

    This paint brush draws a repeating tile around the image.

    -

    See also: Pattern Pattern

    - +

    Draws a tiled pattern around the picture.

    +

    See also: Tiles

    + \ No newline at end of file diff --git a/magic/magic-docs/html/perspective.html b/magic/magic-docs/en/html/perspective.html similarity index 100% rename from magic/magic-docs/html/perspective.html rename to magic/magic-docs/en/html/perspective.html diff --git a/magic/magic-docs/html/picasso.html b/magic/magic-docs/en/html/picasso.html similarity index 100% rename from magic/magic-docs/html/picasso.html rename to magic/magic-docs/en/html/picasso.html diff --git a/magic/magic-docs/en/html/puzzle.html b/magic/magic-docs/en/html/puzzle.html new file mode 100644 index 000000000..7a397f9a6 --- /dev/null +++ b/magic/magic-docs/en/html/puzzle.html @@ -0,0 +1,9 @@ + +Tux Paint "Magic" Tool: Puzzle + + + +

    Tux Paint "Magic" Tool: Puzzle

    +

    By Adam Rakowski <foo-script@o2.pl>

    +

    Slide parts of your picture around like a sliding puzzle.

    + \ No newline at end of file diff --git a/magic/magic-docs/html/rails.html b/magic/magic-docs/en/html/rails.html similarity index 100% rename from magic/magic-docs/html/rails.html rename to magic/magic-docs/en/html/rails.html diff --git a/magic/magic-docs/html/rain.html b/magic/magic-docs/en/html/rain.html similarity index 83% rename from magic/magic-docs/html/rain.html rename to magic/magic-docs/en/html/rain.html index a7ba5d238..88c5d9daa 100644 --- a/magic/magic-docs/html/rain.html +++ b/magic/magic-docs/en/html/rain.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Rain

    By Andrew Corcoran <akanewbie@gmail.com>

    Paint raindrops on your picture.

    -

    See also: Snow Ball Snow Flake

    +

    See also: Snow Ball Snow Flake

    \ No newline at end of file diff --git a/magic/magic-docs/html/rainbow.html b/magic/magic-docs/en/html/rainbow.html similarity index 100% rename from magic/magic-docs/html/rainbow.html rename to magic/magic-docs/en/html/rainbow.html diff --git a/magic/magic-docs/html/realrainbow.html b/magic/magic-docs/en/html/real_rainbow.html similarity index 100% rename from magic/magic-docs/html/realrainbow.html rename to magic/magic-docs/en/html/real_rainbow.html diff --git a/magic/magic-docs/html/ripples.html b/magic/magic-docs/en/html/ripples.html similarity index 100% rename from magic/magic-docs/html/ripples.html rename to magic/magic-docs/en/html/ripples.html diff --git a/magic/magic-docs/html/rosette.html b/magic/magic-docs/en/html/rosette.html similarity index 100% rename from magic/magic-docs/html/rosette.html rename to magic/magic-docs/en/html/rosette.html diff --git a/magic/magic-docs/html/roygbivrainbow.html b/magic/magic-docs/en/html/roygbiv_rainbow.html similarity index 100% rename from magic/magic-docs/html/roygbivrainbow.html rename to magic/magic-docs/en/html/roygbiv_rainbow.html diff --git a/magic/magic-docs/html/sharpen.html b/magic/magic-docs/en/html/sharpen.html similarity index 100% rename from magic/magic-docs/html/sharpen.html rename to magic/magic-docs/en/html/sharpen.html diff --git a/magic/magic-docs/html/shift.html b/magic/magic-docs/en/html/shift.html similarity index 100% rename from magic/magic-docs/html/shift.html rename to magic/magic-docs/en/html/shift.html diff --git a/magic/magic-docs/html/silhouette.html b/magic/magic-docs/en/html/silhouette.html similarity index 100% rename from magic/magic-docs/html/silhouette.html rename to magic/magic-docs/en/html/silhouette.html diff --git a/magic/magic-docs/html/smudge.html b/magic/magic-docs/en/html/smudge.html similarity index 86% rename from magic/magic-docs/html/smudge.html rename to magic/magic-docs/en/html/smudge.html index f8efbc03c..a26896471 100644 --- a/magic/magic-docs/html/smudge.html +++ b/magic/magic-docs/en/html/smudge.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Smudge

    By Albert Cahalan <albert@users.sf.net>

    This pushes the colors around under the mouse, like finger painting with wet paint.

    -

    See also: Blur Wet Paint

    +

    See also: Blur Wet Paint

    \ No newline at end of file diff --git a/magic/magic-docs/html/snowball.html b/magic/magic-docs/en/html/snow_ball.html similarity index 85% rename from magic/magic-docs/html/snowball.html rename to magic/magic-docs/en/html/snow_ball.html index f8de0b80f..ef80b1cbb 100644 --- a/magic/magic-docs/html/snowball.html +++ b/magic/magic-docs/en/html/snow_ball.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Snow Ball

    By Andrew Corcoran <akanewbie@gmail.com>

    Fill the picture with snowballs.

    -

    See also: Rain Snow Flake

    +

    See also: Rain Snow Flake

    \ No newline at end of file diff --git a/magic/magic-docs/html/snowflake.html b/magic/magic-docs/en/html/snow_flake.html similarity index 85% rename from magic/magic-docs/html/snowflake.html rename to magic/magic-docs/en/html/snow_flake.html index cb314f82f..0559cdeb4 100644 --- a/magic/magic-docs/html/snowflake.html +++ b/magic/magic-docs/en/html/snow_flake.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Snow Flake

    By Andrew Corcoran <akanewbie@gmail.com>

    Fill the picture with snowflakes.

    -

    See also: Rain Snow Ball

    +

    See also: Rain Snow Ball

    \ No newline at end of file diff --git a/magic/magic-docs/html/squaremosaic.html b/magic/magic-docs/en/html/square_mosaic.html similarity index 78% rename from magic/magic-docs/html/squaremosaic.html rename to magic/magic-docs/en/html/square_mosaic.html index 0ab8729df..516c0a451 100644 --- a/magic/magic-docs/html/squaremosaic.html +++ b/magic/magic-docs/en/html/square_mosaic.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: Square Mosaic

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Converts parts of your picture into a mosaic of square cells.

    -

    See also: Hexagon Mosaic Irregular Mosaic Mosaic

    +

    See also: Hexagon Mosaic Irregular Mosaic Mosaic

    \ No newline at end of file diff --git a/magic/magic-docs/html/stringcorner.html b/magic/magic-docs/en/html/string_corner.html similarity index 84% rename from magic/magic-docs/html/stringcorner.html rename to magic/magic-docs/en/html/string_corner.html index 2b1504713..a49a4290f 100644 --- a/magic/magic-docs/html/stringcorner.html +++ b/magic/magic-docs/en/html/string_corner.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: String Corner

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Draw V-shaped string art at right angles.

    -

    See also: String V String Edges

    +

    See also: String V String Edges

    \ No newline at end of file diff --git a/magic/magic-docs/html/stringedges.html b/magic/magic-docs/en/html/string_edges.html similarity index 84% rename from magic/magic-docs/html/stringedges.html rename to magic/magic-docs/en/html/string_edges.html index e2673d2a0..9a2c2b541 100644 --- a/magic/magic-docs/html/stringedges.html +++ b/magic/magic-docs/en/html/string_edges.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: String Edges

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Draw string art around the edges of your picture.

    -

    See also: String V String Corner

    +

    See also: String V String Corner

    \ No newline at end of file diff --git a/magic/magic-docs/html/stringv.html b/magic/magic-docs/en/html/string_v.html similarity index 82% rename from magic/magic-docs/html/stringv.html rename to magic/magic-docs/en/html/string_v.html index fb8cb6578..38b991d32 100644 --- a/magic/magic-docs/html/stringv.html +++ b/magic/magic-docs/en/html/string_v.html @@ -6,5 +6,5 @@

    Tux Paint "Magic" Tool: String V

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    Draw V-shaped string art at any angle.

    -

    See also: String Corner String Edges

    +

    See also: String Corner String Edges

    \ No newline at end of file diff --git a/magic/magic-docs/en/html/symmetry_left_right.html b/magic/magic-docs/en/html/symmetry_left_right.html new file mode 100644 index 000000000..463a84772 --- /dev/null +++ b/magic/magic-docs/en/html/symmetry_left_right.html @@ -0,0 +1,10 @@ + +Tux Paint "Magic" Tool: Symmetry Left/Right + + + +

    Tux Paint "Magic" Tool: Symmetry Left/Right

    +

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    +

    Paint with relfective symmetry across the horizontal center of the image.

    +

    See also: Kaleidoscope Pattern Symmetry Up/Down Tiles

    + \ No newline at end of file diff --git a/magic/magic-docs/en/html/symmetry_up_down.html b/magic/magic-docs/en/html/symmetry_up_down.html new file mode 100644 index 000000000..3efa46e51 --- /dev/null +++ b/magic/magic-docs/en/html/symmetry_up_down.html @@ -0,0 +1,10 @@ + +Tux Paint "Magic" Tool: Symmetry Up/Down + + + +

    Tux Paint "Magic" Tool: Symmetry Up/Down

    +

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    +

    Paint with relfective symmetry across the vertical center of the image.

    +

    See also: Kaleidoscope Pattern Symmetry Left/Right Tiles

    + \ No newline at end of file diff --git a/magic/magic-docs/html/kal_tiles.html b/magic/magic-docs/en/html/tiles.html similarity index 71% rename from magic/magic-docs/html/kal_tiles.html rename to magic/magic-docs/en/html/tiles.html index bf40b555a..a6ac406cb 100644 --- a/magic/magic-docs/html/kal_tiles.html +++ b/magic/magic-docs/en/html/tiles.html @@ -5,6 +5,6 @@

    Tux Paint "Magic" Tool: Tiles

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    -

    This paint brush draws symmetrically, tiled around the image.

    -

    See also: Kaleidoscope Pattern

    - +

    Draws a symettric pattern around the picture.

    +

    See also: Pattern

    + \ No newline at end of file diff --git a/magic/magic-docs/html/tint.html b/magic/magic-docs/en/html/tint.html similarity index 100% rename from magic/magic-docs/html/tint.html rename to magic/magic-docs/en/html/tint.html diff --git a/magic/magic-docs/html/toothpaste.html b/magic/magic-docs/en/html/toothpaste.html similarity index 100% rename from magic/magic-docs/html/toothpaste.html rename to magic/magic-docs/en/html/toothpaste.html diff --git a/magic/magic-docs/en/html/tornado.html b/magic/magic-docs/en/html/tornado.html new file mode 100644 index 000000000..ca6128e3b --- /dev/null +++ b/magic/magic-docs/en/html/tornado.html @@ -0,0 +1,9 @@ + +Tux Paint "Magic" Tool: Tornado + + + +

    Tux Paint "Magic" Tool: Tornado

    +

    By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    +

    Draws a tornado effect onto the picture.

    + \ No newline at end of file diff --git a/magic/magic-docs/html/tv.html b/magic/magic-docs/en/html/tv.html similarity index 100% rename from magic/magic-docs/html/tv.html rename to magic/magic-docs/en/html/tv.html diff --git a/magic/magic-docs/html/wavelets.html b/magic/magic-docs/en/html/wavelets.html similarity index 100% rename from magic/magic-docs/html/wavelets.html rename to magic/magic-docs/en/html/wavelets.html diff --git a/magic/magic-docs/html/waves.html b/magic/magic-docs/en/html/waves.html similarity index 100% rename from magic/magic-docs/html/waves.html rename to magic/magic-docs/en/html/waves.html diff --git a/magic/magic-docs/html/wetpaint.html b/magic/magic-docs/en/html/wet_paint.html similarity index 100% rename from magic/magic-docs/html/wetpaint.html rename to magic/magic-docs/en/html/wet_paint.html diff --git a/magic/magic-docs/en/html/xor_colors.html b/magic/magic-docs/en/html/xor_colors.html new file mode 100644 index 000000000..f52c07daf --- /dev/null +++ b/magic/magic-docs/en/html/xor_colors.html @@ -0,0 +1,9 @@ + +Tux Paint "Magic" Tool: Xor Colors + + + +

    Tux Paint "Magic" Tool: Xor Colors

    +

    By Lukasz Dmitrowski <lukasz.dmitrowski@gmail.com>

    +

    Colors based on the position drawn on the picture.

    + \ No newline at end of file diff --git a/magic/magic-docs/html/zoom.html b/magic/magic-docs/en/html/zoom.html similarity index 100% rename from magic/magic-docs/html/zoom.html rename to magic/magic-docs/en/html/zoom.html diff --git a/magic/magic-docs/index.txt b/magic/magic-docs/en/index.txt similarity index 88% rename from magic/magic-docs/index.txt rename to magic/magic-docs/en/index.txt index abb9c31cc..a4f6712ca 100644 --- a/magic/magic-docs/index.txt +++ b/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 diff --git a/magic/magic-docs/irregularmosaic.txt b/magic/magic-docs/en/irregular_mosaic.txt similarity index 100% rename from magic/magic-docs/irregularmosaic.txt rename to magic/magic-docs/en/irregular_mosaic.txt diff --git a/magic/magic-docs/kaleidoscope.txt b/magic/magic-docs/en/kaleidoscope.txt similarity index 89% rename from magic/magic-docs/kaleidoscope.txt rename to magic/magic-docs/en/kaleidoscope.txt index 695ae0fb0..65a3c4701 100644 --- a/magic/magic-docs/kaleidoscope.txt +++ b/magic/magic-docs/en/kaleidoscope.txt @@ -6,4 +6,4 @@ symmetrically, both horizontally and vertically. It uses the currently selected color. - See also: Picasso Pattern Tiles + See also: Picasso diff --git a/magic/magic-docs/light.txt b/magic/magic-docs/en/light.txt similarity index 100% rename from magic/magic-docs/light.txt rename to magic/magic-docs/en/light.txt diff --git a/magic/magic-docs/lighten.txt b/magic/magic-docs/en/lighten.txt similarity index 100% rename from magic/magic-docs/lighten.txt rename to magic/magic-docs/en/lighten.txt diff --git a/magic/magic-docs/metalpaint.txt b/magic/magic-docs/en/metal_paint.txt similarity index 100% rename from magic/magic-docs/metalpaint.txt rename to magic/magic-docs/en/metal_paint.txt diff --git a/magic/magic-docs/mirror.txt b/magic/magic-docs/en/mirror.txt similarity index 100% rename from magic/magic-docs/mirror.txt rename to magic/magic-docs/en/mirror.txt diff --git a/magic/magic-docs/mosaic.txt b/magic/magic-docs/en/mosaic.txt similarity index 100% rename from magic/magic-docs/mosaic.txt rename to magic/magic-docs/en/mosaic.txt diff --git a/magic/magic-docs/negative.txt b/magic/magic-docs/en/negative.txt similarity index 100% rename from magic/magic-docs/negative.txt rename to magic/magic-docs/en/negative.txt diff --git a/magic/magic-docs/noise.txt b/magic/magic-docs/en/noise.txt similarity index 100% rename from magic/magic-docs/noise.txt rename to magic/magic-docs/en/noise.txt diff --git a/magic/magic-docs/kal_pattern.txt b/magic/magic-docs/en/pattern.txt similarity index 58% rename from magic/magic-docs/kal_pattern.txt rename to magic/magic-docs/en/pattern.txt index a98aeb492..766cc795c 100644 --- a/magic/magic-docs/kal_pattern.txt +++ b/magic/magic-docs/en/pattern.txt @@ -2,6 +2,6 @@ By Pere Pujal i Carabantes - This paint brush draws a repeating tile around the image. + Draws a tiled pattern around the picture. - See also: Pattern Pattern + See also: Tiles diff --git a/magic/magic-docs/perspective.txt b/magic/magic-docs/en/perspective.txt similarity index 100% rename from magic/magic-docs/perspective.txt rename to magic/magic-docs/en/perspective.txt diff --git a/magic/magic-docs/picasso.txt b/magic/magic-docs/en/picasso.txt similarity index 100% rename from magic/magic-docs/picasso.txt rename to magic/magic-docs/en/picasso.txt diff --git a/magic/magic-docs/en/puzzle.txt b/magic/magic-docs/en/puzzle.txt new file mode 100644 index 000000000..79aebafd6 --- /dev/null +++ b/magic/magic-docs/en/puzzle.txt @@ -0,0 +1,5 @@ + Tux Paint "Magic" Tool: Puzzle + + By Adam Rakowski + + Slide parts of your picture around like a sliding puzzle. diff --git a/magic/magic-docs/rails.txt b/magic/magic-docs/en/rails.txt similarity index 100% rename from magic/magic-docs/rails.txt rename to magic/magic-docs/en/rails.txt diff --git a/magic/magic-docs/rain.txt b/magic/magic-docs/en/rain.txt similarity index 100% rename from magic/magic-docs/rain.txt rename to magic/magic-docs/en/rain.txt diff --git a/magic/magic-docs/rainbow.txt b/magic/magic-docs/en/rainbow.txt similarity index 100% rename from magic/magic-docs/rainbow.txt rename to magic/magic-docs/en/rainbow.txt diff --git a/magic/magic-docs/realrainbow.txt b/magic/magic-docs/en/real_rainbow.txt similarity index 100% rename from magic/magic-docs/realrainbow.txt rename to magic/magic-docs/en/real_rainbow.txt diff --git a/magic/magic-docs/ripples.txt b/magic/magic-docs/en/ripples.txt similarity index 100% rename from magic/magic-docs/ripples.txt rename to magic/magic-docs/en/ripples.txt diff --git a/magic/magic-docs/rosette.txt b/magic/magic-docs/en/rosette.txt similarity index 100% rename from magic/magic-docs/rosette.txt rename to magic/magic-docs/en/rosette.txt diff --git a/magic/magic-docs/roygbivrainbow.txt b/magic/magic-docs/en/roygbiv_rainbow.txt similarity index 100% rename from magic/magic-docs/roygbivrainbow.txt rename to magic/magic-docs/en/roygbiv_rainbow.txt diff --git a/magic/magic-docs/sharpen.txt b/magic/magic-docs/en/sharpen.txt similarity index 100% rename from magic/magic-docs/sharpen.txt rename to magic/magic-docs/en/sharpen.txt diff --git a/magic/magic-docs/shift.txt b/magic/magic-docs/en/shift.txt similarity index 100% rename from magic/magic-docs/shift.txt rename to magic/magic-docs/en/shift.txt diff --git a/magic/magic-docs/silhouette.txt b/magic/magic-docs/en/silhouette.txt similarity index 100% rename from magic/magic-docs/silhouette.txt rename to magic/magic-docs/en/silhouette.txt diff --git a/magic/magic-docs/smudge.txt b/magic/magic-docs/en/smudge.txt similarity index 100% rename from magic/magic-docs/smudge.txt rename to magic/magic-docs/en/smudge.txt diff --git a/magic/magic-docs/snowball.txt b/magic/magic-docs/en/snow_ball.txt similarity index 100% rename from magic/magic-docs/snowball.txt rename to magic/magic-docs/en/snow_ball.txt diff --git a/magic/magic-docs/snowflake.txt b/magic/magic-docs/en/snow_flake.txt similarity index 100% rename from magic/magic-docs/snowflake.txt rename to magic/magic-docs/en/snow_flake.txt diff --git a/magic/magic-docs/squaremosaic.txt b/magic/magic-docs/en/square_mosaic.txt similarity index 100% rename from magic/magic-docs/squaremosaic.txt rename to magic/magic-docs/en/square_mosaic.txt diff --git a/magic/magic-docs/stringcorner.txt b/magic/magic-docs/en/string_corner.txt similarity index 100% rename from magic/magic-docs/stringcorner.txt rename to magic/magic-docs/en/string_corner.txt diff --git a/magic/magic-docs/stringedges.txt b/magic/magic-docs/en/string_edges.txt similarity index 100% rename from magic/magic-docs/stringedges.txt rename to magic/magic-docs/en/string_edges.txt diff --git a/magic/magic-docs/stringv.txt b/magic/magic-docs/en/string_v.txt similarity index 100% rename from magic/magic-docs/stringv.txt rename to magic/magic-docs/en/string_v.txt diff --git a/magic/magic-docs/en/symmetry_left_right.txt b/magic/magic-docs/en/symmetry_left_right.txt new file mode 100644 index 000000000..256dfa548 --- /dev/null +++ b/magic/magic-docs/en/symmetry_left_right.txt @@ -0,0 +1,7 @@ + Tux Paint "Magic" Tool: Symmetry Left/Right + + By Pere Pujal i Carabantes + + Paint with relfective symmetry across the horizontal center of the image. + + See also: Kaleidoscope Pattern Symmetry Up/Down Tiles diff --git a/magic/magic-docs/en/symmetry_up_down.txt b/magic/magic-docs/en/symmetry_up_down.txt new file mode 100644 index 000000000..2489d96d5 --- /dev/null +++ b/magic/magic-docs/en/symmetry_up_down.txt @@ -0,0 +1,7 @@ + Tux Paint "Magic" Tool: Symmetry Up/Down + + By Pere Pujal i Carabantes + + Paint with relfective symmetry across the vertical center of the image. + + See also: Kaleidoscope Pattern Symmetry Left/Right Tiles diff --git a/magic/magic-docs/kal_tiles.txt b/magic/magic-docs/en/tiles.txt similarity index 55% rename from magic/magic-docs/kal_tiles.txt rename to magic/magic-docs/en/tiles.txt index e5eb39021..5c53d9f6d 100644 --- a/magic/magic-docs/kal_tiles.txt +++ b/magic/magic-docs/en/tiles.txt @@ -2,6 +2,6 @@ By Pere Pujal i Carabantes - This paint brush draws symmetrically, tiled around the image. + Draws a symettric pattern around the picture. - See also: Kaleidoscope Pattern + See also: Pattern diff --git a/magic/magic-docs/tint.txt b/magic/magic-docs/en/tint.txt similarity index 100% rename from magic/magic-docs/tint.txt rename to magic/magic-docs/en/tint.txt diff --git a/magic/magic-docs/toothpaste.txt b/magic/magic-docs/en/toothpaste.txt similarity index 100% rename from magic/magic-docs/toothpaste.txt rename to magic/magic-docs/en/toothpaste.txt diff --git a/magic/magic-docs/en/tornado.txt b/magic/magic-docs/en/tornado.txt new file mode 100644 index 000000000..7c3276d95 --- /dev/null +++ b/magic/magic-docs/en/tornado.txt @@ -0,0 +1,5 @@ + Tux Paint "Magic" Tool: Tornado + + By Pere Pujal i Carabantes + + Draws a tornado effect onto the picture. diff --git a/magic/magic-docs/tv.txt b/magic/magic-docs/en/tv.txt similarity index 100% rename from magic/magic-docs/tv.txt rename to magic/magic-docs/en/tv.txt diff --git a/magic/magic-docs/wavelets.txt b/magic/magic-docs/en/wavelets.txt similarity index 100% rename from magic/magic-docs/wavelets.txt rename to magic/magic-docs/en/wavelets.txt diff --git a/magic/magic-docs/waves.txt b/magic/magic-docs/en/waves.txt similarity index 100% rename from magic/magic-docs/waves.txt rename to magic/magic-docs/en/waves.txt diff --git a/magic/magic-docs/wetpaint.txt b/magic/magic-docs/en/wet_paint.txt similarity index 100% rename from magic/magic-docs/wetpaint.txt rename to magic/magic-docs/en/wet_paint.txt diff --git a/magic/magic-docs/en/xor_colors.txt b/magic/magic-docs/en/xor_colors.txt new file mode 100644 index 000000000..565ad6916 --- /dev/null +++ b/magic/magic-docs/en/xor_colors.txt @@ -0,0 +1,5 @@ + Tux Paint "Magic" Tool: Xor Colors + + By Lukasz Dmitrowski + + Colors based on the position drawn on the picture. diff --git a/magic/magic-docs/zoom.txt b/magic/magic-docs/en/zoom.txt similarity index 100% rename from magic/magic-docs/zoom.txt rename to magic/magic-docs/en/zoom.txt diff --git a/magic/magic-docs/src/magic-docs.php b/magic/magic-docs/src/magic-docs.php index 6dc29f38b..ef3d98765 100644 --- a/magic/magic-docs/src/magic-docs.php +++ b/magic/magic-docs/src/magic-docs.php @@ -1,11 +1,11 @@ - */ -/* 2009.10.08 */ +/* Oct. 8, 2009 - August 30, 2018 */ /* Authors of the Magic tools: */ @@ -216,6 +216,11 @@ $tools = array( 'desc'=>'Add random noise and static to your picture.', 'author'=>$AUTHOR_ANDREWC), + array('name'=>'Pattern', + 'desc'=>'Draws a tiled pattern around the picture.', + 'author'=>$AUTHOR_PERE, + 'see'=>array('Tiles')), + array('name'=>'Perspective', 'desc'=>'Click and drag from the corners to change the perspective of your picture.', 'author'=>$AUTHOR_PERE), @@ -225,6 +230,10 @@ $tools = array( 'author'=>$AUTHOR_ADAMR, 'see'=>'Rosette', 'Kaleidoscope'), + array('name'=>'Puzzle', + 'desc'=>'Slide parts of your picture around like a sliding puzzle.', + 'author'=>$AUTHOR_ADAMR), + array('name'=>'Rails', 'desc'=>'Draw connecting locomotive train rails on your picture.', 'author'=>array($AUTHOR_ADAMR, $AUTHOR_PERE, $AUTHOR_KENDRICK)), @@ -299,20 +308,37 @@ $tools = array( 'author'=>$AUTHOR_PERE, 'see'=>array('String V', 'String Corner')), - array('name'=>'TV', - 'desc'=>'Distort your picture so it looks like it\'s on a television (TV).', - 'author'=>$AUTHOR_ADAMR), + array('name'=>'Symmetry Left/Right', + 'desc'=>'Paint with relfective symmetry across the horizontal center of the image.', + 'author'=>$AUTHOR_PERE, + 'see'=>array('Kaleidoscope', 'Pattern', 'Symmetry Up/Down', 'Tiles')), + + array('name'=>'Symmetry Up/Down', + 'desc'=>'Paint with relfective symmetry across the vertical center of the image.', + 'author'=>$AUTHOR_PERE, + 'see'=>array('Kaleidoscope', 'Pattern', 'Symmetry Left/Right', 'Tiles')), + + array('name'=>'Tiles', + 'desc'=>'Draws a symettric pattern around the picture.', + 'author'=>$AUTHOR_PERE, + 'see'=>array('Pattern')), array('name'=>'Tint', 'desc'=>'This changes the color (or hue) of the parts of the picture to the selected color.', 'author'=>$AUTHOR_KENDRICK, 'see'=>array('Lighten', 'Darken')), + array('name'=>'TV', + 'desc'=>'Distort your picture so it looks like it\'s on a television (TV).', + 'author'=>$AUTHOR_ADAMR), + array('name'=>'Toothpaste', 'desc'=>'Paint thick blobs of color on your picture that look like toothpaste.', 'author'=>$AUTHOR_ANDREWC), -/* FIXME: Tornado */ + array('name'=>'Tornado', + 'desc'=>'Draws a tornado effect onto the picture.', + 'author'=>$AUTHOR_PERE), array('name'=>'Waves', 'desc'=>'Click to make the entire picture wavy, side-to-side. Drag the mouse up and down to change the height of the ripples, and left and right to change the width. Release the mouse button when it looks the way you like it.', /* FIXME: Dragging went away! */ @@ -329,18 +355,22 @@ $tools = array( 'author'=>array($AUTHOR_ALBERT, $AUTHOR_KENDRICK), 'see'=>'Smudge'), + array('name'=>'Xor Colors', + 'desc'=>'Colors based on the position drawn on the picture.', + 'author'=>'Lukasz Dmitrowski|lukasz.dmitrowski@gmail.com'), + array('name'=>'Zoom', 'desc'=>'Click and drag up to zoom in, or down to zoom out.', 'author'=>$AUTHOR_PERE), ); -$fiidx = fopen("../html/index.html", "w"); +$fiidx = fopen("../en/html/index.html", "w"); fwrite($fiidx, page_header("List of Magic Tools")); foreach ($tools as $t) { - $shortname = str_replace(' ','', strtolower($t['name'])); + $shortname = make_shortname($t['name']); $out = page_header($t['name']); $out .= "

    By "; @@ -362,21 +392,21 @@ foreach ($tools as $t) { $out .= "

    See also: "; if (is_array($t['see'])) { foreach ($t['see'] as $s) { - $out .= "".$s." "; + $out .= "".$s." "; } } else { - $out .= "".$t['see'].""; + $out .= "".$t['see'].""; } $out .= "

    \n"; } - if (file_exists("../html/images/ex_".$shortname.".png")) { + if (file_exists("../en/html/images/ex_".$shortname.".png")) { $out .= "

    \n"; } $out .= page_footer(); - $fi = fopen("../html/".$shortname.".html", "w"); + $fi = fopen("../en/html/".$shortname.".html", "w"); fwrite($fi, $out); fclose($fi); @@ -404,4 +434,8 @@ function page_footer() return ""; } +function make_shortname($name) { + return preg_replace("/[^a-z]/", "_", strtolower($name)); +} + ?>