Change tool name references to lowercase

.gitignore

@@ -19,8 +19,8 @@ htmlcov
 autohintexe
 detype1
 makeotfexe
-mergeFonts
-rotateFont
+mergefonts
+rotatefont
 sfntdiff
 sfntedit
 spot

.travis.yml

@@ -39,18 +39,18 @@ matrix:
  - flake8 setup.py
  - flake8 Tests/*.py
  - pushd python/afdko
- - flake8 buildCFF2VF.py
- - flake8 buildMasterOTFs.py
- - flake8 CheckOutlinesUFO.py
- - flake8 ConvertFontToCID.py
- - flake8 FDKUtils.py
- - flake8 makeInstancesUFO.py
- - flake8 MakeOTF.py
- - flake8 otfPDF.py
+ - flake8 buildcff2vf.py
+ - flake8 buildmasterotfs.py
+ - flake8 checkoutlinesufo.py
+ - flake8 convertfonttocid.py
+ - flake8 fdkutils.py
+ - flake8 makeinstancesufo.py
+ - flake8 makeotf.py
+ - flake8 otfpdf.py
  - flake8 pdfmetrics.py
  - flake8 ttfcomponentizer.py
  - flake8 ttxn.py
- - flake8 ufoTools.py
+ - flake8 ufotools.py
  - popd
  - python setup.py bdist_wheel
  - deactivate

NEWS.md

@@ -827,11 +827,11 @@ complete list see:
  changes to the source code tree and build process, to make it easier
  to build the open source AFDKO. Unfortunately, the source code for
  the **IS** and **checkOutlines** programs cannot be open sourced.
-- \[tx/mergeFonts/rotateFonts\] Removed '-bc' option support, as
+- \[tx/mergeFonts/rotateFont\] Removed '-bc' option support, as
  this includes patents that cannot be shared in open source.
 - \[tx\] All tx-related tools now report when a font exceeds the max
  allowed subroutine recursion depth.
-- \[tx/mergeFonts/rotateFonts\] Added common options to all when
+- \[tx/mergeFonts/rotateFont\] Added common options to all when
  possible: all now support UFO and SVG fonts, the '-gx' option to
  exclude fonts, the '-std' option for cff output, and the '-b'
  option for cff output.

README.md

@@ -18,9 +18,9 @@ Please refer to the file
 [AFDKO-Overview.html](https://rawgit.com/adobe-type-tools/afdko/master/afdko/AFDKO-Overview.html)
 for a more detailed description of what is included in the package.
 
-Please see the 
+Please see the
 [wiki](https://github.com/adobe-type-tools/afdko/wiki)
-for additional information, such as links to reference materials and related 
+for additional information, such as links to reference materials and related
 projects.
 
 Major Changes
@@ -30,10 +30,10 @@ The AFDKO has been restructured so that it can be installed as a Python
 package. It now depends on the user\'s Python interpreter, and no longer
 contains its own Python interpreter. In order to do this, two
 Adobe-owned, non-open source programs were dropped: **IS** and
-**checkOutlines**. If these turn out to be sorely missed, an installer
+**checkoutlines**. If these turn out to be sorely missed, an installer
 for them will be added to the old Adobe AFDKO website. The current
-intent is to migrate the many tests in checkOutlines to the newer
-**checkOutlinesUFO** (which does work with OpenType and Type 1 fonts,
+intent is to migrate the many tests in checkoutlines to the newer
+**checkoutlinesufo** (which does work with OpenType and Type 1 fonts,
 but currently does only overlap detection and removal, and a few basic
 path checks).
 
@@ -117,7 +117,7 @@ environment variable in the System control panel.
 
 You can download older versions of the tools from the [Adobe AFDKO
 homepage](http://www.adobe.com/devnet/opentype/afdko.html). The tools IS
-and checkOutlines are included in these downloads.
+and checkoutlines are included in these downloads.
 
 Build from Source
 -----------------

c/buildall.cmd

@@ -21,12 +21,12 @@ echo "Building makeotf..."
 call %~dp0makeotf\build\win\vc10\BuildAll.cmd %1 || EXIT /B 1
 
 echo " "
-echo "Building mergeFonts..."
-call %~dp0mergeFonts\build\win\vc10\BuildAll.cmd %1 || EXIT /B 1
+echo "Building mergefonts..."
+call %~dp0mergefonts\build\win\vc10\BuildAll.cmd %1 || EXIT /B 1
 
 echo " "
-echo "Building rotateFont..."
-call %~dp0rotateFont\build\win\vc10\BuildAll.cmd %1 || EXIT /B 1
+echo "Building rotatefont..."
+call %~dp0rotatefont\build\win\vc10\BuildAll.cmd %1 || EXIT /B 1
 
 echo " "
 echo "Building sfntdiff..."

c/mergefonts/build/linux/gcc/BuildAll.sh

@@ -2,7 +2,7 @@
 set -e
 set -x
 
-target=mergeFonts
+target=mergefonts
 curdir=`pwd`
 
 if [ -z "$1" ] || [ $1 = "release" ]

c/mergefonts/build/linux/gcc/debug/Makefile

@@ -15,7 +15,7 @@ CFLAGS = $(STD_OPTS) -g
 # Program
 PRG_SRCS = $(SRC_DIR)/mergeFonts.c
 PRG_OBJS = mergeFonts.o
-PRG_TARGET = $(EXE_DIR)/mergeFonts
+PRG_TARGET = $(EXE_DIR)/mergefonts
 
 # Build targets
 TARGETS = $(PRG_TARGET)

c/mergefonts/build/linux/gcc/release/Makefile

@@ -15,7 +15,7 @@ CFLAGS = $(STD_OPTS)
 # Program
 PRG_SRCS = $(SRC_DIR)/mergeFonts.c
 PRG_OBJS = mergeFonts.o
-PRG_TARGET = $(EXE_DIR)/mergeFonts
+PRG_TARGET = $(EXE_DIR)/mergefonts
 
 # Build targets
 TARGETS = $(PRG_TARGET)

c/mergefonts/build/osx/xcode4/BuildAll.sh

@@ -2,7 +2,7 @@
 set -e
 set -x
 
-target=mergeFonts
+target=mergefonts
 
 if [ -z "$1" ] || [ "$1" == "release" ]
 then

c/mergefonts/source/help.h

@@ -1,7 +1,7 @@
-"mergeFonts Help\n",
+"mergefonts Help\n",
 "============\n",
-"mergeFonts [-cid cidfontinfo file ] [-hints] output-font-file [[glyph alias file] merge-font-file]+\n",
-"mergeFonts [-u] [-h]\n",
+"mergefonts [-cid cidfontinfo file ] [-hints] output-font-file [[glyph alias file] merge-font-file]+\n",
+"mergefonts [-u] [-h]\n",
 " \n",
 "This tool is based on the tx program. If the output file mode (e.g -cff, -t1,\n",
 "etc) specified, then it will behave exactly as does tx. Run the command 'tx -u\n",
@@ -22,7 +22,7 @@
 " through without modification.\n",
 "\n",
 "The first line of a glyph alias file is a header line, and must begin with\n",
-"'mergeFonts'; if not, the program will attempt to parse it as a font. The\n",
+"'mergefonts'; if not, the program will attempt to parse it as a font. The\n",
 "program name may be followed by optional fields for the PostScript name and\n",
 "Language group values. If present, both must be present. Each subsequent line\n",
 "must consist of a pair of glyph names: the source font glyph name in the right\n",
@@ -31,13 +31,13 @@
 "\n",
 "Example:\n",
 "--------------------------------------------\n",
-"mergeFonts LogocistStd-Medium 0\n",
+"mergefonts LogocistStd-Medium 0\n",
 "0 .notdef\n",
 "1 space\n",
 "--------------------------------------------\n",
 " \n",
 "Note that if the glyph alias files map glyph names to numeric values, the\n",
-"mergeFonts program will write the output font as a CID font, independent of\n",
+"mergefonts program will write the output font as a CID font, independent of\n",
 "whether the source fonts are CID-keyed or not.\n",
 "\n",
 "Note that the final output font must contain a .notdef; if glyph alias files are\n",

c/mergefonts/source/mergeFonts.c

@@ -3117,7 +3117,7 @@ static int t1_GlyphBeg(abfGlyphCallbacks *cb, abfGlyphInfo *info)
  txCtx h = cb->indirect_ctx;
  char gname[9];
 
- /* In mergeFonts, we do NOT skip a glyph if it has lready been seen: the same glyph may get copied
+ /* In mergeFonts, we do NOT skip a glyph if it has already been seen: the same glyph may get copied
  more than once to a different target font name.
  */
  if (h->t1w.fd == -1)
@@ -7230,7 +7230,7 @@ static void printVersions(txCtx h)
  char version_buf[MAX_VERSION_SIZE+1];
 
  printf("Versions:\n"
- " mergeFonts %s\n", CTL_SPLIT_VERSION(version_buf, MERGEFONTS_VERSION));
+ " mergefonts %s\n", CTL_SPLIT_VERSION(version_buf, MERGEFONTS_VERSION));
 
  cb.ctx = NULL;
  cb.called = 0;
@@ -8019,7 +8019,7 @@ static boolean readGlyphAliasFile(txCtx h, int fileIndex, char *filePath)
  return isGA;
  }
 
- if (strcmp(progName, "mergeFonts"))
+ if (strcmp(progName, "mergefonts"))
  {
  fclose(ga_fp);
  return isGA;

c/mergefonts/source/usage.h

@@ -1,12 +1,12 @@
-"mergeFonts [-cid cidfontinfo file ] [-hints] output-font-file [[glyph alias file] merge-font-file]+\n",
-"mergeFonts [-u] [-h]\n",
+"mergefonts [-cid cidfontinfo file ] [-hints] output-font-file [[glyph alias file] merge-font-file]+\n",
+"mergefonts [-u] [-h]\n",
 " \n",
 "This tool is based on the tx program. If the output file mode (e.g -cff, -t1,\n",
 "etc) specifed, then it will behave exactly as does tx. See 'tx -u' for more\n",
 "options, and 'tx -h' for details on these options.\n",
 " \n",
 "This tool will merge one or more source fonts into a single font. See\n",
-"'mergeFonts -h' for more details.\n",
+"'mergefonts -h' for more details.\n",
 "\n",
 "glyph alias file file containing a mapping from source font glyph names to\n",
 " ouput font names. Must preceed the font to which it applies. If present,\n",
@@ -40,7 +40,7 @@
 "The many other options behave just as do the options described by 'tx -u'.\n",
 "\n",
 "Example:\n",
-" mergeFonts -gx .notdef newFont.pfa srcFont1.pfa mapFile2.txt srcFont2.pfa\n",
+" mergefonts -gx .notdef newFont.pfa srcFont1.pfa mapFile2.txt srcFont2.pfa\n",
 " \n",
 "This command will create a new font file 'newFont.pfa'. This will contain all\n",
 "the glyphs except '.notdef' from srcFont1.pfa, and all the glyphs from\n",

c/rotatefont/build/linux/gcc/BuildAll.sh

@@ -2,7 +2,7 @@
 set -e
 set -x
 
-target=rotateFont
+target=rotatefont
 curdir=`pwd`
 
 if [ -z "$1" ] || [ $1 = "release" ]

c/rotatefont/build/linux/gcc/debug/Makefile

@@ -15,7 +15,7 @@ CFLAGS = $(STD_OPTS) -g
 # Program
 PRG_SRCS = $(SRC_DIR)/rotateFont.c
 PRG_OBJS = rotateFont.o
-PRG_TARGET = $(EXE_DIR)/rotateFont
+PRG_TARGET = $(EXE_DIR)/rotatefont
 
 # Build targets
 TARGETS = $(PRG_TARGET)

c/rotatefont/build/linux/gcc/release/Makefile

@@ -15,7 +15,7 @@ CFLAGS = $(STD_OPTS)
 # Program
 PRG_SRCS = $(SRC_DIR)/rotateFont.c
 PRG_OBJS = rotateFont.o
-PRG_TARGET = $(EXE_DIR)/rotateFont
+PRG_TARGET = $(EXE_DIR)/rotatefont
 
 # Build targets
 TARGETS = $(PRG_TARGET)

c/rotatefont/build/osx/xcode4/BuildAll.sh

@@ -2,7 +2,7 @@
 set -e
 set -x
 
-target=rotateFont
+target=rotatefont
 
 if [ -z "$1" ] || [ "$1" == "release" ]
 then

c/rotatefont/build/win/vc10/BuildAll.cmd

@@ -1,6 +1,6 @@
 cd %~dp0
 setlocal enabledelayedexpansion
-set targetProgram=rotateFont
+set targetProgram=rotatefont
 set VCPATH="C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe"
 
 set do_release=0
@@ -33,5 +33,5 @@ if "%1"=="clean" (
  set do_target=1
 )
 if %do_target%==0 (
- echo "Build target must be 'release', 'debug', 'clean', or simply omitted (same as 'release')" 
+ echo "Build target must be 'release', 'debug', 'clean', or simply omitted (same as 'release')"
 )

c/rotatefont/source/help.h

@@ -1,14 +1,14 @@
-"rotateFont Help\n",
+"rotatefont Help\n",
 "============\n",
-"rotateFont {[mode][mode options][rotation options][shared options][files]}*\n",
-"rotateFont [other options]\n",
+"rotatefont {[mode][mode options][rotation options][shared options][files]}*\n",
+"rotatefont [other options]\n",
 "\n",
 "This program is based on the 'tx' program. Without the rotation options, this\n",
-"program behaves exactly like the tx program. See 'rotateFont -u' for a list of\n",
-"rotateFont-specific options, 'tx -u' for a list of all the other options. The\n",
+"program behaves exactly like the tx program. See 'rotatefont -u' for a list of\n",
+"rotatefont-specific options, 'tx -u' for a list of all the other options. The\n",
 "command 'tx -h' will give the full 'tx' help on the tx options.\n",
 "\n",
-"rotateFont applies a Postscript transform matrix to the source font files. The\n",
+"rotatefont applies a Postscript transform matrix to the source font files. The\n",
 "transform can be specified either directly with the -matrix argument with all\n",
 "six matrix values, or indirectly by specifying the -rt option with three values:\n",
 "the number of degrees clockwise and the x and y offsets. Note that if the\n",

c/rotatefont/source/rotateFont.c

@@ -6556,7 +6556,7 @@ static void printVersions(txCtx h)
  char version_buf[MAX_VERSION_SIZE];
 
  printf("Versions:\n"
- " rotateFont %s\n", CTL_SPLIT_VERSION(version_buf, ROTATE_VERSION));
+ " rotatefont %s\n", CTL_SPLIT_VERSION(version_buf, ROTATE_VERSION));
 
  cb.ctx = NULL;
  cb.called = 0;

c/rotatefont/source/usage.h

@@ -1,13 +1,13 @@
 
-"rotateFont {[mode][mode options][rotation options][shared options][files]}*\n",
-"rotateFont [other options]\n",
+"rotatefont {[mode][mode options][rotation options][shared options][files]}*\n",
+"rotatefont [other options]\n",
 "\n",
 "This program is based on the 'tx' program. Without the rotation options, this\n",
 "program behaves exactly like the tx program. See 'tx -u' for a list of all\n",
 "options, and 'tx -h' for a discussion of how to use them.\n",
 "\n",
 "You must use the '-t1' or '-cff' mode setting arguments before any\n",
-"other rotateFont options.\n",
+"other rotatefont options.\n",
 "\n",
 "[rotation options]\n",
 "\n",
@@ -28,7 +28,7 @@
 "offsets and advance widths for specific glyphs. Also, when this file is\n",
 "specified, only the glyphs listed in the file will be written to the output\n",
 "font. Note that the '.notdef' glyph must always be specified, as it is required\n",
-"for an output font. See 'rotateFont -h' for the format of this file.\n",
+"for an output font. See 'rotatefont -h' for the format of this file.\n",
 "Note that when the '-rtf' option is used, x and y offsets specified with the\n",
 "'-rt' option are ignored.\n",
 "\n",

docs/AFDKO-Overview.md

@@ -21,31 +21,31 @@ The tools fall into several different functional groups.
 
 This program is the Adobe auto-hinter. It can be applied to both OpenType/CFF and Type 1 fonts. Works with Type 1 and OpenType/CFF fonts only. It uses Just von Rossum's fontTools Python package for accessing and changing the font data.
 
-### makeOTF
+### makeotf
 
 This program will build an OpenType/CFF font from a feature file that defines the OpenType layout rules, and overrides for default values, and a font file: a Type 1 font, TrueType font, 'detype1' text version of a Type 1 font, or UFO font and It also requires some other meta-data files. It will also build an OpenType/TTF font from a TrueType source font file.
 
-### makeInstances
+### makeinstances
 
-This script will generate Type 1 fonts from an MM Type 1 font, using a tab-delimited file to set values in the instances. The Adoeb developers now use makeInstancesUFO, but this version is still supported.
+This script will generate Type 1 fonts from an MM Type 1 font, using a tab-delimited file to set values in the instances. The Adobe developers now use makeinstancesufo, but this version is still supported.
 
-### makeInstancesUFO
+### makeinstancesufo
 
 This script will generate UFO fonts from a set of Superpolator master designs.
 
-### mergeFonts
+### mergefonts
 
 This program will merge glyphs from one font into another, optionally copying a subset from the source fonts, and changing the names of the glyphs. It can also be used to subset and change the glyph names in a font. By using the same font more than once as a source with different mapping files, glyphs can be duplicated under other names. It can also convert a named-keyed font to a CID-keyed font.
 
-### rotateFont
+### rotatefont
 
 This tool will rotate and translate glyphs in a font, including the hints. However, hints will be discarded if the rotation is not a multiple of 90 degrees.
 
 ### sfntedit
 
 This allows you to cut and past the entire binary block of a font table from one font to another. You do this by first using it on a source font with the "-x" option to copy a table from the source font to a separate file, and then using it with the "-a" option to add that table to a target font. It can also be used to simply delete a table, and to fix the font table checksums.
 
-### stemHist
+### stemhist
 
 This program provides reports which help in selecting the global hint data and alignment zones for Type 1 hinting. You should look at the reports from this tool in order to select the most common stem widths, and then use a program such as FontLab or Robofont to set the values in the font. This should be done before hinting the font. Works with Type 1 and OpenType/CFF fonts only.
 
@@ -107,11 +107,11 @@ Note that the tools ending in "plot" are all simply small command-file scripts t
 
 The auto-hinting program will report at length about hinting issues. Some of these you can ignore, such as reports about near misses when a stem could be controlled by a hint-zone but is just a little too wide or too narrow. By adjusting either the stem widths or the hint-zones according to these reports, you can include more stems in the set that are controlled by hints, but you can also reasonably decide that is not worth the effort. However, many complaints do need fixing, such not having nodes at vertical or horizontal extremes of a curve.
 
-### checkOutlinesUFO
+### checkoutlinesufo
 
 This tool will check the quality of the glyph outline data, and should always be used. It is very good at detecting serious problems, such as overlap and incorrect path direction. It is overly enthusiastic about finding a number of smaller issues, but is right often enough to be worth checking all the error messages. It can also fix the problems it finds, but you should always check any glyphs that it changed - the fixes are not always better than the original problem.
 
-### compareFamily
+### comparefamily
 
 The tool examines all the fonts in a directory and runs many quality checks. It is the only tool which checks consistency and compares data across a family of fonts, as well as in a single font. It will point out any errors in naming within a style-linked group. Every time the Adobe Type Department finds a bug in the Adobe OpenType fonts, we try to put a check in here. It is not a complete validation tool, but it does represents several years of experience of mistakes made by typographers.
 

docs/FDK Build Notes.txt

@@ -27,7 +27,7 @@ with sub-directories for build/ and lib/ being the same as for the program build
 
 Special cases.
 
-tx, mergeFonts, and rotateFonts share a common set of libraries and resource files. These libraries are grouped under the public directory in:
+tx, mergefonts, and rotatefont share a common set of libraries and resource files. These libraries are grouped under the public directory in:
 afdko/c/public/lib/
  build/
  lib/