From f09e17c3c564e8310125a10c03397cbf473ff643 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 1 Jul 2020 18:03:10 +0200 Subject: Remove $Id$ tags, update URL's, and more - remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers. --- misc/MacRoman_utf-8.txt | 6 ++-- misc/README.txt | 34 ++++++++----------- misc/abi-compliance-checker.txt | 74 ++++++++++++++++++++--------------------- misc/cp1252.html | 6 ++-- misc/cp1252.txt | 4 +-- misc/cp1252_utf-8.html | 6 ++-- misc/cp1252_utf-8.txt | 4 +-- misc/doxystar.cxx | 20 ++++------- misc/iso-8859-1.txt | 4 +-- misc/iso-8859-1_utf-8.txt | 4 +-- misc/lorem_ipsum.txt | 6 ++-- misc/update_config_scripts | 8 ++--- 12 files changed, 81 insertions(+), 95 deletions(-) (limited to 'misc') diff --git a/misc/MacRoman_utf-8.txt b/misc/MacRoman_utf-8.txt index 3b7f5ac7a..22cf29320 100644 --- a/misc/MacRoman_utf-8.txt +++ b/misc/MacRoman_utf-8.txt @@ -21,6 +21,6 @@ | 360 | 240 | F |  Ò Ú Û Ù ı ˆ ˜ ¯ ˘ ˙ ˚ ¸ ˝ ˛ ˇ | +-----+-----+---+-------------------------------------------------+ -File: MacRoman_utf-8.txt -Encoding: UTF-8 -Note: 0xF0 (MacRoman) = U+F8FF (Unicode) = Apple logo +File: MacRoman_utf-8.txt +Encoding: UTF-8 +Note: 0xF0 (MacRoman) = U+F8FF (Unicode) = Apple logo diff --git a/misc/README.txt b/misc/README.txt index 189aaf9b8..3b1c18070 100644 --- a/misc/README.txt +++ b/misc/README.txt @@ -1,6 +1,4 @@ // -// $Id$ -// // Miscellaneous files for developers: // @@ -53,7 +51,7 @@ Special Notes: I saw the same effect with other Windows editors as well. The following characters may be displayed "shifted left" by one position. Seems to work correctly on Linux (with UTF-8 encoding). - + Mac OS Roman: 0xF0 (U+F8FF: "Apple logo") may not be printable, depending on installed fonts on other systems. @@ -71,39 +69,35 @@ Files: The first two files are images of how it should look: - cp1252.png full Windows Codepage 1252 (Western) - MacRoman_utf-8.png full Mac OS Roman character set (w/o Apple logo) + cp1252.png full Windows Codepage 1252 (Western) + MacRoman_utf-8.png full Mac OS Roman character set (w/o Apple logo) The following four files contain the full Windows Codepage 1252: - cp1252.txt native (Windows) encoding, suitable for FLTK 1.1 - cp1252_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater - cp1252.html native (Windows) encoding, use with any browser - cp1252_utf-8.html UTF-8 encoding, use with any browser + cp1252.txt native (Windows) encoding, suitable for FLTK 1.1 + cp1252_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater + cp1252.html native (Windows) encoding, use with any browser + cp1252_utf-8.html UTF-8 encoding, use with any browser The following two files contain only the ISO-8859-1 subset: - iso-8859-1.txt native (Windows) encoding, suitable for FLTK 1.1 - iso-8859-1_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater + iso-8859-1.txt native (Windows) encoding, suitable for FLTK 1.1 + iso-8859-1_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater The following file contains the full Mac OS Roman character set: - MacRoman_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater - (use cp1252.txt with FLTK 1.1 on Mac OS instead) + MacRoman_utf-8.txt UTF-8 encoding, suitable for FLTK 1.3 and greater + (use cp1252.txt with FLTK 1.1 on Mac OS instead) Other developer support files: ================================================================================ - doxystar.cxx Use this to reformat doxygen comments (test only). + doxystar.cxx Use this to reformat doxygen comments (test only). - Compile with: g++ -o doxystar doxystar.cxx + Compile with: g++ -o doxystar doxystar.cxx - Usage: cat file | doxystar + Usage: cat file | doxystar DO NOT USE this for current code development! It is intended for testing of future code reformatting ! - -// -// End of $Id$. -// diff --git a/misc/abi-compliance-checker.txt b/misc/abi-compliance-checker.txt index 097daeedb..649878ecc 100644 --- a/misc/abi-compliance-checker.txt +++ b/misc/abi-compliance-checker.txt @@ -20,17 +20,17 @@ with the current version (1.3.5) before it will be released. (2) Use two different Git checkout (working) directories to build libs, for instance (as used in this example): - (new) /git/fltk-1.3 current version = 1.3.5 - (old) /git/fltk-1.3.4-1 previous version = 1.3.4-1 [1] + (new) /git/fltk-1.3 current version = 1.3.5 + (old) /git/fltk-1.3.4-1 previous version = 1.3.4-1 [1] [1] The second working directory can be created from the first - git working tree ( /git/fltk-1.3 ) with these commands: + git working tree ( /git/fltk-1.3 ) with these commands: - $ cd /git/fltk-1.3 - $ git worktree add /git/fltk-1.3.4-1 release-1.3.4-1 + $ cd /git/fltk-1.3 + $ git worktree add /git/fltk-1.3.4-1 release-1.3.4-1 - This creates the worktree in /git/fltk-1.3.4-1 and checks the - tag 'release-1.3.4-1' out. + This creates the worktree in /git/fltk-1.3.4-1 and checks the + tag 'release-1.3.4-1' out. (3) Create two xml descriptions to test library compatibility in @@ -94,31 +94,31 @@ with the current version (1.3.5) before it will be released. $ cd /git/workdir $ /git/abi-compliance-checker/abi-compliance-checker.pl \ -lib fltk -old fltk-1.3.4-1.xml -new fltk-1.3.5.xml - Preparing, please wait ... - Using GCC 7 (x86_64-linux-gnu, target: x86_64) - WARNING: May not work properly with GCC 4.8.[0-2], 6.* and higher - due to bug #78040 in GCC. Please try other GCC versions with the - help of --gcc-path=PATH option or create ABI dumps by ABI Dumper - tool instead to avoid using GCC. Test selected GCC version first - by -test option. - ------------------------------------------------------------------ - --> ignore warning (but run `abi-compliance-checker.pl -test') - ------------------------------------------------------------------ - Checking header(s) 1.3.4-1 ... - WARNING: can't find 'ctags' program - Checking header(s) 1.3.5 ... - WARNING: can't find 'ctags' program - ------------------------------------------------------------------ - --> ignore warning (or install 'ctags' and repeat) - ------------------------------------------------------------------ - Comparing ABIs ... - Comparing APIs ... - Creating compatibility report ... - Binary compatibility: 100% - Source compatibility: 100% - Total binary compatibility problems: 0, warnings: 0 - Total source compatibility problems: 0, warnings: 1 - Report: compat_reports/fltk/1.3.4-1_to_1.3.5/compat_report.html + Preparing, please wait ... + Using GCC 7 (x86_64-linux-gnu, target: x86_64) + WARNING: May not work properly with GCC 4.8.[0-2], 6.* and higher + due to bug #78040 in GCC. Please try other GCC versions with the + help of --gcc-path=PATH option or create ABI dumps by ABI Dumper + tool instead to avoid using GCC. Test selected GCC version first + by -test option. + ------------------------------------------------------------------ + --> ignore warning (but run `abi-compliance-checker.pl -test') + ------------------------------------------------------------------ + Checking header(s) 1.3.4-1 ... + WARNING: can't find 'ctags' program + Checking header(s) 1.3.5 ... + WARNING: can't find 'ctags' program + ------------------------------------------------------------------ + --> ignore warning (or install 'ctags' and repeat) + ------------------------------------------------------------------ + Comparing ABIs ... + Comparing APIs ... + Creating compatibility report ... + Binary compatibility: 100% + Source compatibility: 100% + Total binary compatibility problems: 0, warnings: 0 + Total source compatibility problems: 0, warnings: 1 + Report: compat_reports/fltk/1.3.4-1_to_1.3.5/compat_report.html (6) Check the generated report (last line above) with a browser: @@ -135,9 +135,9 @@ with the current version (1.3.5) before it will be released. (8) Done. -Note 1: The report as given above issued 100% ABI compatibility. The only - warning was the different patch version number. +Note 1: The report as given above issued 100% ABI compatibility. The only + warning was the different patch version number. -Note 2: There are other recommended methods to use abi-compliance-checker - together with abi-dumper, but this is not (yet) covered here (see - abi-compliance-checker documentation). +Note 2: There are other recommended methods to use abi-compliance-checker + together with abi-dumper, but this is not (yet) covered here (see + abi-compliance-checker documentation). diff --git a/misc/cp1252.html b/misc/cp1252.html index d844a002b..be5f418a5 100644 --- a/misc/cp1252.html +++ b/misc/cp1252.html @@ -30,9 +30,9 @@ | 360 | 240 | F | | +-----+-----+---+-------------------------------------------------+ -File: cp1252.html -Encoding: windows-1252 = Windows Code Page 1252 ("Western") -Meta tag: content='text/html; charset=windows-1252' +File: cp1252.html +Encoding: windows-1252 = Windows Code Page 1252 ("Western") +Meta tag: content='text/html; charset=windows-1252' diff --git a/misc/cp1252.txt b/misc/cp1252.txt index 1e08316a4..211d27fce 100644 --- a/misc/cp1252.txt +++ b/misc/cp1252.txt @@ -21,5 +21,5 @@ | 360 | 240 | F | | +-----+-----+---+-------------------------------------------------+ -File: cp1252.txt -Encoding: Windows CP 1252 (aka "ansi", western, ...) +File: cp1252.txt +Encoding: Windows CP 1252 (aka "ansi", western, ...) diff --git a/misc/cp1252_utf-8.html b/misc/cp1252_utf-8.html index 66e6e4595..08752eb1e 100644 --- a/misc/cp1252_utf-8.html +++ b/misc/cp1252_utf-8.html @@ -30,9 +30,9 @@ | 360 | 240 | F | ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ | +-----+-----+---+-------------------------------------------------+ -File: cp1252_utf-8.html -Encoding: UTF-8 -Meta tag: content='text/html; charset=UTF-8' +File: cp1252_utf-8.html +Encoding: UTF-8 +Meta tag: content='text/html; charset=UTF-8' diff --git a/misc/cp1252_utf-8.txt b/misc/cp1252_utf-8.txt index c42e6b89a..672015934 100644 --- a/misc/cp1252_utf-8.txt +++ b/misc/cp1252_utf-8.txt @@ -21,5 +21,5 @@ | 360 | 240 | F | ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ | +-----+-----+---+-------------------------------------------------+ -File: cp1252_utf-8.txt -Encoding: UTF-8 +File: cp1252_utf-8.txt +Encoding: UTF-8 diff --git a/misc/doxystar.cxx b/misc/doxystar.cxx index a73f46c85..3fa5c447b 100644 --- a/misc/doxystar.cxx +++ b/misc/doxystar.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Doxygen pre-formatting program for the Fast Light Tool Kit (FLTK). // // Copyright 2010 by Matthias Melcher. @@ -9,11 +7,11 @@ // the file "COPYING" which should have been included with this file. If this // file is missing or damaged, see the license at: // -// http://www.fltk.org/COPYING.php +// https://www.fltk.org/COPYING.php // -// Please report all bugs and problems on the following page: +// Please see the following page on how to report bugs and issues: // -// http://www.fltk.org/str.php +// https://www.fltk.org/bugs.php // #include @@ -38,7 +36,7 @@ int main(int argc, char **argv) { if (!fgets(linebuf, 1020, stdin)) break; // EOF or error switch (state) { case 0: // line start is source code - commentStart = strstr(linebuf, "/*"); + commentStart = strstr(linebuf, "/*"); if (commentStart) { // check if this comment spans multiple lines if (strstr(commentStart, "*/")==0) { @@ -48,7 +46,7 @@ int main(int argc, char **argv) { } else { state = 1; // regular multiline comment } - } else { + } else { // single line comment, do nothing } } @@ -64,13 +62,13 @@ int main(int argc, char **argv) { break; case 2: // line start is inside a doxygen multiline comment for (i=0; i