Remove files

2023-03-10 18:45:39 +01:00 · 2023-03-10 18:45:39 +01:00 · cd5bd77f9f
commit cd5bd77f9f
parent 03192865cc
2880 changed files with 0 additions and 8951 deletions
--- a/cygwin/Install.cmd
+++ b/cygwin/Install.cmd
@ -1,47 +0,0 @@
-@echo off
-
-set VERSION=8.4-dev
-echo.
-echo  #######################################
-echo  # Welcome to ks-tools installer %VERSION% #
-echo  #######################################
-echo.
-echo  - This installer simply creates a shortcut to the 
-echo    application on your desktop. We recommend that 
-echo    before continuing, make sure you have left the 
-echo    application folder in a place where no one can 
-echo    delete it.
-echo.
-echo    Examples: 
-echo        - C:\ks-tools
-echo        - C:\Program Files\ks-tools
-echo.
-echo  * Press ENTER to continue or Ctrl+C to exit
-pause > nul
-echo.
-echo  * Creating shortchut (%USERPROFILE%\Desktop\ks-tools.lnk)
-set SCRIPT="%TEMP%\%RANDOM%-%RANDOM%.vbs"
-echo Set oWS = WScript.CreateObject("WScript.Shell") >> %SCRIPT%
-echo sLinkFile = "%USERPROFILE%\Desktop\ks-tools.lnk" >> %SCRIPT%
-echo Set oLink = oWS.CreateShortcut(sLinkFile) >> %SCRIPT%
-echo oLink.TargetPath = "%~d0%~p0\ks-tools.cmd" >> %SCRIPT%
-echo oLink.WorkingDirectory = "%~d0%~p0" >> %SCRIPT%
-echo oLink.IconLocation = "%~d0%~p0\prompt\ks-tools.ico" >> %SCRIPT%
-echo oLink.Save >> %SCRIPT%
-cscript /nologo %SCRIPT%
-del %SCRIPT%
-rem echo  * Creating shortchut (%USERPROFILE%\Desktop\ks-tools (ZUI).lnk)
-rem set SCRIPT="%TEMP%\%RANDOM%-%RANDOM%.vbs"
-rem echo Set oWS = WScript.CreateObject("WScript.Shell") >> %SCRIPT%
-rem echo sLinkFile = "%USERPROFILE%\Desktop\ks-tools (ZUI).lnk" >> %SCRIPT%
-rem echo Set oLink = oWS.CreateShortcut(sLinkFile) >> %SCRIPT%
-rem echo oLink.TargetPath = "%~d0%~p0\ks-tools-zui.cmd" >> %SCRIPT%
-rem echo oLink.WorkingDirectory = "%~d0%~p0" >> %SCRIPT%
-rem echo oLink.IconLocation = "%~d0%~p0\prompt\ks-tools.ico" >> %SCRIPT%
-rem echo oLink.Save >> %SCRIPT%
-rem cscript /nologo %SCRIPT%
-rem del %SCRIPT%
-echo.
-echo  * Shortcuts created!
-echo.
-pause
--- a/cygwin/bin/files-here.txt
+++ b/cygwin/bin/files-here.txt
@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Copy necessary tools for Cygwin/Windows version
-# After, you must copy all files to /bin directory
-mkdir -p ${HOME}/ks-tools/bin/
-cd /usr/bin
-
-# All executables
-
-list_binary="bash cat clear cut cygwin-console-helper date echo expr ffmpeg ffprobe find grep head ls md5sum mkdir mv cp rm rsync scp sed sleep ssh-add ssh-agent ssh-keygen ssh-keyscan ssh sshpass tail tr wc pwd mintty file ldd touch nano chmod chown make"
-
-echo "* Copying script bashbug"
-cp -rfv /usr/bin/bashbug ${HOME}/ks-tools/bin/  
-for binary in ${list_binary} ; do
-  echo "* Copying binary ${binary}"
-  cp -rfv /usr/bin/${binary}.exe ${HOME}/ks-tools/bin/
-  echo "* Searching dependencies for ${binary}"
-  ldd /usr/bin/${binary}.exe | grep "/bin/" | cut -d ">" -f 2 | cut -d "(" -f 1 | tr -s " " > /tmp/deps.txt
-  file_size=$(cat /tmp/deps.txt | wc -l)
-  file_scan=1
-  echo "* Copying dependencies for ${binary}"
-  while [ ${file_scan} -le ${file_size} ] ; do
-    library=$(cat /tmp/deps.txt | head -${file_scan} | tail -1)
-    cp -rfv ${library} ${HOME}/ks-tools/bin/
-    file_scan=$(expr ${file_scan} + 1)
-  done
-done
-strip --strip-all ${HOME}/ks-tools/bin/*
-cp -rfv /usr/bin/cyggcc_s-*.dll ${HOME}/ks-tools/bin/
-cp -rfv /usr/bin/cygwin1.dll ${HOME}/ks-tools/bin/
-cp -rfv /usr/bin/cygz.dll ${HOME}/ks-tools/bin/
-
-# Finally, copy ks-tools scripts here.
--- a/cygwin/home/home-here
+++ b/cygwin/home/home-here
--- a/cygwin/ks-tools-cmd.cmd
+++ b/cygwin/ks-tools-cmd.cmd
@ -1,21 +0,0 @@
-@echo off
-
-rem ######################################
-rem # ks-tools for Windows               #
-rem # U. Modificacion: 04-02-2022        #
-rem # Author: q3aql                      #
-rem # Contact: q3aql@duck.com            #
-rem # License: GPL v2.0                  #
-rem ######################################
-set VERSION=8.4-dev
-
-rem # Start ks-tools terminal (bash)
-cd "%~d0%~p0"
-mkdir home\%USERNAME%
-mkdir tmp
-copy /Y prompt\.bashrc home\%USERNAME%
-copy /Y prompt\.minttyrc home\%USERNAME%
-cls
-set PATH=%PATH%;%~d0%~p0\bin
-bin\bash.exe
-rem bash
--- a/cygwin/ks-tools.cmd
+++ b/cygwin/ks-tools.cmd
@ -1,21 +0,0 @@
-@echo off
-
-rem ######################################
-rem # ks-tools for Windows               #
-rem # U. Modificacion: 04-02-2022        #
-rem # Author: q3aql                      #
-rem # Contact: q3aql@duck.com            #
-rem # License: GPL v2.0                  #
-rem ######################################
-set VERSION=8.4-dev
-
-rem # Start ks-tools terminal (bash)
-cd "%~d0%~p0"
-mkdir home\%USERNAME%
-mkdir tmp
-copy /Y prompt\.bashrc home\%USERNAME%
-copy /Y prompt\.minttyrc home\%USERNAME%
-cls
-set PATH=%PATH%;%~d0%~p0\bin
-bin\mintty.exe
-rem bash
--- a/cygwin/prompt/.bashrc
+++ b/cygwin/prompt/.bashrc
@ -1,210 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]ks-tools\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}ks-tools:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]ks-tools: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-# List of alias
-alias cat="/usr/bin/cat"
-alias clear="/usr/bin/clear"
-alias cut="/usr/bin/cut"
-alias date="/usr/bin/date"
-alias echo="/usr/bin/echo"
-alias expr="/usr/bin/expr"
-alias ffmpeg="/usr/bin/ffmpeg"
-alias ffplay="/usr/bin/ffplay"
-alias ffprobe="/usr/bin/ffprobe"
-alias file="/usr/bin/file"
-alias find="/usr/bin/find"
-alias ftp="/usr/bin/ftp"
-alias grep="/usr/bin/grep"
-alias head="/usr/bin/head"
-alias ldd="/usr/bin/ldd"
-alias ls="/usr/bin/ls"
-alias md5sum="/usr/bin/md5sum"
-alias mintty="/usr/bin/mintty"
-alias mkdir="/usr/bin/mkdir"
-alias mv="/usr/bin/mv"
-alias pwd="/usr/bin/pwd"
-alias rm="/usr/bin/rm"
-alias rsync="/usr/bin/rsync"
-alias scp="/usr/bin/scp"
-alias sed="/usr/bin/sed"
-alias sleep="/usr/bin/sleep"
-alias ssh-add="/usr/bin/ssh-add"
-alias ssh-agent="/usr/bin/ssh-agent"
-alias ssh-keygen="/usr/bin/ssh-keygen"
-alias ssh-keyscan="/usr/bin/ssh-keyscan"
-alias ssh="/usr/bin/ssh"
-alias sshpass="/usr/bin/sshpass"
-alias tail="/usr/bin/tail"
-alias touch="/usr/bin/touch"
-alias tr="/usr/bin/tr"
-alias wc="/usr/bin/wc"
-alias x264="/usr/bin/x264"
-alias zenity="/usr/bin/zenity"
-alias all-commands='ls /bin | grep ".exe" | cut -d "." -f 1'
-
-# List of alias for drives:
-alias A:="/cygdrive/a"
-alias B:="/cygdrive/b"
-alias C:="/cygdrive/c"
-alias D:="/cygdrive/d"
-alias E:="/cygdrive/e"
-alias F:="/cygdrive/f"
-alias G:="/cygdrive/g"
-alias H:="/cygdrive/h"
-alias I:="/cygdrive/i"
-alias J:="/cygdrive/j"
-alias K:="/cygdrive/k"
-alias L:="/cygdrive/l"
-alias M:="/cygdrive/m"
-alias N:="/cygdrive/n"
-alias O:="/cygdrive/o"
-alias P:="/cygdrive/p"
-alias Q:="/cygdrive/q"
-alias R:="/cygdrive/r"
-alias S:="/cygdrive/s"
-alias T:="/cygdrive/t"
-alias U:="/cygdrive/u"
-alias V:="/cygdrive/v"
-alias W:="/cygdrive/w"
-alias X:="/cygdrive/x"
-alias Y:="/cygdrive/y"
-alias Z:="/cygdrive/z"
-
-
-# Show menu of ks-tools
-echo ""
-echo " #######################################"
-echo " # ks-tools 8.3.1 (for Windows/Cygwin) #"
-echo " #######################################"
-echo ""
-echo " * Note:"
-echo "   - C: is /cygdrive/c"
-echo "      Example: cd /cygdrive/c/Users/Default/Desktop"
-echo ""
-echo " * Available commands:"
-echo ""
-echo "  - ks-upv   - ks-crop"
-echo "  - ks-upa   - ks-oga"
-echo "  - ks-upf   - ks-oga-album"
-echo "  - ks-upr   - ks-mp4-wrapper"
-echo "  - ks-mp4   - ks-avi-wrapper"
-echo "  - ks-mp4k  - ks-vob-wrapper"
-echo "  - ks-mp4s  - ks-mp4k-wrapper"
-echo "  - ks-mix   - ks-mp4s-wrapper"
-echo "  - ks-avi   - ks-mp4s-folder"
-echo "  - ks-mp3   - ks-mp3-album"
-echo "  - ks-vob   - ks-conf"
-echo ""
-echo " * Type 'all-commands' for show all commands."
-echo ""
--- a/cygwin/prompt/.minttyrc
+++ b/cygwin/prompt/.minttyrc
@ -1,4 +0,0 @@
-Font=Consolas
-FontHeight=11
-Columns=120
-Rows=27
--- a/cygwin/prompt/ks-tools-zui.cmd.disabled
+++ b/cygwin/prompt/ks-tools-zui.cmd.disabled
@ -1,19 +0,0 @@
-@echo off
-
-rem ######################################
-rem # ks-tools for Windows               #
-rem # U. Modificacion: 04-02-2022        #
-rem # Author: q3aql                      #
-rem # Contact: q3aql@duck.com            #
-rem # License: GPL v2.0                  #
-rem ######################################
-set VERSION=8.3.1
-
-rem # Start ks-tools ZUI (bash)
-mkdir home\%USERNAME%
-mkdir tmp
-copy /Y prompt\.bashrc home\%USERNAME%
-copy /Y prompt\.minttyrc home\%USERNAME%
-cls
-set PATH=%PATH%;%~d0%~p0\bin
-bin\bash.exe bin\ks-zui
--- a/cygwin/prompt/ks-tools.ico
+++ b/cygwin/prompt/ks-tools.ico
--- a/cygwin/prompt/ks-tools.png
+++ b/cygwin/prompt/ks-tools.png
--- a/cygwin/prompt/ks-zui.disabled
+++ b/cygwin/prompt/ks-zui.disabled
@ -1,380 +0,0 @@
-#!/bin/bash
-
-#################################################################
-# ks-zui (ks-tools) - Simple zenity user interface for ks-tools #
-# Date: 04-02-2022                                              #
-# Author: q3aql                                                 #
-# Contact: q3aql@duck.com                                       #
-#################################################################
-VERSION="8.3.1 (BETA)"
-M_DATE="040222"
-
-# Function to show about
-function showAbout() {
-  /usr/bin/zenity --title "About" --info --width=330 \
-  --text "Software: ks-zui (ks-tools) ${VERSION} \
-  (${M_DATE})\nAuthor: q3aql\nContact: q3aql@protonmail.ch\nLicense: GPL v2.0"
-}
-
-# Function to show information of video file
-# Sintax: showVideoInfo
-function showVideoInfo() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  ks-mp4-wrapper --show-info "${videoFile}"
-  echo -n "Press ENTER to continue " ; read null
-}
-
-# Function to convert MP4 with subs
-# Sintax: convertMP4WithSub
-function convertMP4WithSub() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  # Detect configuration
-  if [ -z "${videoFile}" ] ; then
-    echo null > /dev/null
-  else
-    videoTrackDefault=$(ks-mp4-wrapper --show-video-default "${videoFile}")
-    audioTrackDefault=$(ks-mp4-wrapper --show-audio-default "${videoFile}")
-    subtitleTrackDefault=$(ks-mp4-wrapper --show-subtitle-default "${videoFile}")
-    resolutionDefault=$(ks-mp4-wrapper --show-resolution-default)
-    nameDefault=$(ks-mp4-wrapper --show-name-title-default "${videoFile}")
-    yearDefault=$(ks-mp4-wrapper --show-year-default)
-    genreDefault=$(ks-mp4-wrapper --show-genre-default)
-    # Ask the configuration
-    videoTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the video track to map:     " --entry-text "${videoTrackDefault}")
-    audioTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the audio track to map:     " --entry-text "${audioTrackDefault}")
-    subtitleTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the subtitle track to map:  " --entry-text "${subtitleTrackDefault}")
-    resolution=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the resolution:             " --entry-text "${resolutionDefault}")
-    nameVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the name title:       " --entry-text "${nameDefault}")
-    yearVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the year:             " --entry-text "${yearDefault}")
-    genreVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the genre:            " --entry-text "${genreDefault}")
-    # Disable on Cygwin
-    #mkdir -p ${HOME}/Conv
-    #outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    #--text "Enter the path of ouput file prefix:       " --entry-text "${HOME}/Conv/Default")
-    # Enable on Cygwin
-    mkdir -p /cygdrive/c/Conv
-    outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-      --text "Enter the path of ouput file prefix:       " --entry-text "/cygdrive/c/Conv/Default")
-    /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-    --ok-label="Yes" --width=320 --text "Do you want apply '-thread_queue_size 2048' patch?"
-    outputPath=$?
-    if [ ${outputPath} -eq 0 ] ; then
-      ks-mp4-wrapper --conv-with-sub "${videoFile}" "${outputFile}" ${videoTrack} ${audioTrack} \
-      ${subtitleTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo} patch
-    else
-      ks-mp4-wrapper --conv-with-sub "${videoFile}" "${outputFile}" ${videoTrack} ${audioTrack} \
-      ${subtitleTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo}
-    fi
-    echo ""
-    echo -n "Press ENTER to continue " ; read null
-  fi
-}
-
-# Function to convert MP4
-# Sintax: convertMP4
-function convertMP4() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  # Detect configuration
-  if [ -z "${videoFile}" ] ; then
-    echo null > /dev/null
-  else
-    videoTrackDefault=$(ks-mp4-wrapper --show-video-default "${videoFile}")
-    audioTrackDefault=$(ks-mp4-wrapper --show-audio-default "${videoFile}")
-    resolutionDefault=$(ks-mp4-wrapper --show-resolution-default)
-    nameDefault=$(ks-mp4-wrapper --show-name-title-default "${videoFile}")
-    yearDefault=$(ks-mp4-wrapper --show-year-default)
-    genreDefault=$(ks-mp4-wrapper --show-genre-default)
-    # Ask the configuration
-    videoTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the video track to map:     " --entry-text "${videoTrackDefault}")
-    audioTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the audio track to map:     " --entry-text "${audioTrackDefault}")
-    resolution=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the resolution:             " --entry-text "${resolutionDefault}")
-    nameVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the name title:       " --entry-text "${nameDefault}")
-    yearVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the year:             " --entry-text "${yearDefault}")
-    genreVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the genre:            " --entry-text "${genreDefault}")
-    # Disable on Cygwin
-    #mkdir -p ${HOME}/Conv
-    #outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    #--text "Enter the path of ouput file prefix:       " --entry-text "${HOME}/Conv/Default")
-    # Enable on Cygwin
-    mkdir -p /cygdrive/c/Conv
-    outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-      --text "Enter the path of ouput file prefix:       " --entry-text "/cygdrive/c/Conv/Default")
-    /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-    --ok-label="Yes" --width=320 --text "Do you want apply '-thread_queue_size 2048' patch?"
-    outputPath=$?
-    if [ ${outputPath} -eq 0 ] ; then
-      ks-mp4-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo} patch
-    else
-      ks-mp4-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo}
-    fi
-    echo ""
-    echo -n "Press ENTER to continue " ; read null
-  fi
-}
-
-# Function to convert AVI with subs
-# Sintax: convertAVIWithSub
-function convertAVIWithSub() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  # Detect configuration
-  if [ -z "${videoFile}" ] ; then
-    echo null > /dev/null
-  else
-    videoTrackDefault=$(ks-avi-wrapper --show-video-default "${videoFile}")
-    audioTrackDefault=$(ks-avi-wrapper --show-audio-default "${videoFile}")
-    subtitleTrackDefault=$(ks-avi-wrapper --show-subtitle-default "${videoFile}")
-    resolutionDefault=$(ks-avi-wrapper --show-resolution-default)
-    nameDefault=$(ks-avi-wrapper --show-name-title-default "${videoFile}")
-    yearDefault=$(ks-avi-wrapper --show-year-default)
-    genreDefault=$(ks-avi-wrapper --show-genre-default)
-    # Ask the configuration
-    videoTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the video track to map:     " --entry-text "${videoTrackDefault}")
-    audioTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the audio track to map:     " --entry-text "${audioTrackDefault}")
-    subtitleTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the subtitle track to map:  " --entry-text "${subtitleTrackDefault}")
-    resolution=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the resolution:             " --entry-text "${resolutionDefault}")
-    nameVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the name title:       " --entry-text "${nameDefault}")
-    yearVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the year:             " --entry-text "${yearDefault}")
-    genreVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the genre:            " --entry-text "${genreDefault}")
-    # Disable on Cygwin
-    #mkdir -p ${HOME}/Conv
-    #outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    #--text "Enter the path of ouput file prefix:       " --entry-text "${HOME}/Conv/Default")
-    # Enable on Cygwin
-    mkdir -p /cygdrive/c/Conv
-    outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-      --text "Enter the path of ouput file prefix:       " --entry-text "/cygdrive/c/Conv/Default")
-    /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-    --ok-label="Yes" --width=320 --text "Do you want apply '-thread_queue_size 2048' patch?"
-    outputPath=$?
-    if [ ${outputPath} -eq 0 ] ; then
-      ks-avi-wrapper --conv-with-sub "${videoFile}" "${outputFile}" ${videoTrack} ${audioTrack} \
-      ${subtitleTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo} patch
-    else
-      ks-avi-wrapper --conv-with-sub "${videoFile}" "${outputFile}" ${videoTrack} ${audioTrack} \
-      ${subtitleTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo}
-    fi
-    echo ""
-    echo -n "Press ENTER to continue " ; read null
-  fi
-}
-
-# Function to convert AVI
-# Sintax: convertAVIW
-function convertAVI() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  # Detect configuration
-  if [ -z "${videoFile}" ] ; then
-    echo null > /dev/null
-  else
-    videoTrackDefault=$(ks-avi-wrapper --show-video-default "${videoFile}")
-    audioTrackDefault=$(ks-avi-wrapper --show-audio-default "${videoFile}")
-    resolutionDefault=$(ks-avi-wrapper --show-resolution-default)
-    nameDefault=$(ks-avi-wrapper --show-name-title-default "${videoFile}")
-    yearDefault=$(ks-avi-wrapper --show-year-default)
-    genreDefault=$(ks-avi-wrapper --show-genre-default)
-    # Ask the configuration
-    videoTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the video track to map:     " --entry-text "${videoTrackDefault}")
-    audioTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the audio track to map:     " --entry-text "${audioTrackDefault}")
-    resolution=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the resolution:             " --entry-text "${resolutionDefault}")
-    nameVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the name title:       " --entry-text "${nameDefault}")
-    yearVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the year:             " --entry-text "${yearDefault}")
-    genreVideo=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "[METADATA] Enter the genre:            " --entry-text "${genreDefault}")
-    # Disable on Cygwin
-    #mkdir -p ${HOME}/Conv
-    #outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    #--text "Enter the path of ouput file prefix:       " --entry-text "${HOME}/Conv/Default")
-    # Enable on Cygwin
-    mkdir -p /cygdrive/c/Conv
-    outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-      --text "Enter the path of ouput file prefix:       " --entry-text "/cygdrive/c/Conv/Default")
-    /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-    --ok-label="Yes" --width=320 --text "Do you want apply '-thread_queue_size 2048' patch?"
-    outputPath=$?
-    if [ ${outputPath} -eq 0 ] ; then
-      ks-avi-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo} patch
-    else
-      ks-avi-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo}
-    fi
-    echo ""
-    echo -n "Press ENTER to continue " ; read null
-  fi
-}
-
-# Function to convert VOB
-# Sintax: convertVOB
-function convertVOB() {
-  videoFile=$(/usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE}) \
-  | Select the video file" --file-selection)
-  # Enable in Cygwin
-  videoFile=$(cygwin-path -c "${videoFile}")
-  # Detect configuration
-  if [ -z "${videoFile}" ] ; then
-    echo null > /dev/null
-  else
-    videoTrackDefault=$(ks-vob-wrapper --show-video-default "${videoFile}")
-    audioTrackDefault=$(ks-vob-wrapper --show-audio-default "${videoFile}")
-    resolutionDefault=$(ks-vob-wrapper --show-resolution-default)
-    # Ask the configuration
-    videoTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the video track to map:     " --entry-text "${videoTrackDefault}")
-    audioTrack=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the audio track to map:     " --entry-text "${audioTrackDefault}")
-    resolution=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    --text "Enter the resolution:             " --entry-text "${resolutionDefault}")
-    # Disable on Cygwin
-    #mkdir -p ${HOME}/Conv
-    #outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-    #--text "Enter the path of ouput file prefix:       " --entry-text "${HOME}/Conv/Default")
-    # Enable on Cygwin
-    mkdir -p /cygdrive/c/Conv
-    outputFile=$(/usr/bin/zenity --entry --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" \
-      --text "Enter the path of ouput file prefix:       " --entry-text "/cygdrive/c/Conv/Default")
-    /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-    --ok-label="Yes" --width=320 --text "Do you want apply '-thread_queue_size 2048' patch?"
-    outputPath=$?
-    if [ ${outputPath} -eq 0 ] ; then
-      ks-vob-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} patch
-    else
-      ks-vob-wrapper --conv "${videoFile}" "${outputFile}" ${videoTrack} \
-      ${audioTrack} ${resolution} "${nameVideo}" ${yearVideo} ${genreVideo}
-    fi
-    echo ""
-    echo -n "Press ENTER to continue " ; read null
-  fi
-}
-
-# Choose subtitles in MP4 convert
-function subtitlesMP4() {
-  /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-  --ok-label="Yes" --width=320 --text "Do you want enable subtitles?"
-  outputPath=$?
-  if [ ${outputPath} -eq 0 ] ; then
-    convertMP4WithSub
-  else
-    convertMP4
-  fi
-}
-
-# Choose subtitles in AVI convert
-function subtitlesAVI() {
-  /usr/bin/zenity --question --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --cancel-label="No" \
-  --ok-label="Yes" --width=320 --text "Do you want enable subtitles?"
-  outputPath=$?
-  if [ ${outputPath} -eq 0 ] ; then
-    convertAVIWithSub
-  else
-    convertAVI
-  fi
-}
-
-# Show main menu
-echo ""
-echo "* Starting ks-zui (ks-tools) ${VERSION} (${M_DATE})"
-echo ""
-showMenu=0
-while [ ${showMenu} -eq 0 ] ; do
-  clear
-  opcion=$(/usr/bin/zenity --width=420 --height=560 --list --title "ks-zui (ks-tools) ${VERSION} ($M_DATE)" \
-  --column "Available options:" "### CONVERSION OPTIONS ###" "Show video file information" \
-  "Convert video file to MP4" "Convert video file to AVI" "Convert video file to VOB" \
-  "########################" "### UPLOAD OPTIONS ###" "Upload videos file(s) to server" \
-  "Upload audio file(s) to server" "Upload common file(s) to server" "Upload recursively file(s) to server"\
-  "Remove configuration" "Show configuration" "Edit configuration" \
-  "About" "Exit")
-  opcion=$(echo ${opcion} | cut -d "|" -f 1)
-  # opcion=$(echo ${opcion} | cut -d "|" -f 1)
-  echo ${opcion}
-  if [ "${opcion}" == "### CONVERSION OPTIONS ###" ] ; then
-    echo null > /dev/null
-  elif [ "${opcion}" == "Show video file information" ] ; then
-    showVideoInfo
-  elif [ "${opcion}" == "Convert video file to MP4" ] ; then
-    subtitlesMP4
-  elif [ "${opcion}" == "Convert video file to AVI" ] ; then
-    subtitlesAVI
-  elif [ "${opcion}" == "Convert video file to VOB" ] ; then
-    convertVOB
-  elif [ "${opcion}" == "########################" ] ; then
-    echo null > /dev/null
-  elif [ "${opcion}" == "### UPLOAD OPTIONS ###" ] ; then
-    echo null > /dev/null
-  elif [ "${opcion}" == "Upload videos file(s) to server" ] ; then
-    ks-upv -i
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --info --width=300 \
-    --text "File(s) upload is complete!"
-  elif [ "${opcion}" == "Upload audio file(s) to server" ] ; then
-    ks-upa -i
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --info --width=300 \
-    --text "File(s) upload is complete!"
-  elif [ "${opcion}" == "Upload common file(s) to server" ] ; then
-    ks-upf -i
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --info --width=300 \
-    --text "File(s) upload is complete!"
-  elif [ "${opcion}" == "Upload recursively file(s) to server" ] ; then
-    ks-upr -i
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --info --width=300 \
-    --text "File(s) upload is complete!"
-  elif [ "${opcion}" == "Remove configuration" ] ; then
-    ks-upf -r
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --info --width=300 \
-    --text "The configuration has been removed!"
-  elif [ "${opcion}" == "Show configuration" ] ; then
-    ks-upf -c
-    echo -n "Press ENTER to continue " ; read null
-  elif [ "${opcion}" == "Edit configuration" ] ; then
-    ks-upf -e
-  elif [ "${opcion}" == "About" ] ; then
-    showAbout
-  elif [ "${opcion}" == "Exit" ] ; then
-    showMenu=1
-  else
-    /usr/bin/zenity --title "ks-zui (ks-tools) ${VERSION} (${M_DATE})" --warning --width=300 \
-    --text "Choose one of the menu options"
-  fi
-done
--- a/cygwin/tmp/tmp-files-here
+++ b/cygwin/tmp/tmp-files-here
--- a/cygwin/usr/share/bash-completion/completions/blkid
+++ b/cygwin/usr/share/bash-completion/completions/blkid
@ -1,98 +0,0 @@
-_blkid_module()
-{
-	local cur prev OPTS OUTPUT_ALL
-	OUTPUT_ALL=''
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-c'|'--cache-file')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-o'|'--output')
-			COMPREPLY=( $(compgen -W "value device export full" -- $cur) )
-			return 0
-			;;
-		'-s'|'--match-tag')
-			COMPREPLY=( $(compgen -W "tag" -- $cur) )
-			return 0
-			;;
-		'-t'|'--match-token')
-			COMPREPLY=( $(compgen -W "TYPE= LABEL= UUID=" -- $cur) )
-			return 0
-			;;
-		'-L'|'--label')
-			COMPREPLY=( $(compgen -W "$(cd /dev/disk/by-label/ 2>/dev/null && echo *)" -- $cur) )
-			return 0
-			;;
-		'-U'|'--uuid')
-			COMPREPLY=( $(compgen -W "$(cd /dev/disk/by-uuid/ 2>/dev/null && echo *)" -- $cur) )
-			return 0
-			;;
-		'-S'|'--size')
-			COMPREPLY=( $(compgen -W "size" -- $cur) )
-			return 0
-			;;
-		'-O'|'--offset')
-			COMPREPLY=( $(compgen -W "offset" -- $cur) )
-			return 0
-			;;
-		'-u'|'--usages')
-			OUTPUT_ALL={,no}{filesystem,raid,crypto,other}
-			;;
-		'-n'|'--match-types')
-			OUTPUT_ALL="
-				$(awk '{print $NF}' /proc/filesystems)
-				$(\ls /lib/modules/$(uname -r)/kernel/fs)
-			"
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	if [ -n "$OUTPUT_ALL" ]; then
-		local prefix realcur OUTPUT_ALL OUTPUT
-		realcur="${cur##*,}"
-		prefix="${cur%$realcur}"
-		for WORD in $OUTPUT_ALL; do
-			if ! [[ $prefix == *"$WORD"* ]]; then
-				OUTPUT="$WORD ${OUTPUT:-""}"
-			fi
-		done
-		compopt -o nospace
-		COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") )
-		return 0
-	fi
-	case $cur in
-		-*)
-			OPTS="
-				--cache-file
-				--no-encoding
-				--garbage-collect
-				--output
-				--list-filesystems
-				--match-tag
-				--match-token
-				--list-one
-				--label
-				--uuid
-				--probe
-				--info
-				--size
-				--offset
-				--usages
-				--match-types
-				--help
-				--version
-			"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _blkid_module blkid
--- a/cygwin/usr/share/bash-completion/completions/cal
+++ b/cygwin/usr/share/bash-completion/completions/cal
@ -1,29 +0,0 @@
-_cal_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	case $cur in
-		-*)
-			OPTS="	--one
-				--three
-				--months
-				--sunday
-				--span
-				--monday
-				--julian
-				--year
-				--twelve
-				--week
-				--color=auto
-				--color=always
-				--color=never
-				--version
-				--help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	return 0
-}
-complete -F _cal_module cal
--- a/cygwin/usr/share/bash-completion/completions/cfdisk
+++ b/cygwin/usr/share/bash-completion/completions/cfdisk
@ -1,29 +0,0 @@
-_cfdisk_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-L'|'--color')
-			COMPREPLY=( $(compgen -W "auto never always" -- $cur) )
-			return 0
-			;;
-		'-V'|'--version'|'h'|'--help')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="	--color
-				--zero
-				--help
-				--version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _cfdisk_module cfdisk
--- a/cygwin/usr/share/bash-completion/completions/col
+++ b/cygwin/usr/share/bash-completion/completions/col
@ -1,27 +0,0 @@
-_col_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-l'|'--lines')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-H'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	OPTS="--no-backspaces
-		--fine
-		--pass
-		--tabs
-		--spaces
-		--lines
-		--version
-		--help"
-	COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-	return 0
-}
-complete -F _col_module col
--- a/cygwin/usr/share/bash-completion/completions/colcrt
+++ b/cygwin/usr/share/bash-completion/completions/colcrt
@ -1,27 +0,0 @@
-_colcrt_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="	--no-underlining
-				--half-lines
-				--version
-				--help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _colcrt_module colcrt
--- a/cygwin/usr/share/bash-completion/completions/colrm
+++ b/cygwin/usr/share/bash-completion/completions/colrm
@ -1,29 +0,0 @@
-_colrm_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	case $COMP_CWORD in
-		1)
-			COMPREPLY=( $(compgen -W "startcol" -- $cur) )
-			;;
-		2)
-			COMPREPLY=( $(compgen -W "endcol" -- $cur) )
-			;;
-	esac
-	return 0
-}
-complete -F _colrm_module colrm
--- a/cygwin/usr/share/bash-completion/completions/column
+++ b/cygwin/usr/share/bash-completion/completions/column
@ -1,62 +0,0 @@
-_column_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-c'|'--output-width')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-s'|'--separator'|'-o'|'--output-separator'|'-n'|'--table-name'|'-O')
-			COMPREPLY=( $(compgen -W "string" -- $cur) )
-			return 0
-			;;
-		'-O'|'--table-order'|'-N'|'--table-columns'|'-E'|'--table-noextreme'|'-H'|'--table-hide'|'-R'|'--table-right'|'-T'|'--table-truncate'|'-W'|'--table-wrap')
-			COMPREPLY=( $(compgen -W "string" -- $cur) )
-			return 0
-			;;
-		'-r'|'--tree'|'-i'|'--tree-id'|'-p'|'--tree-parent')
-			COMPREPLY=( $(compgen -W "string" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--columns
-				--table
-				--table-name
-				--table-order
-				--table-columns
-				--table-noextreme
-				--table-noheadings
-				--table-header-repeat
-				--table-hide
-				--table-right
-				--table-truncate
-				--table-wrap
-				--table-empty-lines
-				--json
-				--tree
-				--tree-id
-				--tree-parent
-				--output-width
-				--separator
-				--output-separator
-				--fillrows
-				--help
-				--version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _column_module column
--- a/cygwin/usr/share/bash-completion/completions/fdisk
+++ b/cygwin/usr/share/bash-completion/completions/fdisk
@ -1,97 +0,0 @@
-_fdisk_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-s'|'--getsz')
-			COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-			return 0
-			;;
-		'-b'|'--sector-size')
-			COMPREPLY=( $(compgen -W "512 1024 2048 4096" -- $cur) )
-			return 0
-			;;
-		'-c'|'--compatibility')
-			COMPREPLY=( $(compgen -W "dos nondos" -- $cur) )
-			return 0
-			;;
-		'-L'|'--color')
-			COMPREPLY=( $(compgen -W "auto never always" -- $cur) )
-			return 0
-			;;
-		'--output')
-			local prefix realcur OUTPUT_ALL OUTPUT
-			realcur="${cur##*,}"
-			prefix="${cur%$realcur}"
-			OUTPUT_ALL="
-				Attrs
-				Boot
-				Bsize
-				Cpg
-				Cylinders
-				Device
-				End
-				End-C/H/S
-				Flags
-				Fsize
-				Id
-				Name
-				Sectors
-				Size
-				Slice
-				Start
-				Start-C/H/S
-				Type
-				Type-UUID
-				UUID
-			"
-			for WORD in $OUTPUT_ALL; do
-				if ! [[ $prefix == *"$WORD"* ]]; then
-					OUTPUT="$WORD ${OUTPUT:-""}"
-				fi
-			done
-			compopt -o nospace
-			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") )
-			return 0
-			;;
-		'-u'|'--units')
-			COMPREPLY=( $(compgen -W "cylinders sectors" -- $cur) )
-			return 0
-			;;
-		'-C'|'--cylinders'|'-H'|'--heads'|'-S'|'--sectors')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-v'|'--version'|'-V'|'--list')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--sector-size
-				--protect-boot
-				--compatibility
-				--color
-				--list
-				--output
-				--type
-				--units
-				--getsz
-				--bytes
-				--wipe
-				--wipe-partitions
-				--cylinders
-				--heads
-				--sectors
-				--help
-				--version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _fdisk_module fdisk
--- a/cygwin/usr/share/bash-completion/completions/findfs
+++ b/cygwin/usr/share/bash-completion/completions/findfs
@ -1,34 +0,0 @@
-_findfs_module()
-{
-	local cur prev OPTS findable
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	for i in $(lsblk -rpno label); do
-		findable+=" LABEL=$i"
-	done
-	for i in $(lsblk -rpno uuid); do
-		findable+=" UUID=$i"
-	done
-	for i in $(lsblk -rpno partlabel); do
-		findable+=" PARTLABEL=$i"
-	done
-	for i in $(lsblk -rpno partuuid); do
-		findable+=" PARTUUID=$i"
-	done
-	COMPREPLY=( $(compgen -W "$findable" -- $cur) )
-	return 0
-}
-complete -F _findfs_module findfs
--- a/cygwin/usr/share/bash-completion/completions/flock
+++ b/cygwin/usr/share/bash-completion/completions/flock
@ -1,47 +0,0 @@
-_flock_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-w'|'--timeout')
-			COMPREPLY=( $(compgen -W "seconds" -- $cur) )
-			return 0
-			;;
-		'-E'|'--conflict-exit-code')
-			COMPREPLY=( $(compgen -W "{0..255}" -- $cur) )
-			return 0
-			;;
-		'-c'|'--command')
-			compopt -o bashdefault
-			COMPREPLY=( $(compgen -c -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--shared
-				--exclusive
-				--unlock
-				--nonblock
-				--timeout
-				--conflict-exit-code
-				--close
-				--command
-				--no-fork
-				--help
-				--version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- ${cur:-"/"}) )
-	return 0
-}
-complete -F _flock_module flock
--- a/cygwin/usr/share/bash-completion/completions/fsck.cramfs
+++ b/cygwin/usr/share/bash-completion/completions/fsck.cramfs
@ -1,33 +0,0 @@
-_fsck.cramfs_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-b'|'--blocksize')
-			COMPREPLY=( $(compgen -W "size" -- $cur) )
-			return 0
-			;;
-		'--extract')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			COMPREPLY=( $(compgen -W "--verbose --blocksize --extract --help --version" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _fsck.cramfs_module fsck.cramfs
--- a/cygwin/usr/share/bash-completion/completions/fsck.minix
+++ b/cygwin/usr/share/bash-completion/completions/fsck.minix
@ -1,16 +0,0 @@
-_fsck.minix_module()
-{
-	local cur OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	case $cur in
-		-*)
-			OPTS="--list --auto --repair --verbose --super --uncleared --force --help --version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _fsck.minix_module fsck.minix
--- a/cygwin/usr/share/bash-completion/completions/getopt
+++ b/cygwin/usr/share/bash-completion/completions/getopt
@ -1,37 +0,0 @@
-_getopt_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-l'|'--longoptions')
-			COMPREPLY=( $(compgen -W "longopts" -- $cur) )
-			return 0
-			;;
-		'-n'|'--name')
-			COMPREPLY=( $(compgen -W "name" -- $cur) )
-			return 0
-			;;
-		'-o'|'--options')
-			COMPREPLY=( $(compgen -W "optstring" -- $cur) )
-			return 0
-			;;
-		'-s'|'--shell')
-			COMPREPLY=( $(compgen -W "sh bash csh tcsh" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--alternative --help --longoptions --name --options --quiet --quiet-output --shell --test --unquoted --version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	return 0
-}
-complete -F _getopt_module getopt
--- a/cygwin/usr/share/bash-completion/completions/git
+++ b/cygwin/usr/share/bash-completion/completions/git
--- a/cygwin/usr/share/bash-completion/completions/hexdump
+++ b/cygwin/usr/share/bash-completion/completions/hexdump
@ -1,53 +0,0 @@
-_hexdump_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-L'|'--color')
-			COMPREPLY=( $(compgen -W "auto never always" -- $cur) )
-			return 0
-			;;
-		'-e'|'--format')
-			COMPREPLY=( $(compgen -W "format" -- $cur) )
-			return 0
-			;;
-		'-n'|'--length')
-			COMPREPLY=( $(compgen -W "length" -- $cur) )
-			return 0
-			;;
-		'-s'|'--skip')
-			COMPREPLY=( $(compgen -W "offset" -- $cur) )
-			return 0
-			;;
-		'-V'|'--version'|'-h'|'--help')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="	--one-byte-octal
-				--one-byte-char
-				--canonical
-				--two-bytes-decimal
-				--two-bytes-octal
-				--two-bytes-hex
-				--color=
-				--format
-				--format-file
-				--length
-				--skip
-				--no-squeezing
-				--version
-				--help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _hexdump_module hexdump
--- a/cygwin/usr/share/bash-completion/completions/ipcmk
+++ b/cygwin/usr/share/bash-completion/completions/ipcmk
@ -1,27 +0,0 @@
-_ipcmk_module()
-{
-	local cur prev
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-M'|'--shmem')
-			COMPREPLY=( $(compgen -W "size" -- $cur) )
-			return 0
-			;;
-		'-S'|'--semaphore')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-p'|'--mode')
-			COMPREPLY=( $(compgen -W "mode" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "--shmem --semaphore --queue --mode --help --version" -- $cur) )
-	return 0
-}
-complete -F _ipcmk_module ipcmk
--- a/cygwin/usr/share/bash-completion/completions/isosize
+++ b/cygwin/usr/share/bash-completion/completions/isosize
@ -1,27 +0,0 @@
-_isosize_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-d'|'--divisor')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			COMPREPLY=( $(compgen -W "--divisor --sectors --help --version" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _isosize_module isosize
--- a/cygwin/usr/share/bash-completion/completions/logger
+++ b/cygwin/usr/share/bash-completion/completions/logger
@ -1,78 +0,0 @@
-_logger_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-f'|'--file'|'--journald')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-n'|'--server')
-			COMPREPLY=( $(compgen -A hostname -- $cur) )
-			return 0
-			;;
-		'-P'|'--port')
-			COMPREPLY=( $(compgen -W "$(awk '$1 ~ /^syslog$/  {split($2, a, "/"); print a[1]}' /etc/services)" -- $cur) )
-			return 0
-			;;
-		'-p'|'--priority')
-			COMPREPLY=( $(compgen -W "{auth,authpriv,cron,daemon,ftp,lpr,mail,news,security}.{alert,crit,debug,emerg,err,error}" -- $cur) )
-			return 0
-			;;
-		'-t'|'--tag')
-			COMPREPLY=( $(compgen -W "tag" -- $cur) )
-			return 0
-			;;
-		'-u'|'--socket')
-			COMPREPLY=( $(compgen -W "$(awk '$NF ~ /^\// {print $NF}' /proc/net/unix)" -- $cur) )
-			return 0
-			;;
-		'--socket-errors')
-			COMPREPLY=( $(compgen -W "on off auto" -- $cur) )
-			return 0
-			;;
-		'--msgid')
-			COMPREPLY=( $(compgen -W "msgid" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="
-				--file
-				--help
-				--id
-				--journald
-				--msgid
-				--no-act
-				--octet-count
-				--port
-				--prio-prefix
-				--priority
-				--rfc3164
-				--rfc5424
-				--server
-				--size
-				--skip-empty
-				--socket
-				--socket-errors
-				--stderr
-				--tag
-				--tcp
-				--udp
-				--version
-			"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	return 0
-}
-complete -F _logger_module logger
--- a/cygwin/usr/share/bash-completion/completions/look
+++ b/cygwin/usr/share/bash-completion/completions/look
@ -1,35 +0,0 @@
-_look_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-t'|'--terminate')
-			COMPREPLY=( $(compgen -W "char" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--alternative --alphanum --ignore-case --terminate --version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	case $COMP_CWORD in
-		1)
-			COMPREPLY=( $(compgen -W "$(look "$cur")" -- $cur) )
-			;;
-		2)
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			;;
-	esac
-	return 0
-}
-complete -F _look_module look
--- a/cygwin/usr/share/bash-completion/completions/mcookie
+++ b/cygwin/usr/share/bash-completion/completions/mcookie
@ -1,31 +0,0 @@
-_mcookie_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-f'|'--file')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-m'|'--max-size')
-			COMPREPLY=( $(compgen -W "bytes" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--file --max-size --verbose --version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	return 0
-}
-complete -F _mcookie_module mcookie
--- a/cygwin/usr/share/bash-completion/completions/mkfs
+++ b/cygwin/usr/share/bash-completion/completions/mkfs
@ -1,27 +0,0 @@
-_mkfs_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-t'|'--type')
-			FSTYPES=$(for I in /sbin/mkfs.* /usr/sbin/mkfs.*; do if [ -e $I ]; then echo ${I##*mkfs.}; fi; done)
-			COMPREPLY=( $(compgen -W "$FSTYPES" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS='--type --verbose --help --version'
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name) /path/to/file" -- $cur) )
-	return 0
-}
-complete -F _mkfs_module mkfs
--- a/cygwin/usr/share/bash-completion/completions/mkfs.bfs
+++ b/cygwin/usr/share/bash-completion/completions/mkfs.bfs
@ -1,30 +0,0 @@
-_mkfs.bfs_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-N'|'--inodes')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'-V'|'--vname'|'-F'|'--fname')
-			COMPREPLY=( $(compgen -W "name" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS='--inodes --vname --fname --verbose --help --version'
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name) /path/to/file" -- $cur) )
-	return 0
-}
-complete -F _mkfs.bfs_module mkfs.bfs
--- a/cygwin/usr/share/bash-completion/completions/mkfs.cramfs
+++ b/cygwin/usr/share/bash-completion/completions/mkfs.cramfs
@ -1,44 +0,0 @@
-_mkfs.cramfs_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-b')
-			COMPREPLY=( $(compgen -W "blksize" -- $cur) )
-			return 0
-			;;
-		'-e')
-			COMPREPLY=( $(compgen -W "edition" -- $cur) )
-			return 0
-			;;
-		'-N')
-			COMPREPLY=( $(compgen -W "big little host" -- $cur) )
-			return 0
-			;;
-		'-i')
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-n')
-			COMPREPLY=( $(compgen -W "name" -- $cur) )
-			return 0
-			;;
-		'-h'|'-V')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="-h -v -E -b -e -N -i -n -p -s -z"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _mkfs.cramfs_module mkfs.cramfs
--- a/cygwin/usr/share/bash-completion/completions/mkfs.minix
+++ b/cygwin/usr/share/bash-completion/completions/mkfs.minix
@ -1,32 +0,0 @@
-_mkfs.minix_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-i'|'--inodes')
-			COMPREPLY=( $(compgen -W "inodes" -- $cur) )
-			return 0
-			;;
-		'-l'|'--badblocks')
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-n'|'--namelength')
-			COMPREPLY=( $(compgen -W "14 30 60" -- $cur) )
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--namelength --inodes --check --badblocks --help --version -1 -2 -3"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _mkfs.minix_module mkfs.minix
--- a/cygwin/usr/share/bash-completion/completions/mkswap
+++ b/cygwin/usr/share/bash-completion/completions/mkswap
@ -1,40 +0,0 @@
-_mkswap_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-p'|'--pagesize')
-			COMPREPLY=( $(compgen -W "bytes" -- $cur) )
-			return 0
-			;;
-		'-L'|'--label')
-			COMPREPLY=( $(compgen -W "label" -- $cur) )
-			return 0
-			;;
-		'-v'|'--swapversion')
-			COMPREPLY=( $(compgen -W "1" -- $cur) )
-			return 0
-			;;
-		'-U'|'--uuid')
-			COMPREPLY=( $(compgen -W "$(uuidgen -r)" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--check --force --pagesize --label --swapversion --uuid --version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _mkswap_module mkswap
--- a/cygwin/usr/share/bash-completion/completions/more
+++ b/cygwin/usr/share/bash-completion/completions/more
@ -1,30 +0,0 @@
-_more_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-V')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="-d -f -l -p -c -u -s -number -V"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-		+*)
-			OPTS="+number +/string"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _more_module more
--- a/cygwin/usr/share/bash-completion/completions/namei
+++ b/cygwin/usr/share/bash-completion/completions/namei
@ -1,24 +0,0 @@
-_namei_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--help --version --mountpoints --modes --owners --long --nosymlinks --vertical"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _namei_module namei
--- a/cygwin/usr/share/bash-completion/completions/pg
+++ b/cygwin/usr/share/bash-completion/completions/pg
@ -1,33 +0,0 @@
-_pg_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-p')
-			COMPREPLY=( $(compgen -W "prompt" -- $cur) )
-			return 0
-			;;
-		'-h'|'-V')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="-number -c -e -f -n -p -r -s -h -V"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-		+*)
-			OPTS="+number +/pattern/"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _pg_module pg
--- a/cygwin/usr/share/bash-completion/completions/rename
+++ b/cygwin/usr/share/bash-completion/completions/rename
@ -1,34 +0,0 @@
-_rename_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--verbose --symlink --help --version --no-act --no-override --interactive"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	case $COMP_CWORD in
-		1)
-			COMPREPLY=( $(compgen -W "expression" -- $cur) )
-			;;
-		2)
-			COMPREPLY=( $(compgen -W "replacement" -- $cur) )
-			;;
-		*)
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			;;
-	esac
-	return 0
-}
-complete -F _rename_module rename
--- a/cygwin/usr/share/bash-completion/completions/renice
+++ b/cygwin/usr/share/bash-completion/completions/renice
@ -1,41 +0,0 @@
-_renice_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-g'|'--pgrp')
-			local PGRP
-			PGRP=$(ps -ax -opgrp | sed '1d')
-			COMPREPLY=( $(compgen -W "$PGRP" -- $cur) )
-			return 0
-			;;
-		'-n'|'--priority')
-			COMPREPLY=( $(compgen -W "{-20..20}" -- $cur) )
-			return 0
-			;;
-		'-p'|'--pid')
-			local PIDS
-			PIDS=$(cd /proc && echo [0-9]*)
-			COMPREPLY=( $(compgen -W "$PIDS" -- $cur) )
-			return 0
-			;;
-		'-u'|'--user')
-			COMPREPLY=( $(compgen -u -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	OPTS="--pgrp
-		--priority
-		--pid
-		--user
-		--help
-		--version"
-	COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-	return 0
-}
-complete -F _renice_module renice
--- a/cygwin/usr/share/bash-completion/completions/rev
+++ b/cygwin/usr/share/bash-completion/completions/rev
@ -1,24 +0,0 @@
-_rev_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _rev_module rev
--- a/cygwin/usr/share/bash-completion/completions/script
+++ b/cygwin/usr/share/bash-completion/completions/script
@ -1,45 +0,0 @@
-_script_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-c'|'--command')
-			compopt -o bashdefault
-			COMPREPLY=( $(compgen -c -- $cur) )
-			return 0
-			;;
-		'-o'|'--output-limit')
-			COMPREPLY=( $(compgen -W "size" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		'=')
-			cur=${cur#=}
-			;;
-		-*)
-			OPTS="--append
-				--command
-				--return
-				--flush
-				--force
-				--quiet
-				--output-limit
-				--timing=
-				--version
-				--help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _script_module script
--- a/cygwin/usr/share/bash-completion/completions/scriptreplay
+++ b/cygwin/usr/share/bash-completion/completions/scriptreplay
@ -1,33 +0,0 @@
-_scriptreplay_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-d'|'--divisor'|'-m'|'--maxdelay')
-			COMPREPLY=( $(compgen -W "digit" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--timing
-				--typescript
-				--divisor
-				--maxdelay
-				--version
-				--help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _scriptreplay_module scriptreplay
--- a/cygwin/usr/share/bash-completion/completions/setsid
+++ b/cygwin/usr/share/bash-completion/completions/setsid
@ -1,23 +0,0 @@
-_setsid_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--ctty --wait --help --version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	compopt -o bashdefault
-	COMPREPLY=( $(compgen -c -- $cur) )
-	return 0
-}
-complete -F _setsid_module setsid
--- a/cygwin/usr/share/bash-completion/completions/sfdisk
+++ b/cygwin/usr/share/bash-completion/completions/sfdisk
@ -1,96 +0,0 @@
-_sfdisk_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-d'|'--dump'|'-J'|'--json'|'-l'|'--list'|'-F'|'--list-free'|'-r'|'--reorder'|'-s'|'--show-size'|'-V'|'--verify'|'-A'|'--activate'|'--delete')
-			COMPREPLY=( $(compgen -W "$(lsblk -dpnro name)" -- $cur) )
-			return 0
-			;;
-		'-N'|'--partno')
-			COMPREPLY=( $(compgen -W "number" -- $cur) )
-			return 0
-			;;
-		'--color'|'-w'|'--wipe'|'-W'|'--wipe-partitions')
-			COMPREPLY=( $(compgen -W "auto never always" -- $cur) )
-			return 0
-			;;
-		'-o'|'--output')
-			local prefix realcur OUTPUT_ALL OUTPUT
-			realcur="${cur##*,}"
-			prefix="${cur%$realcur}"
-			OUTPUT_ALL="
-				Attrs Boot Bsize Cpg Cylinders Device End
-				End-C/H/S Flags Fsize Id Name Sectors Size
-				Slice Start Start-C/H/S Type Type-UUID UUID
-			"
-			for WORD in $OUTPUT_ALL; do
-				if ! [[ $prefix == *"$WORD"* ]]; then
-					OUTPUT="$WORD ${OUTPUT:-""}"
-				fi
-			done
-			compopt -o nospace
-			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") )
-			return 0
-			;;
-		'-O'|'--backup-file')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -f -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-v'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		'=')
-			cur=${cur#=}
-			;;
-		-*)
-			OPTS="
-				--activate
-				--dump
-				--json
-				--show-geometry
-				--list
-				--list-free
-				--reorder
-				--show-size
-				--list-types
-				--verify
-				--delete
-				--part-label
-				--part-type
-				--part-uuid
-				--part-attrs
-				--append
-				--backup
-				--bytes
-				--move-data
-				--force
-				--color
-				--partno
-				--no-act
-				--no-reread
-				--no-tell-kernel
-				--backup-file
-				--output
-				--quiet
-				--wipe
-				--wipe-partitions
-				--label
-				--label-nested
-				--help
-				--version
-			"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _sfdisk_module sfdisk
--- a/cygwin/usr/share/bash-completion/completions/swaplabel
+++ b/cygwin/usr/share/bash-completion/completions/swaplabel
@ -1,32 +0,0 @@
-_swaplabel_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-L'|'--label')
-			COMPREPLY=( $(compgen -W "label" -- $cur) )
-			return 0
-			;;
-		'-U'|'--uuid')
-			COMPREPLY=( $(compgen -W '$(uuidgen)' -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--label --uuid --help --version"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _swaplabel_module swaplabel
--- a/cygwin/usr/share/bash-completion/completions/ul
+++ b/cygwin/usr/share/bash-completion/completions/ul
@ -1,33 +0,0 @@
-_ul_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-t'|'--terminal')
-			local TERM_LIST I
-			TERM_LIST=''
-			for I in /usr/share/terminfo/?/*; do
-				TERM_LIST+="${I##*/} "
-			done
-			COMPREPLY=( $(compgen -W "$TERM_LIST" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="--terminal --indicated --version --help"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	local IFS=$'\n'
-	compopt -o filenames
-	COMPREPLY=( $(compgen -f -- $cur) )
-	return 0
-}
-complete -F _ul_module ul
--- a/cygwin/usr/share/bash-completion/completions/uuidgen
+++ b/cygwin/usr/share/bash-completion/completions/uuidgen
@ -1,39 +0,0 @@
-_uuidgen_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-n'|'--namespace')
-			COMPREPLY=( $(compgen -W "@dns @url @oid @x500 @x.500" -- "$cur") )
-			return 0
-			;;
-		'-N'|'--name')
-			COMPREPLY=( $(compgen -W "name" -- "$cur") )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="
-				--random
-				--time
-				--namespace
-				--name
-				--md5
-				--sha1
-				--hex
-				--help
-				--version
-			"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	return 0
-}
-complete -F _uuidgen_module uuidgen
--- a/cygwin/usr/share/bash-completion/completions/uuidparse
+++ b/cygwin/usr/share/bash-completion/completions/uuidparse
@ -1,37 +0,0 @@
-_uuidparse_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-o'|'--output')
-			local prefix realcur OUTPUT
-			realcur="${cur##*,}"
-			prefix="${cur%$realcur}"
-			for WORD in "UUID VARIANT TYPE TIME"; do
-				if ! [[ $prefix == *"$WORD"* ]]; then
-					OUTPUT="$WORD ${OUTPUT:-""}"
-				fi
-			done
-			compopt -o nospace
-			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	OPTS="
-		--json
-		--noheadings
-		--output
-		--raw
-		--help
-		--version
-	"
-	COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-	return 0
-
-}
-complete -F _uuidparse_module uuidparse
--- a/cygwin/usr/share/bash-completion/completions/whereis
+++ b/cygwin/usr/share/bash-completion/completions/whereis
@ -1,28 +0,0 @@
-_whereis_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-B'|'-M'|'-S')
-			local IFS=$'\n'
-			compopt -o filenames
-			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
-			return 0
-			;;
-		'-h'|'-V')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="-b -B -m -M -s -S -f -u -l"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "file" -- $cur) )
-	return 0
-}
-complete -F _whereis_module whereis
--- a/cygwin/usr/share/bash-completion/completions/wipefs
+++ b/cygwin/usr/share/bash-completion/completions/wipefs
@ -1,60 +0,0 @@
-_wipefs_module()
-{
-	local cur prev OPTS
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	case $prev in
-		'-O'|'--output')
-			local prefix realcur OUTPUT_ALL OUTPUT
-			realcur="${cur##*,}"
-			prefix="${cur%$realcur}"
-			OUTPUT_ALL="UUID LABEL LENGTH TYPE OFFSET USAGE DEVICE"
-			for WORD in $OUTPUT_ALL; do
-				if ! [[ $prefix == *"$WORD"* ]]; then
-					OUTPUT="$WORD ${OUTPUT:-""}"
-				fi
-			done
-			compopt -o nospace
-			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )
-			return 0
-			;;
-		'-o'|'--offset')
-			COMPREPLY=( $(compgen -W "offset" -- $cur) )
-			return 0
-			;;
-		'-t'|'--types')
-			local TYPES
-			TYPES="$(blkid -k)"
-			COMPREPLY=( $(compgen -W "$TYPES" -- $cur) )
-			return 0
-			;;
-		'-h'|'--help'|'-V'|'--version')
-			return 0
-			;;
-	esac
-	case $cur in
-		-*)
-			OPTS="
-				--all
-				--backup
-				--force
-				--noheadings
-				--json
-				--no-act
-				--offset
-				--output
-				--parsable
-				--quiet
-				--types
-				--help
-				--version
-			"
-			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
-			return 0
-			;;
-	esac
-	COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
-	return 0
-}
-complete -F _wipefs_module wipefs
--- a/cygwin/usr/share/cygwin/cygwin.ldif
+++ b/cygwin/usr/share/cygwin/cygwin.ldif
@ -1,253 +0,0 @@
-# =========================================================================
-#
-# Schema Extension for Cygwin User and Group auxiliary classes
-#
-# Extend your Active Directory using
-#
-# ldifde -i -f <path>\<this>.ldif -b <username> <domain> <password> \
-#   -k -c "CN=schema,CN=Configuration,DC=X" #schemaNamingContext
-#
-# Remember:
-# - you have to be schema admin for your active directory
-# - you have to run the above command directly from your schema master
-#
-# For further information read
-#   http://technet.microsoft.com/en-us/magazine/2008.05.schema.aspx
-#
-# ----------------------------------------------------------------------
-#
-# Explanation for the OIDs:
-#
-#  Value           Meaning  Description
-#      1               ISO  Identifies the root authority.
-#      3              IANA  Group designation assigned by ISO.
-#  6.1.4.1.2312    Red Hat  Organization assigned by IANA.
-#     15            Cygwin  Assigned by Organization.
-#      Y       Object Type  Number defining the different object type
-#                             (category) such as classSchema or
-#                             attributeSchema. For example, 5 defines
-#                             object class.
-#      Z            Object  Number identifying a particular object
-#                             within the category. For example, the user
-#                             class has the number 9 assigned to it.
-# 
-# ----------------------------------------------------------------------
-
-# Attribute definition for cygwinHome
-
-dn: CN=cygwin-Home,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-Home
-attributeID: 1.3.6.1.4.1.2312.15.2.1
-# attributeSyntax 2.5.5.12 is String(Unicode) with oMSyntax == 64
-# see http://technet.microsoft.com/en-us/library/cc961740.aspx
-attributeSyntax: 2.5.5.12
-isSingleValued: TRUE
-adminDisplayName: cygwin-Home
-adminDescription: cygwin-Home
-oMSyntax: 64
-searchFlags: 1
-lDAPDisplayName: cygwinHome
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attribute definition for cygwinShell
-
-dn: CN=cygwin-Shell,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-Shell
-attributeID: 1.3.6.1.4.1.2312.15.2.2
-attributeSyntax: 2.5.5.12
-isSingleValued: TRUE
-adminDisplayName: cygwin-Shell
-adminDescription: cygwin-Shell
-oMSyntax: 64
-searchFlags: 1
-lDAPDisplayName: cygwinShell
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attribute definition for cygwinGecos
-
-dn: CN=cygwin-Gecos,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-Gecos
-attributeID: 1.3.6.1.4.1.2312.15.2.3
-attributeSyntax: 2.5.5.12
-isSingleValued: TRUE
-adminDisplayName: cygwin-Gecos
-adminDescription: cygwin-Gecos
-oMSyntax: 64
-searchFlags: 1
-lDAPDisplayName: cygwinGecos
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attribute definition for cygwinFstab
-
-dn: CN=cygwin-Fstab,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-Fstab
-attributeID: 1.3.6.1.4.1.2312.15.2.4
-attributeSyntax: 2.5.5.12
-isSingleValued: FALSE
-adminDisplayName: cygwin-Fstab
-adminDescription: cygwin-Fstab
-oMSyntax: 64
-searchFlags: 1
-lDAPDisplayName: cygwinFstab
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attribute definition for cygwinUnixUid
-
-dn: CN=cygwin-UnixUid,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-UnixUid
-attributeID: 1.3.6.1.4.1.2312.15.2.5
-# attributeSyntax 2.5.5.9 is Integer with oMSyntax == 2
-attributeSyntax: 2.5.5.9
-isSingleValued: TRUE
-adminDisplayName: cygwin-UnixUid
-adminDescription: cygwin-UnixUid
-oMSyntax: 2
-searchFlags: 1
-lDAPDisplayName: cygwinUnixUid
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attribute definition for cygwinUnixGid
-
-dn: CN=cygwin-UnixGid,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: attributeSchema
-cn: cygwin-UnixGid
-attributeID: 1.3.6.1.4.1.2312.15.2.6
-attributeSyntax: 2.5.5.9
-isSingleValued: TRUE
-adminDisplayName: cygwin-UnixGid
-adminDescription: cygwin-UnixGid
-oMSyntax: 2
-searchFlags: 1
-lDAPDisplayName: cygwinUnixGid
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# cygwin-User auxiliary class
-
-dn: CN=cygwin-User,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: classSchema
-cn: cygwin-User
-governsID: 1.3.6.1.4.1.2312.15.1.1
-mayContain: cygwinHome
-mayContain: cygwinShell
-mayContain: cygwinGecos
-mayContain: cygwinFstab
-mayContain: cygwinUnixUid
-rDNAttID: cn
-adminDisplayName: cygwin-User
-adminDescription: cygwin-User
-objectClassCategory: 3
-lDAPDisplayName: cygwinUser
-name: cygwin-User
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# cygwin-Group auxiliary class
-
-dn: CN=cygwin-Group,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemaadd
-objectClass: top
-objectClass: classSchema
-cn: cygwin-Group
-governsID: 1.3.6.1.4.1.2312.15.1.2
-mayContain: cygwinUnixGid
-rDNAttID: cn
-adminDisplayName: cygwin-Group
-adminDescription: cygwin-Group
-objectClassCategory: 3
-lDAPDisplayName: cygwinGroup
-name: cygwin-Group
-systemOnly: FALSE
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attach cygwin-User to User
-
-dn: CN=User,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemamodify
-add: auxiliaryClass
-auxiliaryClass: cygwinUser
-
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-# Attach cygwin-Group to Group
-
-dn: CN=Group,CN=Schema,CN=Configuration,DC=X
-changetype: ntdsschemamodify
-add: auxiliaryClass
-auxiliaryClass: cygwinGroup
-
-
-dn:
-changetype: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
--- a/cygwin/usr/share/fontconfig/conf.avail/10-autohint.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-autohint.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Enable autohinter</description>
-<!--  Use the Autohinter --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="autohint" mode="append"><bool>true</bool></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-hinting-full.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-hinting-full.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set hintfull to hintstyle</description>
-
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="hintstyle" mode="append"><const>hintfull</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-hinting-medium.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-hinting-medium.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set hintmedium to hintstyle</description>
-
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="hintstyle" mode="append"><const>hintmedium</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-hinting-none.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-hinting-none.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set hintnone to hintstyle</description>
-
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="hintstyle" mode="append"><const>hintnone</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-hinting-slight.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-hinting-slight.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set hintslight to hintstyle</description>
-
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-no-sub-pixel.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-no-sub-pixel.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Disable sub-pixel rendering</description>
-<!--  Disable sub-pixel rendering --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="rgba" mode="append"><const>none</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Bitmap scaling</description>
-<!--
-  If font is bitmap, calculate scale factor.
-  Note that color bitmap fonts have scalable=true, while
-  non-color ones have scalable=false.  Both groups have outline=false.
-  -->
-<match target="font">
-  <test name="outline" compare="eq">
-    <bool>false</bool>
-  </test>
-  <edit name="pixelsizefixupfactor" mode="assign">
-    <divide>
-      <name target="pattern">pixelsize</name>
-      <name target="font"   >pixelsize</name>
-    </divide>
-  </edit>
-</match>
-<!--
-  For non-scalable bitmap fonts (ie. non-color), skip
-  minor scaling if hinting is enabled.
-  -->
-<match target="font">
-  <test name="outline" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="scalable" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="hinting" compare="eq">
-    <bool>true</bool>
-  </test>
-  <edit name="scalingnotneeded" mode="assign">
-    <and>
-      <less>
-        <name>pixelsizefixupfactor</name>
-        <double>1.2</double>
-      </less>
-      <more>
-        <name>pixelsizefixupfactor</name>
-        <double>0.8</double>
-      </more>
-    </and>
-  </edit>
-</match>
-<match target="font">
-  <test name="scalingnotneeded" compare="eq">
-    <bool>true</bool>
-  </test>
-  <edit name="pixelsizefixupfactor" mode="assign">
-    <double>1.0</double>
-  </edit>
-</match>
-<!--
-  If we *are* going to scale, go ahead and do it.
-  -->
-<match target="font">
-  <test name="outline" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="pixelsizefixupfactor" compare="not_eq">
-    <double>1.0</double>
-  </test>
-  <edit name="matrix" mode="assign">
-    <times>
-      <name>matrix</name>
-      <matrix>
-        <name>pixelsizefixupfactor</name> <double>0</double>
-        <double>0</double> <name>pixelsizefixupfactor</name>
-       </matrix>
-    </times>
-  </edit>
-  <edit name="size" mode="assign">
-    <divide>
-      <name>size</name>
-      <name>pixelsizefixupfactor</name>
-    </divide>
-  </edit>
-</match>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Enable sub-pixel rendering with the BGR stripes layout</description>
-<!--  Enable sub-pixel rendering --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="rgba" mode="append"><const>bgr</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Enable sub-pixel rendering with the RGB stripes layout</description>
-<!--  Enable sub-pixel rendering --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="rgba" mode="append"><const>rgb</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Enable sub-pixel rendering with the vertical BGR stripes layout</description>
-<!--  Enable sub-pixel rendering --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="rgba" mode="append"><const>vbgr</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Enable sub-pixel rendering with the vertical RGB stripes layout</description>
-<!--  Enable sub-pixel rendering --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="rgba" mode="append"><const>vrgb</const></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/10-unhinted.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/10-unhinted.conf
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Disable hinting</description>
-<!--  Disable hinting --> 
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit name="hinting" mode="append"><bool>false</bool></edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Use lcddefault as default for LCD filter</description>
-<!--  Use lcddefault as default for LCD filter -->
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit mode="append" name="lcdfilter">
-      <const>lcddefault</const>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Use lcdlegacy as default for LCD filter</description>
-<!--  Use lcdlegacy as default for LCD filter -->
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit mode="append" name="lcdfilter">
-      <const>lcdlegacy</const>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Use lcdlight as default for LCD filter</description>
-<!--  Use lcdlight as default for LCD filter -->
-  <match target="pattern">
-    <!--
-      This configuration is available on the major desktop environments.
-      We shouldn't overwrite it with "assign" unconditionally.
-      Most clients may picks up the first value only. so using "append"
-      may simply works to avoid it.
-    -->
-    <edit mode="append" name="lcdfilter">
-      <const>lcdlight</const>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans-mono.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans-mono.conf
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans Mono</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans.conf
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-serif.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-serif.conf
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Serif</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Disable hinting for Bitstream Vera fonts when the size is less than 8ppem</description>
-<!-- 
-	The Bitstream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn't include the right instructions in the 'prep' table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Disable hinting for CJK fonts</description>
-<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Kochi Mincho</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Kochi Gothic</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Sazanami Mincho</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Sazanami Gothic</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Baekmuk Batang</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Baekmuk Dotum</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Baekmuk Gulim</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Baekmuk Headline</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL Mingti2L Big5</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL ShanHeiSun Uni</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL KaitiM Big5</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL ZenKai Uni</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL SungtiL GB</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>AR PL KaitiM GB</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>ZYSong18030</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/30-metric-aliases.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/30-metric-aliases.conf
@ -1,634 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set substitutions for similar/metric-compatible families</description>
-
-<!--
-
-Alias similar/metric-compatible families from various sources:
-
-PostScript fonts:       URW fonts:           GUST fonts:        Windows fonts:
-======================  ==================  =================  ==================
-Helvetica               Nimbus Sans         TeX Gyre Heros
-Helvetica Narrow        Nimbus Sans Narrow  TeX Gyre Heros Cn
-Times                   Nimbus Roman        TeX Gyre Termes
-Courier                 Nimbus Mono PS      TeX Gyre Cursor
-ITC Avant Garde Gothic  URW Gothic          TeX Gyre Adventor
-ITC Bookman             URW Bookman         TeX Gyre Bonum     Bookman Old Style
-ITC Zapf Chancery       Z003                TeX Gyre Chorus
-Palatino                P052                TeX Gyre Pagella   Palatino Linotype
-New Century Schoolbook  C059                TeX Gyre Schola    Century Schoolbook
-
-Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
-================  ======================  =======================  =================  ==============
-Arial             Liberation Sans         Arimo                    Albany             Albany AMT
-Arial Narrow      Liberation Sans Narrow
-Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
-Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
-Cambria                                   Caladea
-Calibri                                   Carlito
-Symbol                                    SymbolNeu
-
-Microsoft fonts:  Other fonts:
-================  ============
-Georgia           Gelasio
-
-We want for each of them to fallback to any of these available,
-but in an order preferring similar designs first.  We do this in three steps:
-
-1) Alias each specific to its generic family.
-   e.g. Liberation Sans to Arial
-
-2) Weak alias each generic to the other generic of its family.
-   e.g. Arial to Helvetica
-
-3) Alias each generic to its specifics.
-   e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
-
-NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
-      upstream now includes them in their release of (URW)++ Core Font Set here:
-      https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig
-->
-
-<!-- Map specifics to generics -->
-
-	<!-- PostScript -->
-	<alias binding="same">
-	  <family>Nimbus Sans L</family>
-	  <default>
-	  <family>Helvetica</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Sans</family>
-	  <default>
-	  <family>Helvetica</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Heros</family>
-	  <default>
-	  <family>Helvetica</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Sans Narrow</family>
-	  <default>
-	  <family>Helvetica Narrow</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Heros Cn</family>
-	  <default>
-	  <family>Helvetica Narrow</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Roman No9 L</family>
-	  <default>
-	  <family>Times</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Roman</family>
-	  <default>
-	  <family>Times</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Termes</family>
-	  <default>
-	  <family>Times</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Mono L</family>
-	  <default>
-	  <family>Courier</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Mono</family>
-	  <default>
-	  <family>Courier</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Nimbus Mono PS</family>
-	  <default>
-	  <family>Courier</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Cursor</family>
-	  <default>
-	  <family>Courier</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Avant Garde</family>
-	  <default>
-	  <family>ITC Avant Garde Gothic</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Gothic L</family>
-	  <default>
-	  <family>ITC Avant Garde Gothic</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Gothic</family>
-	  <default>
-	  <family>ITC Avant Garde Gothic</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Adventor</family>
-	  <default>
-	  <family>ITC Avant Garde Gothic</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Bookman</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Bookman L</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Bookman URW</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Bookman</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Bonum</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Bookman Old Style</family>
-	  <default>
-	  <family>ITC Bookman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Zapf Chancery</family>
-	  <default>
-	  <family>ITC Zapf Chancery</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Chancery L</family>
-	  <default>
-	  <family>ITC Zapf Chancery</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Chancery URW</family>
-	  <default>
-	  <family>ITC Zapf Chancery</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Z003</family>
-	  <default>
-	  <family>ITC Zapf Chancery</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Chorus</family>
-	  <default>
-	  <family>ITC Zapf Chancery</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>URW Palladio L</family>
-	  <default>
-	  <family>Palatino</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Palladio URW</family>
-	  <default>
-	  <family>Palatino</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>P052</family>
-	  <default>
-	  <family>Palatino</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Pagella</family>
-	  <default>
-	  <family>Palatino</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Palatino Linotype</family>
-	  <default>
-	  <family>Palatino</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Century Schoolbook L</family>
-	  <default>
-	  <family>New Century Schoolbook</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Century SchoolBook URW</family>
-	  <default>
-	  <family>New Century Schoolbook</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>C059</family>
-	  <default>
-	  <family>New Century Schoolbook</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>TeX Gyre Schola</family>
-	  <default>
-	  <family>New Century Schoolbook</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Century Schoolbook</family>
-	  <default>
-	  <family>New Century Schoolbook</family>
-	  </default>
-	</alias>
-
-	<!-- Microsoft -->
-	<alias binding="same">
-	  <family>Arimo</family>
-	  <default>
-	    <family>Arial</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Liberation Sans</family>
-	  <default>
-	  <family>Arial</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Liberation Sans Narrow</family>
-	  <default>
-	    <family>Arial Narrow</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Albany</family>
-	  <default>
-	  <family>Arial</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Albany AMT</family>
-	  <default>
-	  <family>Arial</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Tinos</family>
-	  <default>
-	    <family>Times New Roman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Liberation Serif</family>
-	  <default>
-	  <family>Times New Roman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Thorndale</family>
-	  <default>
-	  <family>Times New Roman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Thorndale AMT</family>
-	  <default>
-	  <family>Times New Roman</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Cousine</family>
-	  <default>
-	    <family>Courier New</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Liberation Mono</family>
-	  <default>
-	  <family>Courier New</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Cumberland</family>
-	  <default>
-	  <family>Courier New</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Cumberland AMT</family>
-	  <default>
-	  <family>Courier New</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Gelasio</family>
-	  <default>
-	  <family>Georgia</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Caladea</family>
-	  <default>
-	  <family>Cambria</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>Carlito</family>
-	  <default>
-	  <family>Calibri</family>
-	  </default>
-	</alias>
-
-	<alias binding="same">
-	  <family>SymbolNeu</family>
-	  <default>
-	  <family>Symbol</family>
-	  </default>
-  </alias>
-
-<!-- Accept the other group as fallback -->
-
-	<!-- PostScript -->
-	<alias>
-	  <family>Helvetica</family>
-	  <default>
-	  <family>Arial</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Helvetica Narrow</family>
-	  <default>
-	  <family>Arial Narrow</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Times</family>
-	  <default>
-	  <family>Times New Roman</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Courier</family>
-	  <default>
-	  <family>Courier New</family>
-	  </default>
-	</alias>
-
-	<!-- Microsoft -->
-	<alias>
-	  <family>Arial</family>
-	  <default>
-	  <family>Helvetica</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Arial Narrow</family>
-	  <default>
-	  <family>Helvetica Narrow</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Times New Roman</family>
-	  <default>
-	  <family>Times</family>
-	  </default>
-	</alias>
-
-	<alias>
-	  <family>Courier New</family>
-	  <default>
-	  <family>Courier</family>
-	  </default>
-	</alias>
-
-<!-- Map generics to specifics -->
-
-	<!-- PostScript -->
-	<alias binding="same">
-	  <family>Helvetica</family>
-	  <accept>
-	  <family>TeX Gyre Heros</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Helvetica Narrow</family>
-	  <accept>
-	  <family>TeX Gyre Heros Cn</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Times</family>
-	  <accept>
-	  <family>TeX Gyre Termes</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Courier</family>
-	  <accept>
-	  <family>TeX Gyre Cursor</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>ITC Avant Garde Gothic</family>
-	  <accept>
-	  <family>TeX Gyre Adventor</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>ITC Bookman</family>
-	  <accept>
-	  <family>Bookman Old Style</family>
-	  <family>TeX Gyre Bonum</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>ITC Zapf Chancery</family>
-	  <accept>
-	  <family>TeX Gyre Chorus</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Palatino</family>
-	  <accept>
-	  <family>Palatino Linotype</family>
-	  <family>TeX Gyre Pagella</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>New Century Schoolbook</family>
-	  <accept>
-	  <family>Century Schoolbook</family>
-	  <family>TeX Gyre Schola</family>
-	  </accept>
-	</alias>
-
-	<!-- Microsoft -->
-	<alias binding="same">
-	  <family>Arial</family>
-	  <accept>
-	    <family>Arimo</family>
-	    <family>Liberation Sans</family>
-	    <family>Albany</family>
-	    <family>Albany AMT</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Arial Narrow</family>
-	  <accept>
-	    <family>Liberation Sans Narrow</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Times New Roman</family>
-	  <accept>
-	    <family>Tinos</family>
-	    <family>Liberation Serif</family>
-	    <family>Thorndale</family>
-	    <family>Thorndale AMT</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Courier New</family>
-	  <accept>
-	    <family>Cousine</family>
-	    <family>Liberation Mono</family>
-	    <family>Cumberland</family>
-	    <family>Cumberland AMT</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Georgia</family>
-	  <accept>
-	    <family>Gelasio</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Cambria</family>
-	  <accept>
-	    <family>Caladea</family>
-	  </accept>
-	</alias>
-
-	<alias binding="same">
-	  <family>Calibri</family>
-	  <accept>
-	    <family>Carlito</family>
-	  </accept>
-  </alias>
-
-	<alias binding="same">
-	  <family>Symbol</family>
-	  <accept>
-	    <family>SymbolNeu</family>
-	  </accept>
-  </alias>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/40-nonlatin.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/40-nonlatin.conf
@ -1,236 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set substitutions for non-Latin fonts</description>
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
-->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Nazli</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Lotoos</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Mitra</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Ferdosi</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Badr</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Zar</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Titr</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Jadid</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Kochi Mincho</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL SungtiL GB</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL Mingti2L Big5</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>ＭＳ 明朝</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>NanumMyeongjo</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>UnBatang</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Baekmuk Batang</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>MgOpen Canonica</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Sazanami Mincho</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL ZenKai Uni</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>ZYSong18030</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>FreeSerif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>SimSun</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Arshia</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Elham</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Farnaz</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Nasim</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Sina</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Roya</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Koodak</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Terafik</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Kochi Gothic</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL KaitiM GB</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL KaitiM Big5</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>ＭＳ ゴシック</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>NanumGothic</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>UnDotum</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Baekmuk Dotum</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>MgOpen Modata</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Sazanami Gothic</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>AR PL ShanHeiSun Uni</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>ZYSong18030</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>FreeSans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
-	<alias>
-		<family>NSimSun</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>ZYSong18030</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>NanumGothicCoding</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>FreeMono</family>
-		<default><family>monospace</family></default>
-	</alias>
-
-<!--
-  Fantasy faces
- -->
-	<alias>
-		<family>Homa</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Kamran</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Fantezi</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Tabassom</family>
-		<default><family>fantasy</family></default>
-	</alias>
-
-<!--
-  Cursive faces
- -->
-	<alias>
-		<family>IranNastaliq</family>
-		<default><family>cursive</family></default>
-	</alias>
-	<alias>
-		<family>Nafees Nastaleeq</family>
-		<default><family>cursive</family></default>
-	</alias>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/45-generic.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/45-generic.conf
@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set substitutions for emoji/math fonts</description>
-
-<!-- Keep in sync with 60-generic.conf -->
-
-<!-- Emoji -->
-
-	<!-- System emoji -->
-	<alias binding="same">
-		<family>Noto Color Emoji</family> <!-- Google -->
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Apple Color Emoji</family> <!-- Apple -->
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Segoe UI Emoji</family> <!-- Microsoft -->
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Twitter Color Emoji</family> <!-- Twitter -->
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>EmojiOne Mozilla</family> <!-- Mozilla -->
-		<default><family>emoji</family></default>
-	</alias>
-	<!-- Third-party emoji -->
-	<alias binding="same">
-		<family>Emoji Two</family>
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Emoji One</family>
-		<default><family>emoji</family></default>
-	</alias>
-	<!-- B&W -->
-	<alias binding="same">
-		<family>Noto Emoji</family> <!-- Google -->
-		<default><family>emoji</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Android Emoji</family> <!-- Google -->
-		<default><family>emoji</family></default>
-	</alias>
-
-	<!-- Add language for emoji, to match other emoji fonts. -->
-	<match>
-		<test name="family">
-			<string>emoji</string>
-		</test>
-		<edit name="lang" mode="prepend">
-			<string>und-zsye</string>
-		</edit>
-	</match>
-
-	<match>
-		<test name="lang">
-			<string>und-zsye</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>emoji</string>
-		</test>
-
-		<!-- Add generic family. -->
-		<edit name="family" mode="append" binding="strong">
-			<string>emoji</string>
-		</edit>
-	</match>
-
-
-<!-- Math -->
-
-	<!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
-	<alias binding="same">
-		<family>XITS Math</family> <!-- Khaled Hosny -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>STIX Two Math</family> <!-- AMS -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Cambria Math</family> <!-- Microsoft -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Latin Modern Math</family> <!-- TeX -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Minion Math</family> <!-- Adobe -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Lucida Math</family> <!-- Adobe -->
-		<default><family>math</family></default>
-	</alias>
-	<alias binding="same">
-		<family>Asana Math</family>
-		<default><family>math</family></default>
-	</alias>
-
-	<!-- Add language for math, to match other math fonts. -->
-	<match>
-		<test name="family">
-			<string>math</string>
-		</test>
-		<edit name="lang" mode="prepend">
-			<string>und-zmth</string>
-		</edit>
-	</match>
-
-	<match>
-		<test name="lang">
-			<string>und-zmth</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>math</string>
-		</test>
-
-		<!-- Add generic family -->
-		<edit name="family" mode="append" binding="strong">
-			<string>math</string>
-		</edit>
-	</match>
-
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/45-latin.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/45-latin.conf
@ -1,278 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set substitutions for Latin fonts</description>
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
-->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Serif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Cambria</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Constantia</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>DejaVu Serif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Elephant</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Garamond</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Georgia</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Liberation Serif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Luxi Serif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>MS Serif</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Roman No9 L</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Roman</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Palatino Linotype</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Thorndale AMT</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Thorndale</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Times New Roman</family>
-		<default><family>serif</family></default>
-	</alias>
-	<alias>
-		<family>Times</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Albany AMT</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Albany</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Arial Unicode MS</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Arial</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Bitstream Vera Sans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Britannic</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Calibri</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Candara</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Century Gothic</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Corbel</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>DejaVu Sans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Helvetica</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Haettenschweiler</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Liberation Sans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>MS Sans Serif</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Sans L</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Sans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Luxi Sans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Tahoma</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Trebuchet MS</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Twentieth Century</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-	<alias>
-		<family>Verdana</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
-	<alias>
-		<family>Andale Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
- 	<alias>
-		<family>Bitstream Vera Sans Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Consolas</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Courier New</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Courier</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Cumberland AMT</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Cumberland</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>DejaVu Sans Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Fixedsys</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Inconsolata</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Liberation Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Luxi Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Mono L</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Mono</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Nimbus Mono PS</family>
-		<default><family>monospace</family></default>
-	</alias>
-	<alias>
-		<family>Terminal</family>
-		<default><family>monospace</family></default>
-	</alias>
-<!--
-  Fantasy faces
- -->
-	<alias>
-		<family>Bauhaus Std</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Cooper Std</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Copperplate Gothic Std</family>
-		<default><family>fantasy</family></default>
-	</alias>
-	<alias>
-		<family>Impact</family>
-		<default><family>fantasy</family></default>
-	</alias>
-<!--
-  Cursive faces
-  -->
-	<alias>
-		<family>Comic Sans MS</family>
-		<default><family>cursive</family></default>
-	</alias>
-	<alias>
-		<family>ITC Zapf Chancery Std</family>
-		<default><family>cursive</family></default>
-	</alias>
-	<alias>
-		<family>Zapfino</family>
-		<default><family>cursive</family></default>
-	</alias>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/49-sansserif.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/49-sansserif.conf
@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Add sans-serif to the family when no generic name</description>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/50-user.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/50-user.conf
@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Load per-user customization files</description>
-	<!--
-	    Load per-user customization files where stored on XDG Base Directory
-	    specification compliant places. it should be usually:
-	      $HOME/.config/fontconfig/conf.d
-	      $HOME/.config/fontconfig/fonts.conf
-	-->
-	<include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
-	<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
-	<!-- the following elements will be removed in the future -->
-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/51-local.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/51-local.conf
@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Load local customization file</description>
-	<!-- Load local system customization file -->
-	<include ignore_missing="yes">local.conf</include>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-sans-mono.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-sans-mono.conf
@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/57-dejavu-sans-mono.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu Sans Mono.
-
-     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>Bepa Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono</family>
-    </prefer>
-  </alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-sans.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-sans.conf
@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/57-dejavu-sans.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu Sans.
-
-     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>Arev Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bepa</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Verajja</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
-  <alias binding="same">
-    <family>VerajjaPDA</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans</family>
-    </prefer>
-  </alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-serif.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/57-dejavu-serif.conf
@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/57-dejavu-serif.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu Serif.
-
-     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>Bitstream Prima Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
-  <alias binding="same">
-    <family>Verajja Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif</family>
-    </prefer>
-  </alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/60-generic.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/60-generic.conf
@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set preferable fonts for emoji/math fonts</description>
-<!-- Keep in sync with 45-generic.conf -->
-
-<!-- Emoji -->
-
-	<!-- Prefer to match color emoji font. -->
-	<match>
-		<test name="lang">
-			<string>und-zsye</string>
-		</test>
-		<test qual="all" name="color" compare="not_eq">
-			<bool>true</bool>
-		</test>
-		<test qual="all" name="color" compare="not_eq">
-			<bool>false</bool>
-		</test>
-		<edit name="color" mode="append">
-			<bool>true</bool>
-		</edit>
-	</match>
-
-	<!-- TODO
-	 ! Match on "color" and alias B&W ones first if no color is requested.
-	 ! That's "hard" because <alias> doesn't work in match and needs to be
-	 ! expanded to its non-sugar form.
-	 !-->
-	<alias binding="same">
-		<family>emoji</family>
-		<prefer>
-			<!-- System fonts -->
-			<family>Noto Color Emoji</family> <!-- Google -->
-			<family>Apple Color Emoji</family> <!-- Apple -->
-			<family>Segoe UI Emoji</family> <!-- Microsoft -->
-			<family>Twitter Color Emoji</family> <!-- Twitter -->
-			<family>EmojiOne Mozilla</family> <!-- Mozilla -->
-			<!-- Third-Party fonts -->
-			<family>Emoji Two</family>
-			<family>Emoji One</family>
-			<!-- Non-color -->
-			<family>Noto Emoji</family> <!-- Google -->
-			<family>Android Emoji</family> <!-- Google -->
-		</prefer>
-	</alias>
-
-<!-- Math -->
-	<alias binding="same">
-		<!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
-		<family>math</family>
-		<prefer>
-			<family>XITS Math</family> <!-- Khaled Hosny -->
-			<family>STIX Two Math</family> <!-- AMS -->
-			<family>Cambria Math</family> <!-- Microsoft -->
-			<family>Latin Modern Math</family> <!-- TeX -->
-			<family>Minion Math</family> <!-- Adobe -->
-			<family>Lucida Math</family> <!-- Adobe -->
-			<family>Asana Math</family>
-		</prefer>
-	</alias>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/60-latin.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/60-latin.conf
@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set preferable fonts for Latin</description>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Bitstream Vera Serif</family>
-			<family>DejaVu Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Nimbus Roman</family>
-			<family>Times</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Bitstream Vera Sans</family>
-			<family>DejaVu Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Nimbus Sans</family>
-			<family>Helvetica</family>
-			<family>Lucida Sans Unicode</family>
-			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
-			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>DejaVu Sans Mono</family>
-			<family>Inconsolata</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Nimbus Mono</family>
-			<family>Nimbus Mono PS</family>
-			<family>Courier</family>
-		</prefer>
-	</alias>
-<!--
-  Fantasy faces
- -->
- 	<alias>
-		<family>fantasy</family>
-		<prefer>
-			<family>Impact</family>
-			<family>Copperplate Gothic Std</family>
-			<family>Cooper Std</family>
-			<family>Bauhaus Std</family>
-		</prefer>
-	</alias>
-<!--
-  Cursive faces
-  -->
-	<alias>
-		<family>cursive</family>
-		<prefer>
-			<family>ITC Zapf Chancery Std</family>
-			<family>Zapfino</family>
-			<family>Comic Sans MS</family>
-		</prefer>
-	</alias>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/65-fonts-persian.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/65-fonts-persian.conf
@ -1,423 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!--
-  fonts-persian.conf
-  To configure Persian fonts from The FarsiWeb Project.
-
-  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-
-  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-
-  ChangeLog:
-    2005-04-03  Behdad Esfahbod:  Initial revision.
-    2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
-    2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
-    2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
-  -->
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-
-
-<!-- Deprecated fonts are discouraged -->
-
-	<!-- Nesf[2] is officially deprecated and has problematic tables -->
-	<alias binding="same">
-	  <family>Nesf</family>
-	  <accept><family>Nesf2</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Nesf2</family>
-	  <accept><family>Persian_sansserif_default</family></accept>
-	</alias>
-
-<!-- Name changes and spelling variant aliases -->
-
-	<alias binding="same">
-	  <family>Nazanin</family>
-	  <accept><family>Nazli</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Lotus</family>
-	  <accept><family>Lotoos</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Yaqut</family>
-	  <accept><family>Yaghoot</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Yaghut</family>
-	  <accept><family>Yaghoot</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Traffic</family>
-	  <accept><family>Terafik</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Ferdowsi</family>
-	  <accept><family>Ferdosi</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Fantezy</family>
-	  <accept><family>Fantezi</family></accept>
-	</alias>
-
-
-<!-- Classify fonts. -->
-
-	<!-- Persian_title class -->
-	<alias binding="same">
-	  <family>Jadid</family>
-	  <accept><family>Persian_title</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Titr</family>
-	  <accept><family>Persian_title</family></accept>
-	</alias>
-
-	<!-- Persian_fantasy class -->
-	<alias binding="same">
-	  <family>Kamran</family>
-	  <accept>
-	  <family>Persian_fantasy</family>
-	  <family>Homa</family>
-	  </accept>
-	</alias>
-	<alias binding="same">
-	  <family>Homa</family>
-	  <accept>
-	  <family>Persian_fantasy</family>
-	  <family>Kamran</family>
-	  </accept>
-	</alias>
-	<alias binding="same">
-	  <family>Fantezi</family>
-	  <accept><family>Persian_fantasy</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Tabassom</family>
-	  <accept><family>Persian_fantasy</family></accept>
-	</alias>
-
-	<!-- Persian_square class -->
-	<alias binding="same">
-	  <family>Arshia</family>
-	  <accept><family>Persian_square</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Nasim</family>
-	  <accept><family>Persian_square</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Elham</family>
-	  <accept>
-	  <family>Persian_square</family>
-	  <family>Farnaz</family>
-	  </accept>
-	</alias>
-	<alias binding="same">
-	  <family>Farnaz</family>
-	  <accept>
-	  <family>Persian_square</family>
-	  <family>Elham</family>
-	  </accept>
-	</alias>
-	<alias binding="same">
-	  <family>Sina</family>
-	  <accept><family>Persian_square</family></accept>
-	</alias>
-
-<!-- Font ordering per class -->
-
-	<!-- Persian_title class -->
-	<alias binding="same">
-	  <family>Persian_title</family>
-	  <accept>
-	  <family>Titr</family>
-	  <family>Jadid</family>
-	  <family>Persian_serif</family>
-	  </accept>
-	</alias>
-
-	<!-- Persian_fantasy class -->
-	<alias binding="same">
-	  <family>Persian_fantasy</family>
-	  <accept>
-	  <family>Homa</family>
-	  <family>Kamran</family>
-	  <family>Fantezi</family>
-	  <family>Tabassom</family>
-	  <family>Persian_square</family>
-	  </accept>
-	</alias>
-
-	<!-- Persian_square class -->
-	<alias binding="same">
-	  <family>Persian_square</family>
-	  <accept>
-	  <family>Arshia</family>
-	  <family>Elham</family>
-	  <family>Farnaz</family>
-	  <family>Nasim</family>
-	  <family>Sina</family>
-	  <family>Persian_serif</family>
-	  </accept>
-	</alias>
-
-<!-- Register the fonts that we actually do have -->
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Elham</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Homa</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Koodak</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Nazli</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Roya</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Terafik</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="family" compare="eq" ignore-blanks="true">
-			<string>Titr</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-
-<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
-
-	<match target="font">
-		<test name="foundry">
-			<!--string>farsiweb</string-->
-			<string>TURNED-OFF</string>
-		</test>
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>-0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-
-<!--
-  We can't hint our fonts well, so turn off hinting.
-  Moreover, the bitmaps we have designed (well, they
-  have designed), suck, so disable them too.
-  -->
-
-	<match target="font">
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
- 		<edit name="embeddedbitmap">
- 			<bool>false</bool>
- 		</edit>
-	</match>
-
-
-<!-- Alias our fonts to common families -->
-
-	<!-- Persian serif fonts -->
-	<alias>
-		<family>serif</family>
-		<accept>
-			<family>Nazli</family>
-			<family>Lotoos</family>
-			<family>Mitra</family>
-			<family>Ferdosi</family>
-			<family>Badr</family>
-			<family>Zar</family>
-		</accept>
-	</alias>
-
-	<!-- Persian sans-serif fonts -->
-	<alias>
-		<family>sans-serif</family>
-		<accept>
-			<family>Roya</family>
-			<family>Koodak</family>
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian monospace fonts -->
-	<alias>
-		<family>monospace</family>
-		<accept>
-			<!-- Not really monospace -->
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian fantasy fonts -->
-	<alias>
-		<family>fantasy</family>
-		<accept>
-			<family>Homa</family>
-			<family>Kamran</family>
-			<family>Fantezi</family>
-			<family>Tabassom</family>
-		</accept>
-	</alias>
-
-	<!-- Persian (and Urdu) Nastaliq/cursive fonts -->
-	<alias>
-		<family>cursive</family>
-		<accept>
-			<family>IranNastaliq</family>
-			<family>Nafees Nastaleeq</family>
-		</accept>
-	</alias>
-
-<!-- Use Titr in titles -->
-
-	<!-- Both serif... -->
-	<match>
-		<test name="family">
-			<string>serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and sans-serif. -->
-	<match>
-		<test name="family">
-			<string>sans-serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and more. -->
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend" binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-
-<!-- Default substituted for deprecated sans-serif fonts -->
-
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Roya</string>
-		</edit>
-	</match>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/65-khmer.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/65-khmer.conf
@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Khmer OS"</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Khmer OS"</family>
-		</prefer>
-	</alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/65-nonlatin.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/65-nonlatin.conf
@ -1,200 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Set preferable fonts for non-Latin</description>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Artsounk</family> <!-- armenian -->
-			<family>BPG UTF8 M</family> <!-- georgian -->
-			<family>Kinnari</family> <!-- thai -->
-			<family>Norasi</family> <!-- thai -->
-			<family>Frank Ruehl</family> <!-- hebrew -->
-			<family>Dror</family>  <!-- hebrew -->
-			<family>JG LaoTimes</family>  <!-- lao -->
-			<family>Saysettha Unicode</family>  <!-- lao -->
-			<family>Pigiarniq</family> <!-- canadian syllabics -->
-			<family>B Davat</family> <!-- arabic (fa) -->
-			<family>B Compset</family>  <!-- arabic (fa) -->
-			<family>Kacst-Qr</family> <!-- arabic (ar) -->
-			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
-			<family>Raghindi</family> <!-- devanagari -->
-			<family>Mukti Narrow</family> <!-- bengali -->
-			<family>malayalam</family> <!-- malayalam -->
-			<family>Sampige</family> <!-- kannada -->
-			<family>padmaa</family> <!-- gujarati -->
-			<family>Hapax Berbère</family> <!-- tifinagh -->
-			<family>MS Mincho</family> <!-- han (ja) -->
-			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
-			<family>PMingLiu</family> <!-- han (zh-tw) -->
-			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
-			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
-			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
-			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
-			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
-			<family>MgOpen Canonica</family>
-			<family>Sazanami Mincho</family>
-			<family>IPAMonaMincho</family>
-			<family>IPAMincho</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
- 			<family>AR PL Zenkai Uni</family>
-			<family>ＭＳ 明朝</family>
- 			<family>ZYSong18030</family>
-			<family>NanumMyeongjo</family> <!-- hangul (ko) -->
-			<family>UnBatang</family> <!-- hangul (ko) -->
-			<family>Baekmuk Batang</family> <!-- hangul (ko) -->
- 			<family>KacstQura</family>
- 			<family>Frank Ruehl CLM</family>
-			<family>Lohit Bengali</family>
- 			<family>Lohit Gujarati</family>
- 			<family>Lohit Hindi</family>
-			<family>Lohit Marathi</family>
-			<family>Lohit Maithili</family>
-			<family>Lohit Kashmiri</family>
-			<family>Lohit Konkani</family>
-			<family>Lohit Nepali</family>
-			<family>Lohit Sindhi</family>
- 			<family>Lohit Punjabi</family>
- 			<family>Lohit Tamil</family>
-			<family>Meera</family>
-			<family>Lohit Malayalam</family>
- 			<family>Lohit Kannada</family>
- 			<family>Lohit Telugu</family>
- 			<family>Lohit Oriya</family>
- 			<family>LKLUG</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Nachlieli</family> <!-- hebrew -->
-			<family>Lucida Sans Unicode</family>
-			<family>Yudit Unicode</family>
-			<family>Kerkis</family> <!-- greek -->
-			<family>ArmNet Helvetica</family> <!-- armenian -->
-			<family>Artsounk</family> <!-- armenian -->
-			<family>BPG UTF8 M</family> <!-- georgian -->
-			<family>Waree</family> <!-- thai -->
-			<family>Loma</family> <!-- thai -->
-			<family>Garuda</family> <!-- thai -->
-			<family>Umpush</family> <!-- thai -->
-			<family>Saysettha Unicode</family> <!-- lao? -->
-			<family>JG Lao Old Arial</family> <!-- lao -->
-			<family>GF Zemen Unicode</family> <!-- ethiopic -->
-			<family>Pigiarniq</family> <!-- canadian syllabics -->
-			<family>B Davat</family> <!-- arabic (fa) -->
-			<family>B Compset</family> <!-- arabic (fa) -->
-			<family>Kacst-Qr</family> <!-- arabic (ar) -->
-			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
-			<family>Raghindi</family> <!-- devanagari -->
-			<family>Mukti Narrow</family> <!-- bengali -->
-			<family>malayalam</family> <!-- malayalam -->
-			<family>Sampige</family> <!-- kannada -->
-			<family>padmaa</family> <!-- gujarati -->
-			<family>Hapax Berbère</family> <!-- tifinagh -->
-			<family>MS Gothic</family> <!-- han (ja) -->
-			<family>UmePlus P Gothic</family> <!-- han (ja) -->
-			<family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
-			<family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
-			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
-			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
-			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
-			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
-			<family>MgOpen Modata</family>
-			<family>VL Gothic</family>
-			<family>IPAMonaGothic</family>
-			<family>IPAGothic</family>
-			<family>Sazanami Gothic</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
- 			<family>AR PL ShanHeiSun Uni</family>
- 			<family>AR PL SungtiL GB</family>
- 			<family>AR PL Mingti2L Big5</family>
-			<family>ＭＳ ゴシック</family>
-			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-			<family>TSCu_Paranar</family> <!-- tamil -->
-			<family>NanumGothic</family> <!-- hangul (ko) -->
-			<family>UnDotum</family> <!-- hangul (ko) -->
-			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
- 			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
- 			<family>KacstQura</family>
-			<family>Lohit Bengali</family>
- 			<family>Lohit Gujarati</family>
- 			<family>Lohit Hindi</family>
-			<family>Lohit Marathi</family>
-			<family>Lohit Maithili</family>
-			<family>Lohit Kashmiri</family>
-			<family>Lohit Konkani</family>
-			<family>Lohit Nepali</family>
-			<family>Lohit Sindhi</family>
- 			<family>Lohit Punjabi</family>
- 			<family>Lohit Tamil</family>
-			<family>Meera</family>
- 			<family>Lohit Malayalam</family>
- 			<family>Lohit Kannada</family>
- 			<family>Lohit Telugu</family>
- 			<family>Lohit Oriya</family>
- 			<family>LKLUG</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Miriam Mono</family> <!-- hebrew -->
-			<family>VL Gothic</family>
-			<family>IPAMonaGothic</family>
-			<family>IPAGothic</family>
-			<family>Sazanami Gothic</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>MS Gothic</family> <!-- han (ja) -->
-			<family>UmePlus Gothic</family> <!-- han (ja) -->
-			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
-			<family>MingLiu</family> <!-- han (zh-tw) -->
-			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
-			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
-			<family>HanyiSong</family> <!-- han (zh-cn) -->
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-			<family>NanumGothicCoding</family> <!-- hangul (ko) -->
-			<family>NanumGothic</family> <!-- hangul (ko) -->
-			<family>UnDotum</family> <!-- hangul (ko) -->
-			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
-			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
-			<family>TlwgTypo</family> <!-- thai -->
-			<family>TlwgTypist</family> <!-- thai -->
-			<family>TlwgTypewriter</family> <!-- thai -->
-			<family>TlwgMono</family> <!-- thai -->
-			<family>Hasida</family> <!-- hebrew -->
-			<family>Mitra Mono</family> <!-- bengali -->
-			<family>GF Zemen Unicode</family> <!-- ethiopic -->
-			<family>Hapax Berbère</family> <!-- tifinagh -->
-			<family>Lohit Bengali</family>
-			<family>Lohit Gujarati</family>
-			<family>Lohit Hindi</family>
-			<family>Lohit Marathi</family>
-			<family>Lohit Maithili</family>
-			<family>Lohit Kashmiri</family>
-			<family>Lohit Konkani</family>
-			<family>Lohit Nepali</family>
-			<family>Lohit Sindhi</family>
-			<family>Lohit Punjabi</family>
-			<family>Lohit Tamil</family>
-			<family>Meera</family>
-			<family>Lohit Malayalam</family>
-			<family>Lohit Kannada</family>
-			<family>Lohit Telugu</family>
-			<family>Lohit Oriya</family>
-			<family>LKLUG</family>
-		</prefer>
-	</alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/69-unifont.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/69-unifont.conf
@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>FreeSerif</family>
-			<family>Code2000</family>
-			<family>Code2001</family> <!-- plane1 and beyond -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>FreeSans</family>
-			<family>Arial Unicode MS</family>
-			<family>Arial Unicode</family>
-			<family>Code2000</family> <!-- almost everything; serif actually -->
-			<family>Code2001</family> <!-- plane1 and beyond -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>FreeMono</family>
-		</prefer>
-	</alias>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Reject bitmap fonts</description>
-<!-- Reject bitmap fonts -->
- <selectfont>
-  <rejectfont>
-   <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </rejectfont>
- </selectfont>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-  <description>Accept bitmap fonts</description>
-<!-- Accept bitmap fonts -->
- <selectfont>
-  <acceptfont>
-   <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </acceptfont>
- </selectfont>
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/80-delicious.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/80-delicious.conf
@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-<!-- Fix-ups for Delicious family -->
-
-<!-- Delicious 'heavy' variant says its Medium weight -->
-<match target="scan">
-	<test name="family" compare="eq" ignore-blanks="true">
-		<string>Delicious</string>
-	</test>
-	<test name="style">
-		<string>Heavy</string>
-	</test>
-	<edit name="weight">
-		<const>heavy</const>
-	</edit>
-</match>
-
-</fontconfig>
--- a/cygwin/usr/share/fontconfig/conf.avail/90-synthetic.conf
+++ b/cygwin/usr/share/fontconfig/conf.avail/90-synthetic.conf
@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
-
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-		<!-- and disable embedded bitmaps for artificial oblique -->
-		<edit name="embeddedbitmap" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
-
-	<match target="font">
-		<!-- check to see if the weight in the font is less than medium which possibly need emboldening -->
-		<test name="weight" compare="less_eq">
-			<const>medium</const>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more_eq">
-			<const>bold</const>
-		</test>
-		<!--
-		  set the embolden flag
-		  needed for applications using cairo, e.g. gucharmap, gedit, ...
-		-->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-		<!--
-		 set weight to bold
-		 needed for applications using Xft directly, e.g. Firefox, ...
-		-->
-		<edit name="weight" mode="assign">
-			<const>bold</const>
-		</edit>
-	</match>
-</fontconfig>
--- a/cygwin/usr/share/icons/hicolor/16x16/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/16x16/apps/mintty.png
--- a/cygwin/usr/share/icons/hicolor/24x24/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/24x24/apps/mintty.png
--- a/cygwin/usr/share/icons/hicolor/256x256/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/256x256/apps/mintty.png
--- a/cygwin/usr/share/icons/hicolor/32x32/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/32x32/apps/mintty.png
--- a/cygwin/usr/share/icons/hicolor/48x48/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/48x48/apps/mintty.png
--- a/cygwin/usr/share/icons/hicolor/64x64/apps/mintty.png
+++ b/cygwin/usr/share/icons/hicolor/64x64/apps/mintty.png
--- a/Show More
+++ b/Show More