diff --git a/Makefile b/Makefile index 9900e223e..e7c4fff2d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Tux Paint - A simple drawing program for children. -# Copyright (c) 2002-2008 by Bill Kendrick and others +# Copyright (c) 2002-2009 by Bill Kendrick and others # bill@newbreedsoftware.com # http://www.tuxpaint.org/ -# June 14, 2002 - January 2, 2009 +# June 14, 2002 - April 28, 2009 # The version number, for release: @@ -793,7 +793,7 @@ install-doc: @install -d $(DOC_PREFIX) @cp -R docs/* $(DOC_PREFIX) @cp -R magic/magic-docs $(DOC_PREFIX) - @chmod a=rX,g=rX,u=rwX $(DOC_PREFIX) + @chmod -R a=rX,g=rX,u=rwX $(DOC_PREFIX) # Install the man page: diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index afd06ad90..0069df8ec 100644 --- a/docs/AUTHORS.txt +++ b/docs/AUTHORS.txt @@ -636,7 +636,6 @@ $Id$ * Support / Testers - Tux4Kids.org, Sam Hart (Tux4Kids project manager) Many others in the community! (Testing, bug fixes, comments, kudos) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 107584e88..0afe0e3b9 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2009.April.23 (0.9.21) +2009.April.28 (0.9.21) * New Starters: ------------- * Silver Frame @@ -113,6 +113,10 @@ $Id$ --------------------------- * Corrected location of config files for Mac OS X in OPTIONS docs. + * HTML documentation files for the various Magic tools are now + generated using a PHP script. Tool details are stored in a PHP array + (which is easier-to-edit than individual HTML files). + * Other Improvements: ------------------- * Starter images no longer need to be created with alpha transparency. diff --git a/docs/html/README.html b/docs/html/README.html index 9b936a9a4..e158d8eb6 100644 --- a/docs/html/README.html +++ b/docs/html/README.html @@ -17,15 +17,16 @@ version
Copyright 2002-2008 by Bill Kendrick and others
-New Breed Software
Copyright 2002-2009 by Bill Kendrick and others
+New Breed Software &
+Tux4Kids
bill@newbreedsoftware.com
http://www.tuxpaint.org/
June 14, 2002 - - October 29, 2008
+ April 28, 2009 diff --git a/magic/magic-docs/blocks.txt b/magic/magic-docs/blocks.txt index 75fd83e16..46be9de3f 100644 --- a/magic/magic-docs/blocks.txt +++ b/magic/magic-docs/blocks.txt @@ -1,4 +1,7 @@ Tux Paint "Magic" Tool: Blocks + By Bill Kendrick- This makes the picture blocky looking ("pixelated") wherever - you drag the mouse. -
- - - + +This makes the picture blocky looking ("pixelated") wherever you drag the mouse.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/blur.html b/magic/magic-docs/html/blur.html index 18ef4db29..ce6c13032 100644 --- a/magic/magic-docs/html/blur.html +++ b/magic/magic-docs/html/blur.html @@ -1,26 +1,11 @@ -- This makes the picture fuzzy wherever you drag the mouse. -
- -See also: Smudge.
- - - + +This makes the picture fuzzy wherever you drag the mouse.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/bricks.html b/magic/magic-docs/html/bricks.html index 9721b1afb..e19341584 100644 --- a/magic/magic-docs/html/bricks.html +++ b/magic/magic-docs/html/bricks.html @@ -1,26 +1,9 @@ -- These two tools intelligently paint large and small brick - patterns on the canvas. The bricks can be tinted various redish - hues by selecting different colors in the color palette. -
- - - + +These two tools intelligently paint large and small brick patterns on the canvas. The bricks can be tinted various redish hues by selecting different colors in the color palette.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/calligraphy.html b/magic/magic-docs/html/calligraphy.html index 8e958e159..e337e774b 100644 --- a/magic/magic-docs/html/calligraphy.html +++ b/magic/magic-docs/html/calligraphy.html @@ -1,24 +1,9 @@ -- This paints on the canvas with a calligraphy pen. -
- - - + +This paints on the canvas with a calligraphy pen. The quicker you move, the thinner the lines.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/cartoon.html b/magic/magic-docs/html/cartoon.html index a93b72d54..0dd7020f3 100644 --- a/magic/magic-docs/html/cartoon.html +++ b/magic/magic-docs/html/cartoon.html @@ -1,25 +1,9 @@ -- This makes the picture look like a cartoon — with thick - outlines and bright, solid colors — wherever you move the mouse. -
- - - + +This makes the picture look like a cartoon — with thick outlines and bright, solid colors — wherever you move the mouse.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/chalk.html b/magic/magic-docs/html/chalk.html index 98488403c..8a0f678eb 100644 --- a/magic/magic-docs/html/chalk.html +++ b/magic/magic-docs/html/chalk.html @@ -1,25 +1,9 @@ -- This makes parts of the picture (where you move the mouse) - look like a chalk drawing. -
- - - + +This makes parts of the picture (where you move the mouse) look like a chalk drawing.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/darken.html b/magic/magic-docs/html/darken.html index 543989d45..a9782a84c 100644 --- a/magic/magic-docs/html/darken.html +++ b/magic/magic-docs/html/darken.html @@ -1,30 +1,10 @@ -- This dakrens the colors wherever you drag the mouse. - (Do it to the same spot many times, and it will eventually become - black.) -
- - - - - - + +This dakrens the colors wherever you drag the mouse. (Do it to the same spot many times, and it will eventually become black.)
+ + \ No newline at end of file diff --git a/magic/magic-docs/html/distortion.html b/magic/magic-docs/html/distortion.html new file mode 100644 index 000000000..04b457a6b --- /dev/null +++ b/magic/magic-docs/html/distortion.html @@ -0,0 +1,9 @@ + +This slightly distorts the picture wherever you move the mouse.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/drip.html b/magic/magic-docs/html/drip.html index 8c59bc7f0..9367fd6b1 100644 --- a/magic/magic-docs/html/drip.html +++ b/magic/magic-docs/html/drip.html @@ -1,24 +1,9 @@ -- This makes the paint "drip" wherever you move the mouse. -
- - - + +This makes the paint "drip" wherever you move the mouse.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/emboss.html b/magic/magic-docs/html/emboss.html index 9f1b481e3..3c23a28b0 100644 --- a/magic/magic-docs/html/emboss.html +++ b/magic/magic-docs/html/emboss.html @@ -1,25 +1,9 @@ -This makes parts of your picture look "embossed." Wherever there are -sharp edges in your picture, the picture will look raised like it was -stamped in metal. -
- - - + +This makes parts of your picture look "embossed." Wherever there are sharp edges in your picture, the picture will look raised like it was stamped in metal.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/fade.html b/magic/magic-docs/html/fade.html index 326dbb893..2164bc487 100644 --- a/magic/magic-docs/html/fade.html +++ b/magic/magic-docs/html/fade.html @@ -1,30 +1,10 @@ -- This fades the colors wherever you drag the mouse. - (Do it to the same spot many times, and it will eventually become - white.) -
- - - - - - + +This fades the colors wherever you drag the mouse. (Do it to the same spot many times, and it will eventually become white.)
+ + \ No newline at end of file diff --git a/magic/magic-docs/html/fill.html b/magic/magic-docs/html/fill.html index d32728ced..e6bcd8506 100644 --- a/magic/magic-docs/html/fill.html +++ b/magic/magic-docs/html/fill.html @@ -1,25 +1,9 @@ -- This floods the picture with a color. It lets you quickly - fill parts of the picture, as if it were a coloring book. -
- - - + +This floods the picture with a color. It lets you quickly fill parts of the picture, as if it were a coloring book.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/flip.html b/magic/magic-docs/html/flip.html index c7b1ed473..a32e3002d 100644 --- a/magic/magic-docs/html/flip.html +++ b/magic/magic-docs/html/flip.html @@ -1,27 +1,10 @@ -- Similar to "Mirror." Click and the entire image will be turned - upside-down. -
- -See also: Mirror.
- - - + +Similar to "Mirror." Click and the entire image will be turned upside-down.
+See also: Mirror
+ \ No newline at end of file diff --git a/magic/magic-docs/html/flower.html b/magic/magic-docs/html/flower.html index d7fc7c4d9..ab9c77064 100644 --- a/magic/magic-docs/html/flower.html +++ b/magic/magic-docs/html/flower.html @@ -1,31 +1,10 @@ --This tool draws small flowers, with leafy bases and stalks. -Click to set the base, then drag the mouse upwards to drawe the stalk, -and finally release the mouse button to finish the flower. It will be drawn -in the currently-selected color. -The shape and length of the stalk depends on how you move the mouse -while you drag. -
- -See also: Grass.
- - - + +This tool draws small flowers, with leafy bases and stalks. Click to set the base, then drag the mouse upwards to drawe the stalk, and finally release the mouse button to finish the flower. It will be drawn in the currently-selected color. The shape and length of the stalk depends on how you move the mouse while you drag.
+See also: Grass
+ \ No newline at end of file diff --git a/magic/magic-docs/html/foam.html b/magic/magic-docs/html/foam.html index ca16fd583..a9066c159 100644 --- a/magic/magic-docs/html/foam.html +++ b/magic/magic-docs/html/foam.html @@ -1,25 +1,9 @@ -Click and drag the mouse to draw foamy bubbles. The more you drag the -mouse in a particular spot, the more likely small bubbles will combine to -form bigger bubbles. -
- - - + +Click and drag the mouse to draw foamy bubbles. The more you drag the mouse in a particular spot, the more likely small bubbles will combine to form bigger bubbles.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/glasstile.html b/magic/magic-docs/html/glasstile.html index b6e75ec0f..d19a42ab1 100644 --- a/magic/magic-docs/html/glasstile.html +++ b/magic/magic-docs/html/glasstile.html @@ -1,24 +1,9 @@ -Click and drag over your picture to make it look like it's being seen -through glass tiles. -
- - - + +Click and drag over your picture to make it look like it's being seen through glass tiles.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/grass.html b/magic/magic-docs/html/grass.html index 92e9983c7..d8ed9a51f 100644 --- a/magic/magic-docs/html/grass.html +++ b/magic/magic-docs/html/grass.html @@ -1,29 +1,10 @@ -- This paints grass on the image. The higher up the canvas, - the smaller the grass is drawn, giving an illusion of perspective. - The grass can be tinted various greenish hues by selecting - different colors in the color palette. -
- -See also: Flower.
- - - + +This paints grass on the image. The higher up the canvas, the smaller the grass is drawn, giving an illusion of perspective. The grass can be tinted various greenish hues by selecting different colors in the color palette.
+See also: Flower
+ \ No newline at end of file diff --git a/magic/magic-docs/html/index.html b/magic/magic-docs/html/index.html new file mode 100644 index 000000000..8b5d7a539 --- /dev/null +++ b/magic/magic-docs/html/index.html @@ -0,0 +1,35 @@ + +This paint brush draws in four places at the same time, mirroring symmetrically, both horizontally and vertically. It uses the currently selected color.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/light.html b/magic/magic-docs/html/light.html index 3d4323924..295f48834 100644 --- a/magic/magic-docs/html/light.html +++ b/magic/magic-docs/html/light.html @@ -1,25 +1,9 @@ -- This draws a glowing beam on the canvas, in the currently-selected - color. The more you use it on one spot, the more white it becomes. -
- - - + +This draws a glowing beam on the canvas, in the currently-selected color. The more you use it on one spot, the more white it becomes.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/metalpaint.html b/magic/magic-docs/html/metalpaint.html index 483d8fa52..a48424425 100644 --- a/magic/magic-docs/html/metalpaint.html +++ b/magic/magic-docs/html/metalpaint.html @@ -1,24 +1,9 @@ --Click and drag to draw shiny metal using the current color. -
- - - + +Click and drag to draw shiny metal using the current color.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/mirror.html b/magic/magic-docs/html/mirror.html index 30db4c00e..d66cf59cf 100644 --- a/magic/magic-docs/html/mirror.html +++ b/magic/magic-docs/html/mirror.html @@ -1,28 +1,10 @@ -- When you click the mouse in your picture with the "Mirror" - magic effect selected, the entire image will be reversed, - turning it into a mirror image. -
- -See also: Flip.
- - - + +When you click the mouse in your picture with the "Mirror" magic effect selected, the entire image will be reversed, turning it into a mirror image.
+See also: Flip
+ \ No newline at end of file diff --git a/magic/magic-docs/html/negative.html b/magic/magic-docs/html/negative.html index a4489d03f..90930b257 100644 --- a/magic/magic-docs/html/negative.html +++ b/magic/magic-docs/html/negative.html @@ -1,25 +1,9 @@ -- This inverts the colors wherever you drag the mouse. - (e.g., white becomes black, and vice versa.) -
- - - + +This inverts the colors wherever you drag the mouse. (e.g., white becomes black, and vice versa.)
+ \ No newline at end of file diff --git a/magic/magic-docs/html/rainbow.html b/magic/magic-docs/html/rainbow.html index cfe2919ce..d36ffe13f 100644 --- a/magic/magic-docs/html/rainbow.html +++ b/magic/magic-docs/html/rainbow.html @@ -1,25 +1,9 @@ -- This is similar to the paint brush, but as you move the mouse - around, it cycles through a spectrum of bright colors. -
- - - + +This is similar to the paint brush, but as you move the mouse around, it cycles through a spectrum of bright colors.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/ripples.html b/magic/magic-docs/html/ripples.html index 75ed1d991..0c8b870cf 100644 --- a/magic/magic-docs/html/ripples.html +++ b/magic/magic-docs/html/ripples.html @@ -1,24 +1,9 @@ --Click in your picture to make water ripple distortions appear over it. -
- - - + +Click in your picture to make water ripple distortions appear over it.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/shift.html b/magic/magic-docs/html/shift.html index 07fbbb2af..5261f0696 100644 --- a/magic/magic-docs/html/shift.html +++ b/magic/magic-docs/html/shift.html @@ -1,25 +1,9 @@ -- This shifts your picture around the canvas. Anything that gets - shifts off an edge reappears on the opposite edge. -
- - - + +This shifts your picture around the canvas. Anything that gets shifts off an edge reappears on the opposite edge.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/smudge.html b/magic/magic-docs/html/smudge.html index f8bb0326d..960412dbf 100644 --- a/magic/magic-docs/html/smudge.html +++ b/magic/magic-docs/html/smudge.html @@ -1,27 +1,9 @@ -- This pushes the colors around under the mouse, like finger painting - with wet paint. -
- -See also: Blur.
- - - + +This pushes the colors around under the mouse, like finger painting with wet paint.
+ \ No newline at end of file diff --git a/magic/magic-docs/html/tint.html b/magic/magic-docs/html/tint.html index bf019f407..51484b3d1 100644 --- a/magic/magic-docs/html/tint.html +++ b/magic/magic-docs/html/tint.html @@ -1,28 +1,10 @@ -- This changes the color (or hue) of the parts of the picture to - the selected color. -
- - - - - + +This changes the color (or hue) of the parts of the picture to the selected color.
+ + \ No newline at end of file diff --git a/magic/magic-docs/html/waves.html b/magic/magic-docs/html/waves.html index 6d3d32e13..30f40702a 100644 --- a/magic/magic-docs/html/waves.html +++ b/magic/magic-docs/html/waves.html @@ -1,26 +1,9 @@ --Click to make the entire picture wavy. 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. -
- - - + +Click to make the entire picture wavy. 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.
+ \ No newline at end of file diff --git a/magic/magic-docs/index.txt b/magic/magic-docs/index.txt new file mode 100644 index 000000000..2ed65c477 --- /dev/null +++ b/magic/magic-docs/index.txt @@ -0,0 +1,30 @@ + Tux Paint "Magic" Tool: List of Magic Tools + + * Blocks + * Blur + * Bricks + * Calligraphy + * Cartoon + * Chalk + * Darken + * Distortion + * Drip + * Emboss + * Fade + * Fill + * Flip + * Flower + * Foam + * Glass Tile + * Grass + * Kaleidoscope + * Light + * Metal Paint + * Mirror + * Negative + * Rainbow + * Ripples + * Shift + * Smudge + * Tint + * Waves diff --git a/magic/magic-docs/kaleidoscope.txt b/magic/magic-docs/kaleidoscope.txt new file mode 100644 index 000000000..0d408b76e --- /dev/null +++ b/magic/magic-docs/kaleidoscope.txt @@ -0,0 +1,7 @@ + Tux Paint "Magic" Tool: Kaleidoscope + + By Bill Kendrick...
). + + + 'see' is optional. It should be the name of another tool to link to + (same format as 'name'; it will be converted for use as a link). + + e.g. "Related Magic Tool" (will link to "relatedmagictool.html") + or array("Related One", "Related Two") + + + NOTE: If an image "ex_shortname.png" exists in html/images/, + it will be referred to in an".$t['desc']."
\n"; + + if (!empty($t['see'])) { + $out .= "See also: "; + if (is_array($t['see'])) { + foreach ($t['see'] as $s) { + $out .= "".$s." "; + } + } else { + $out .= "".$t['see'].""; + } + $out .= "
\n"; + } + + if (file_exists("../html/images/ex_".$shortname.".png")) { + $out .= "