]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Wed, 14 Aug 2013 20:16:44 +0000 (22:16 +0200)
committerFrank Brehm <frank@brehm-online.com>
Wed, 14 Aug 2013 20:16:44 +0000 (22:16 +0200)
81 files changed:
X11/Xresources
apache2/modules.d/00_apache_manual.conf
conf.d/saslauthd
conf.d/syslog-ng
config-archive/etc/conf.d/syslog-ng [new file with mode: 0644]
config-archive/etc/conf.d/syslog-ng.dist [new file with mode: 0644]
config-archive/etc/postfix/main.cf
config-archive/etc/postfix/main.cf.1
config-archive/etc/postfix/main.cf.2
config-archive/etc/postfix/main.cf.3
config-archive/etc/postfix/main.cf.4
config-archive/etc/postfix/main.cf.5
config-archive/etc/postfix/main.cf.6 [new file with mode: 0644]
config-archive/etc/postfix/main.cf.dist
config-archive/etc/smartd.conf [new file with mode: 0644]
config-archive/etc/smartd.conf.dist [new file with mode: 0644]
config-archive/etc/syslog-ng/syslog-ng.conf
config-archive/etc/syslog-ng/syslog-ng.conf.1 [new file with mode: 0644]
config-archive/etc/syslog-ng/syslog-ng.conf.dist [new file with mode: 0644]
config-archive/etc/syslog-ng/syslog-ng.conf.dist.new [deleted file]
config-archive/usr/share/config/kdm/kdmrc.dist.new
cron.daily/hplip_cron [deleted file]
csh.env
cups/printers.conf
cups/subscriptions.conf
env.d/05binutils
env.d/binutils/config-x86_64-pc-linux-gnu
env.d/binutils/x86_64-pc-linux-gnu-2.22 [deleted file]
env.d/binutils/x86_64-pc-linux-gnu-2.23.1 [new file with mode: 0644]
etckeeper/commit.d/99push [new file with mode: 0755]
etckeeper/etckeeper.conf
etckeeper/pre-commit.d/30store-metadata
etckeeper/uninit.d/50vcs-uninit
etckeeper/update-ignore.d/01update-ignore
fonts/infinality/conf.src/40-repl-generic.conf
fonts/infinality/conf.src/41-repl-os-inf.conf
fonts/infinality/conf.src/41-repl-os-linux.conf
fonts/infinality/conf.src/41-repl-os-osx.conf
fonts/infinality/conf.src/41-repl-os-win.conf
fonts/infinality/conf.src/60-group-non-tt-fonts.conf
fonts/infinality/conf.src/60-group-tt-fonts.conf
fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf [new file with mode: 0644]
fonts/infinality/conf.src/62-tt-monospace-rendering.conf
fonts/infinality/conf.src/62-tt-traced-bitmap-rendering.conf
fonts/infinality/conf.src/80-selective-rendering-inf-win-lin.conf
fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk [new file with mode: 0644]
fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list [new file with mode: 0644]
fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk [new file with mode: 0644]
fonts/infinality/conf.src/generate60/60-group-tt-fonts.list [new file with mode: 0644]
fonts/infinality/conf.src/generate60/generate60.sh [new file with mode: 0644]
fonts/infinality/infinality.conf
fonts/infinality/styles.conf.avail/nyx/30-non-latin-nyx.conf
fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf [deleted symlink]
fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf [new symlink]
gconf/gconf.xml.defaults/%gconf-tree.xml
gentoo/gentoogtkrc
gentoo/gentoorc
hp/hplip.conf
init.d/cpufrequtils
init.d/dmcrypt [deleted file]
init.d/g15daemon
init.d/saslauthd
init.d/syslog-ng
portage/make.conf
portage/package.keywords
portage/package.mask
portage/package.use
postfix/main.cf
profile.env
resolv.conf
revdep-rebuild/61-icedtea-bin-6
smartd.conf
smartd_warning.sh [new file with mode: 0755]
speech-dispatcher/modules/cicero.conf
speech-dispatcher/modules/espeak.conf
speech-dispatcher/speechd.conf
syslog-ng/modules.conf [deleted file]
syslog-ng/scl.conf
syslog-ng/syslog-ng.conf
whois.conf
xdg/autostart/hplip-systray.desktop

index d34e00121d3f97034d24f413a71a27320bf06181..c65472e240011038ca317ce6af60cead0cb2265d 100644 (file)
@@ -1,27 +1,4 @@
-#################################################################
-################## EXPLANATION OF SETTINGS ######################
-#################################################################
-
-# XFT settings are like a red-headed stepchild that should be beaten severely.
-# These only affect legacy programs, and *parts* of some modern programs like
-# google-chrome.  We only deal with these settings because we have to, otherwise
-# crap will slip by.  I recommend using hintslight and autohint as the defaults
-# normally in local.conf.  The reason hintfull and autohint:0 is needed here
-# because otherwise some programs will occassionally request slight hinting for
-# a truetype font. When a program does this, Freetype automatically uses the
-# autohinter, when you may actually want it to be rendered with the TT hinter,
-# (if specified in local.conf).  So setting this to hintfull guarantees that the
-# TT font will be rendered with the TT hinter (assuming it is specified in
-# /etc/fonts/local.conf to be rendered that way.)  For TT fonts that you want
-# rendered with autohint, specifiying that in the /etc/fonts/local.conf
-# should be enough.  But you might think that by setting this to hintfull
-# that it's going to use Freetype's full autohinting (which we *completely*
-# avoid) for fonts you want autohinted.  This is where
-# INFINALITY_FT_AUTOFIT_FORCE_SLIGHT_HINTING comes in.  It tells freetype to
-# use slight hinting on fonts set for autohinting, even if the program requests
-# full autohinting.  Freetype's full hinting only looks OK under certain
-# circumstances.  The goal of infinality is to make infinality hinting look
-# good all the time.
+! basic settings for infinality
 
 Xft.antialias:  1
 Xft.autohint:   0
index a0e5c830918907ce27284c08ba0eb76044f03f08..d1f11402720f59f5b6b2b48a9c33a5b5e93d46ec 100644 (file)
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.24/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.24/manual">
+<Directory "/usr/share/doc/apache-2.2.25/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny
index 3f2653c552937ffa6e529bbee63c1825e816897e..1eeaa483df093430a0e9ed3ea283021979a9486d 100644 (file)
@@ -1,25 +1,21 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.2 2007/04/07 13:03:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf,v 1.1 2013/07/13 12:01:10 pacho Exp $
 
-# Config file for /etc/init.d/saslauthd
+# Config file for /etc/init.d/saslauthd and systemd unit
 
-# Initial (empty) options.
-SASLAUTHD_OPTS=""
+# PLEASE READ THIS IF YOU ARE USING SYSTEMD
+# Please note that systemd does not expand shell variables
+# thus, something like FOO="${FOO} bar" won't work.
 
 # Specify the authentications mechanism.
 # **NOTE** For a list see: saslauthd -v
 # Since 2.1.19, add "-r" to options for old behavior,
 # ie. reassemble user and realm to user@realm form.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r"
-SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam"
-
-# Specify the hostname for remote IMAP server.
-# **NOTE** Only needed if rimap auth mechanism is used.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
-
-# Specify the number of worker processes to create.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
-
-# Enable credential cache, set cache size and timeout.
-# **NOTE** Size is measured in kilobytes. 
-#          Timeout is measured in seconds.
-#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"
+#
+# Specify the hostname for remote IMAP server using:
+# "-O localhost".
+# Specify the number of worker processes to create using:
+# "-n <N>".
+# Enable credential cache, set cache size and timeout using:
+# "-c -s <cache size, like 128> -t <timeout seconds>".
+# 
+SASLAUTHD_OPTS="-a pam"
index 9c7eade5cbbbd4ccd9e492c31064d2777bc68f55..6a437d1bf36fd828b0ec8c742cb8af76bf7e90d1 100644 (file)
@@ -1,8 +1,42 @@
 # Config file for /etc/init.d/syslog-ng
 
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/var/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
 # Put any additional options for syslog-ng here.
 # See syslog-ng(8) for more information.
 
-#rc_after="net"
-
 SYSLOG_NG_OPTS=""
diff --git a/config-archive/etc/conf.d/syslog-ng b/config-archive/etc/conf.d/syslog-ng
new file mode 100644 (file)
index 0000000..9c7eade
--- /dev/null
@@ -0,0 +1,8 @@
+# Config file for /etc/init.d/syslog-ng
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+#rc_after="net"
+
+SYSLOG_NG_OPTS=""
diff --git a/config-archive/etc/conf.d/syslog-ng.dist b/config-archive/etc/conf.d/syslog-ng.dist
new file mode 100644 (file)
index 0000000..6a437d1
--- /dev/null
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/var/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
index c438ed096dbd8eb58c3eb896c43f5e1a75ebd296..1232f4780278995ef5a64467effe1633c0dd2068 100644 (file)
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.9.5/html
+html_directory = /usr/share/doc/postfix-2.10.0/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.9.5/readme
+readme_directory = /usr/share/doc/postfix-2.10.0/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
index c1606d6e1899dda3a1291ab97ea3ba3edd30fd50..c438ed096dbd8eb58c3eb896c43f5e1a75ebd296 100644 (file)
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.9.4/html
+html_directory = /usr/share/doc/postfix-2.9.5/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,11 +658,11 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.9.4/readme
+readme_directory = /usr/share/doc/postfix-2.9.5/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
-smtpd_sasl2_auth_enable = yes
+#smtpd_sasl2_auth_enable = yes
 smtpd_sasl_security_options = noanonymous
 broken_sasl_auth_clients = yes
 smtpd_sasl_local_domain = $myhostname
index 22ce437315d6da6fa033208c45656a99e2824738..c1606d6e1899dda3a1291ab97ea3ba3edd30fd50 100644 (file)
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.9.3/html
+html_directory = /usr/share/doc/postfix-2.9.4/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.9.3/readme
+readme_directory = /usr/share/doc/postfix-2.9.4/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
index 03fb0bfa6fae81fca0290a22e00b561185b27819..22ce437315d6da6fa033208c45656a99e2824738 100644 (file)
@@ -39,7 +39,7 @@ command_directory = /usr/sbin
 # daemon programs (i.e. programs listed in the master.cf file). This
 # directory must be owned by root.
 #
-daemon_directory = /usr/lib64/postfix
+daemon_directory = /usr/libexec/postfix
 
 # The data_directory parameter specifies the location of Postfix-writable
 # data files (caches, random numbers). This directory must be owned
@@ -463,7 +463,12 @@ mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64
 # the main.cf file, otherwise the SMTP server will reject mail for    
 # non-UNIX accounts with "User unknown in local recipient table".
 #
-#mailbox_transport = lmtp:unix:/file/name
+# Cyrus IMAP over LMTP. Specify ``lmtpunix      cmd="lmtpd"
+# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
+#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp
+#
+# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
+# subsequent line in master.cf.
 #mailbox_transport = cyrus
 
 # The fallback_transport specifies the optional transport in master.cf
@@ -640,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.8.9/html
+html_directory = /usr/share/doc/postfix-2.9.3/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -653,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.8.9/readme
+readme_directory = /usr/share/doc/postfix-2.9.3/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
index 76d1551dda6c859ecd070fa6854ce4200fd9139a..03fb0bfa6fae81fca0290a22e00b561185b27819 100644 (file)
@@ -640,7 +640,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.8.7/html
+html_directory = /usr/share/doc/postfix-2.8.9/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -653,7 +653,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.8.7/readme
+readme_directory = /usr/share/doc/postfix-2.8.9/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
index dba4ff004da5ca7cf91cfb9b30a7415f72ef9938..76d1551dda6c859ecd070fa6854ce4200fd9139a 100644 (file)
@@ -264,7 +264,7 @@ unknown_local_recipient_reject_code = 550
 #mynetworks = 168.100.189.0/28, 127.0.0.0/8
 #mynetworks = $config_directory/mynetworks
 #mynetworks = hash:/etc/postfix/network_table
-mynetworks = 10.12.11.0/24
+mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64
 
 # The relay_domains parameter restricts what destinations this system will
 # relay mail to.  See the smtpd_recipient_restrictions description in
diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6
new file mode 100644 (file)
index 0000000..dba4ff0
--- /dev/null
@@ -0,0 +1,692 @@
+# Global Postfix configuration file. This file lists only a subset
+# of all parameters. For the syntax, and for a complete parameter
+# list, see the postconf(5) manual page (command: "man 5 postconf").
+#
+# For common configuration examples, see BASIC_CONFIGURATION_README
+# and STANDARD_CONFIGURATION_README. To find these documents, use
+# the command "postconf html_directory readme_directory", or go to
+# http://www.postfix.org/.
+#
+# For best results, change no more than 2-3 parameters at a time,
+# and test if Postfix still works after every change.
+
+# SOFT BOUNCE
+#
+# The soft_bounce parameter provides a limited safety net for
+# testing.  When soft_bounce is enabled, mail will remain queued that
+# would otherwise bounce. This parameter disables locally-generated
+# bounces, and prevents the SMTP server from rejecting mail permanently
+# (by changing 5xx replies into 4xx replies). However, soft_bounce
+# is no cure for address rewriting mistakes or mail routing mistakes.
+#
+#soft_bounce = no
+
+# LOCAL PATHNAME INFORMATION
+#
+# The queue_directory specifies the location of the Postfix queue.
+# This is also the root directory of Postfix daemons that run chrooted.
+# See the files in examples/chroot-setup for setting up Postfix chroot
+# environments on different UNIX systems.
+#
+queue_directory = /var/spool/postfix
+
+# The command_directory parameter specifies the location of all
+# postXXX commands.
+#
+command_directory = /usr/sbin
+
+# The daemon_directory parameter specifies the location of all Postfix
+# daemon programs (i.e. programs listed in the master.cf file). This
+# directory must be owned by root.
+#
+daemon_directory = /usr/lib64/postfix
+
+# The data_directory parameter specifies the location of Postfix-writable
+# data files (caches, random numbers). This directory must be owned
+# by the mail_owner account (see below).
+#
+data_directory = /var/lib/postfix
+
+# QUEUE AND PROCESS OWNERSHIP
+#
+# The mail_owner parameter specifies the owner of the Postfix queue
+# and of most Postfix daemon processes.  Specify the name of a user
+# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS
+# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In
+# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED
+# USER.
+#
+mail_owner = postfix
+
+# The default_privs parameter specifies the default rights used by
+# the local delivery agent for delivery to external file or command.
+# These rights are used in the absence of a recipient user context.
+# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
+#
+#default_privs = nobody
+
+# INTERNET HOST AND DOMAIN NAMES
+# 
+# The myhostname parameter specifies the internet hostname of this
+# mail system. The default is to use the fully-qualified domain name
+# from gethostname(). $myhostname is used as a default value for many
+# other configuration parameters.
+#
+#myhostname = host.domain.tld
+#myhostname = virtual.domain.tld
+myhostname = bruni.home.brehm-online.com
+
+# The mydomain parameter specifies the local internet domain name.
+# The default is to use $myhostname minus the first component.
+# $mydomain is used as a default value for many other configuration
+# parameters.
+#
+#mydomain = domain.tld
+mydomain = home.brehm-online.com
+
+# SENDING MAIL
+# 
+# The myorigin parameter specifies the domain that locally-posted
+# mail appears to come from. The default is to append $myhostname,
+# which is fine for small sites.  If you run a domain with multiple
+# machines, you should (1) change this to $mydomain and (2) set up
+# a domain-wide alias database that aliases each user to
+# user@that.users.mailhost.
+#
+# For the sake of consistency between sender and recipient addresses,
+# myorigin also specifies the default domain name that is appended
+# to recipient addresses that have no @domain part.
+#
+#myorigin = $myhostname
+#myorigin = $mydomain
+myorigin = brehm-online.com
+
+# RECEIVING MAIL
+
+# The inet_interfaces parameter specifies the network interface
+# addresses that this mail system receives mail on.  By default,
+# the software claims all active interfaces on the machine. The
+# parameter also controls delivery of mail to user@[ip.address].
+#
+# See also the proxy_interfaces parameter, for network addresses that
+# are forwarded to us via a proxy or network address translator.
+#
+# Note: you need to stop/start Postfix when this parameter changes.
+#
+#inet_interfaces = all
+#inet_interfaces = $myhostname
+#inet_interfaces = $myhostname, localhost
+inet_interfaces = 10.12.11.2, localhost
+
+# The proxy_interfaces parameter specifies the network interface
+# addresses that this mail system receives mail on by way of a
+# proxy or network address translation unit. This setting extends
+# the address list specified with the inet_interfaces parameter.
+#
+# You must specify your proxy/NAT addresses when your system is a
+# backup MX host for other domains, otherwise mail delivery loops
+# will happen when the primary MX host is down.
+#
+#proxy_interfaces =
+#proxy_interfaces = 1.2.3.4
+
+# The mydestination parameter specifies the list of domains that this
+# machine considers itself the final destination for.
+#
+# These domains are routed to the delivery agent specified with the
+# local_transport parameter setting. By default, that is the UNIX
+# compatible delivery agent that lookups all recipients in /etc/passwd
+# and /etc/aliases or their equivalent.
+#
+# The default is $myhostname + localhost.$mydomain.  On a mail domain
+# gateway, you should also include $mydomain.
+#
+# Do not specify the names of virtual domains - those domains are
+# specified elsewhere (see VIRTUAL_README).
+#
+# Do not specify the names of domains that this machine is backup MX
+# host for. Specify those names via the relay_domains settings for
+# the SMTP server, or use permit_mx_backup if you are lazy (see
+# STANDARD_CONFIGURATION_README).
+#
+# The local machine is always the final destination for mail addressed
+# to user@[the.net.work.address] of an interface that the mail system
+# receives mail on (see the inet_interfaces parameter).
+#
+# Specify a list of host or domain names, /file/name or type:table
+# patterns, separated by commas and/or whitespace. A /file/name
+# pattern is replaced by its contents; a type:table is matched when
+# a name matches a lookup key (the right-hand side is ignored).
+# Continue long lines by starting the next line with whitespace.
+#
+# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
+#
+#mydestination = $myhostname, localhost.$mydomain, localhost
+#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
+#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
+#      mail.$mydomain, www.$mydomain, ftp.$mydomain
+
+# REJECTING MAIL FOR UNKNOWN LOCAL USERS
+#
+# The local_recipient_maps parameter specifies optional lookup tables
+# with all names or addresses of users that are local with respect
+# to $mydestination, $inet_interfaces or $proxy_interfaces.
+#
+# If this parameter is defined, then the SMTP server will reject
+# mail for unknown local users. This parameter is defined by default.
+#
+# To turn off local recipient checking in the SMTP server, specify
+# local_recipient_maps = (i.e. empty).
+#
+# The default setting assumes that you use the default Postfix local
+# delivery agent for local delivery. You need to update the
+# local_recipient_maps setting if:
+#
+# - You define $mydestination domain recipients in files other than
+#   /etc/passwd, /etc/aliases, or the $virtual_alias_maps files.
+#   For example, you define $mydestination domain recipients in    
+#   the $virtual_mailbox_maps files.
+#
+# - You redefine the local delivery agent in master.cf.
+#
+# - You redefine the "local_transport" setting in main.cf.
+#
+# - You use the "luser_relay", "mailbox_transport", or "fallback_transport"
+#   feature of the Postfix local delivery agent (see local(8)).
+#
+# Details are described in the LOCAL_RECIPIENT_README file.
+#
+# Beware: if the Postfix SMTP server runs chrooted, you probably have
+# to access the passwd file via the proxymap service, in order to
+# overcome chroot restrictions. The alternative, having a copy of
+# the system passwd file in the chroot jail is just not practical.
+#
+# The right-hand side of the lookup tables is conveniently ignored.
+# In the left-hand side, specify a bare username, an @domain.tld
+# wild-card, or specify a user@domain.tld address.
+# 
+#local_recipient_maps = unix:passwd.byname $alias_maps
+#local_recipient_maps = proxy:unix:passwd.byname $alias_maps
+#local_recipient_maps =
+
+# The unknown_local_recipient_reject_code specifies the SMTP server
+# response code when a recipient domain matches $mydestination or
+# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty
+# and the recipient address or address local-part is not found.
+#
+# The default setting is 550 (reject mail) but it is safer to start
+# with 450 (try again later) until you are certain that your
+# local_recipient_maps settings are OK.
+#
+unknown_local_recipient_reject_code = 550
+
+# TRUST AND RELAY CONTROL
+
+# The mynetworks parameter specifies the list of "trusted" SMTP
+# clients that have more privileges than "strangers".
+#
+# In particular, "trusted" SMTP clients are allowed to relay mail
+# through Postfix.  See the smtpd_recipient_restrictions parameter
+# in postconf(5).
+#
+# You can specify the list of "trusted" network addresses by hand
+# or you can let Postfix do it for you (which is the default).
+#
+# By default (mynetworks_style = subnet), Postfix "trusts" SMTP
+# clients in the same IP subnetworks as the local machine.
+# On Linux, this does works correctly only with interfaces specified
+# with the "ifconfig" command.
+# 
+# Specify "mynetworks_style = class" when Postfix should "trust" SMTP
+# clients in the same IP class A/B/C networks as the local machine.
+# Don't do this with a dialup site - it would cause Postfix to "trust"
+# your entire provider's network.  Instead, specify an explicit
+# mynetworks list by hand, as described below.
+#  
+# Specify "mynetworks_style = host" when Postfix should "trust"
+# only the local machine.
+# 
+#mynetworks_style = class
+#mynetworks_style = subnet
+#mynetworks_style = host
+
+# Alternatively, you can specify the mynetworks list by hand, in
+# which case Postfix ignores the mynetworks_style setting.
+#
+# Specify an explicit list of network/netmask patterns, where the
+# mask specifies the number of bits in the network part of a host
+# address.
+#
+# You can also specify the absolute pathname of a pattern file instead
+# of listing the patterns here. Specify type:table for table-based lookups
+# (the value on the table right-hand side is not used).
+#
+#mynetworks = 168.100.189.0/28, 127.0.0.0/8
+#mynetworks = $config_directory/mynetworks
+#mynetworks = hash:/etc/postfix/network_table
+mynetworks = 10.12.11.0/24
+
+# The relay_domains parameter restricts what destinations this system will
+# relay mail to.  See the smtpd_recipient_restrictions description in
+# postconf(5) for detailed information.
+#
+# By default, Postfix relays mail
+# - from "trusted" clients (IP address matches $mynetworks) to any destination,
+# - from "untrusted" clients to destinations that match $relay_domains or
+#   subdomains thereof, except addresses with sender-specified routing.
+# The default relay_domains value is $mydestination.
+# 
+# In addition to the above, the Postfix SMTP server by default accepts mail
+# that Postfix is final destination for:
+# - destinations that match $inet_interfaces or $proxy_interfaces,
+# - destinations that match $mydestination
+# - destinations that match $virtual_alias_domains,
+# - destinations that match $virtual_mailbox_domains.
+# These destinations do not need to be listed in $relay_domains.
+# 
+# Specify a list of hosts or domains, /file/name patterns or type:name
+# lookup tables, separated by commas and/or whitespace.  Continue
+# long lines by starting the next line with whitespace. A file name
+# is replaced by its contents; a type:name table is matched when a
+# (parent) domain appears as lookup key.
+#
+# NOTE: Postfix will not automatically forward mail for domains that
+# list this system as their primary or backup MX host. See the
+# permit_mx_backup restriction description in postconf(5).
+#
+#relay_domains = $mydestination
+
+# INTERNET OR INTRANET
+
+# The relayhost parameter specifies the default host to send mail to
+# when no entry is matched in the optional transport(5) table. When
+# no relayhost is given, mail is routed directly to the destination.
+#
+# On an intranet, specify the organizational domain name. If your
+# internal DNS uses no MX records, specify the name of the intranet
+# gateway host instead.
+#
+# In the case of SMTP, specify a domain, host, host:port, [host]:port,
+# [address] or [address]:port; the form [host] turns off MX lookups.
+#
+# If you're connected via UUCP, see also the default_transport parameter.
+#
+#relayhost = $mydomain
+#relayhost = [gateway.my.domain]
+#relayhost = [mailserver.isp.tld]
+#relayhost = uucphost
+#relayhost = [an.ip.add.ress]
+
+# REJECTING UNKNOWN RELAY USERS
+#
+# The relay_recipient_maps parameter specifies optional lookup tables
+# with all addresses in the domains that match $relay_domains.
+#
+# If this parameter is defined, then the SMTP server will reject
+# mail for unknown relay users. This feature is off by default.
+#
+# The right-hand side of the lookup tables is conveniently ignored.
+# In the left-hand side, specify an @domain.tld wild-card, or specify
+# a user@domain.tld address.
+# 
+#relay_recipient_maps = hash:/etc/postfix/relay_recipients
+
+# INPUT RATE CONTROL
+#
+# The in_flow_delay configuration parameter implements mail input
+# flow control. This feature is turned on by default, although it
+# still needs further development (it's disabled on SCO UNIX due
+# to an SCO bug).
+# 
+# A Postfix process will pause for $in_flow_delay seconds before
+# accepting a new message, when the message arrival rate exceeds the
+# message delivery rate. With the default 100 SMTP server process
+# limit, this limits the mail inflow to 100 messages a second more
+# than the number of messages delivered per second.
+# 
+# Specify 0 to disable the feature. Valid delays are 0..10.
+# 
+#in_flow_delay = 1s
+
+# ADDRESS REWRITING
+#
+# The ADDRESS_REWRITING_README document gives information about
+# address masquerading or other forms of address rewriting including
+# username->Firstname.Lastname mapping.
+
+# ADDRESS REDIRECTION (VIRTUAL DOMAIN)
+#
+# The VIRTUAL_README document gives information about the many forms
+# of domain hosting that Postfix supports.
+
+# "USER HAS MOVED" BOUNCE MESSAGES
+#
+# See the discussion in the ADDRESS_REWRITING_README document.
+
+# TRANSPORT MAP
+#
+# See the discussion in the ADDRESS_REWRITING_README document.
+
+# ALIAS DATABASE
+#
+# The alias_maps parameter specifies the list of alias databases used
+# by the local delivery agent. The default list is system dependent.
+#
+# On systems with NIS, the default is to search the local alias
+# database, then the NIS alias database. See aliases(5) for syntax
+# details.
+# 
+# If you change the alias database, run "postalias /etc/aliases" (or
+# wherever your system stores the mail alias file), or simply run
+# "newaliases" to build the necessary DBM or DB file.
+#
+# It will take a minute or so before changes become visible.  Use
+# "postfix reload" to eliminate the delay.
+#
+#alias_maps = dbm:/etc/aliases
+#alias_maps = hash:/etc/aliases
+#alias_maps = hash:/etc/aliases, nis:mail.aliases
+#alias_maps = netinfo:/aliases
+
+# The alias_database parameter specifies the alias database(s) that
+# are built with "newaliases" or "sendmail -bi".  This is a separate
+# configuration parameter, because alias_maps (see above) may specify
+# tables that are not necessarily all under control by Postfix.
+#
+#alias_database = dbm:/etc/aliases
+#alias_database = dbm:/etc/mail/aliases
+#alias_database = hash:/etc/aliases
+#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+
+# ADDRESS EXTENSIONS (e.g., user+foo)
+#
+# The recipient_delimiter parameter specifies the separator between
+# user names and address extensions (user+foo). See canonical(5),
+# local(8), relocated(5) and virtual(5) for the effects this has on
+# aliases, canonical, virtual, relocated and .forward file lookups.
+# Basically, the software tries user+foo and .forward+foo before
+# trying user and .forward.
+#
+#recipient_delimiter = +
+
+# DELIVERY TO MAILBOX
+#
+# The home_mailbox parameter specifies the optional pathname of a
+# mailbox file relative to a user's home directory. The default
+# mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
+# "Maildir/" for qmail-style delivery (the / is required).
+#
+#home_mailbox = Mailbox
+#home_mailbox = Maildir/
+# The mail_spool_directory parameter specifies the directory where
+# UNIX-style mailboxes are kept. The default setting depends on the
+# system type.
+#
+#mail_spool_directory = /var/mail
+#mail_spool_directory = /var/spool/mail
+
+# The mailbox_command parameter specifies the optional external
+# command to use instead of mailbox delivery. The command is run as
+# the recipient with proper HOME, SHELL and LOGNAME environment settings.
+# Exception:  delivery for root is done as $default_user.
+#
+# Other environment variables of interest: USER (recipient username),
+# EXTENSION (address extension), DOMAIN (domain part of address),
+# and LOCAL (the address localpart).
+#
+# Unlike other Postfix configuration parameters, the mailbox_command
+# parameter is not subjected to $parameter substitutions. This is to
+# make it easier to specify shell syntax (see example below).
+#
+# Avoid shell meta characters because they will force Postfix to run
+# an expensive shell process. Procmail alone is expensive enough.
+#
+# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
+# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
+#
+#mailbox_command = /some/where/procmail
+#mailbox_command = /some/where/procmail -a "$EXTENSION"
+
+# The mailbox_transport specifies the optional transport in master.cf
+# to use after processing aliases and .forward files. This parameter
+# has precedence over the mailbox_command, fallback_transport and
+# luser_relay parameters.
+#
+# Specify a string of the form transport:nexthop, where transport is
+# the name of a mail delivery transport defined in master.cf.  The
+# :nexthop part is optional. For more details see the sample transport
+# configuration file.
+#
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must update the "local_recipient_maps" setting in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
+#mailbox_transport = lmtp:unix:/file/name
+#mailbox_transport = cyrus
+
+# The fallback_transport specifies the optional transport in master.cf
+# to use for recipients that are not found in the UNIX passwd database.
+# This parameter has precedence over the luser_relay parameter.
+#
+# Specify a string of the form transport:nexthop, where transport is
+# the name of a mail delivery transport defined in master.cf.  The
+# :nexthop part is optional. For more details see the sample transport
+# configuration file.
+#
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must update the "local_recipient_maps" setting in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
+#fallback_transport = lmtp:unix:/file/name
+#fallback_transport = cyrus
+#fallback_transport =
+
+# The luser_relay parameter specifies an optional destination address
+# for unknown recipients.  By default, mail for unknown@$mydestination,
+# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned
+# as undeliverable.
+#
+# The following expansions are done on luser_relay: $user (recipient
+# username), $shell (recipient shell), $home (recipient home directory),
+# $recipient (full recipient address), $extension (recipient address
+# extension), $domain (recipient domain), $local (entire recipient
+# localpart), $recipient_delimiter. Specify ${name?value} or
+# ${name:value} to expand value only when $name does (does not) exist.
+#
+# luser_relay works only for the default Postfix local delivery agent.
+#
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must specify "local_recipient_maps =" (i.e. empty) in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
+#luser_relay = $user@other.host
+#luser_relay = $local@other.host
+#luser_relay = admin+$local
+  
+# JUNK MAIL CONTROLS
+# 
+# The controls listed here are only a very small subset. The file
+# SMTPD_ACCESS_README provides an overview.
+
+# The header_checks parameter specifies an optional table with patterns
+# that each logical message header is matched against, including
+# headers that span multiple physical lines.
+#
+# By default, these patterns also apply to MIME headers and to the
+# headers of attached messages. With older Postfix versions, MIME and
+# attached message headers were treated as body text.
+#
+# For details, see "man header_checks".
+#
+#header_checks = regexp:/etc/postfix/header_checks
+
+# FAST ETRN SERVICE
+#
+# Postfix maintains per-destination logfiles with information about
+# deferred mail, so that mail can be flushed quickly with the SMTP
+# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld".
+# See the ETRN_README document for a detailed description.
+# 
+# The fast_flush_domains parameter controls what destinations are
+# eligible for this service. By default, they are all domains that
+# this server is willing to relay mail to.
+# 
+#fast_flush_domains = $relay_domains
+
+# SHOW SOFTWARE VERSION OR NOT
+#
+# The smtpd_banner parameter specifies the text that follows the 220
+# code in the SMTP server's greeting banner. Some people like to see
+# the mail version advertised. By default, Postfix shows no version.
+#
+# You MUST specify $myhostname at the start of the text. That is an
+# RFC requirement. Postfix itself does not care.
+#
+#smtpd_banner = $myhostname ESMTP $mail_name
+#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
+
+# PARALLEL DELIVERY TO THE SAME DESTINATION
+#
+# How many parallel deliveries to the same user or domain? With local
+# delivery, it does not make sense to do massively parallel delivery
+# to the same user, because mailbox updates must happen sequentially,
+# and expensive pipelines in .forward files can cause disasters when
+# too many are run at the same time. With SMTP deliveries, 10
+# simultaneous connections to the same domain could be sufficient to
+# raise eyebrows.
+# 
+# Each message delivery transport has its XXX_destination_concurrency_limit
+# parameter.  The default is $default_destination_concurrency_limit for
+# most delivery transports. For the local delivery agent the default is 2.
+
+#local_destination_concurrency_limit = 2
+#default_destination_concurrency_limit = 20
+
+# DEBUGGING CONTROL
+#
+# The debug_peer_level parameter specifies the increment in verbose
+# logging level when an SMTP client or server host name or address
+# matches a pattern in the debug_peer_list parameter.
+#
+debug_peer_level = 2
+
+# The debug_peer_list parameter specifies an optional list of domain
+# or network patterns, /file/name patterns or type:name tables. When
+# an SMTP client or server host name or address matches a pattern,
+# increase the verbose logging level by the amount specified in the
+# debug_peer_level parameter.
+#
+#debug_peer_list = 127.0.0.1
+#debug_peer_list = some.domain
+
+# The debugger_command specifies the external command that is executed
+# when a Postfix daemon program is run with the -D option.
+#
+# Use "command .. & sleep 5" so that the debugger can attach before
+# the process marches on. If you use an X-based debugger, be sure to
+# set up your XAUTHORITY environment variable before starting Postfix.
+#
+debugger_command =
+        PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+        ddd $daemon_directory/$process_name $process_id & sleep 5
+
+# If you can't use X, use this to capture the call stack when a
+# daemon crashes. The result is in a file in the configuration
+# directory, and is named after the process name and the process ID.
+#
+# debugger_command =
+#      PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont;
+#      echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
+#      >$config_directory/$process_name.$process_id.log & sleep 5
+#
+# Another possibility is to run gdb under a detached screen session.
+# To attach to the screen sesssion, su root and run "screen -r
+# <id_string>" where <id_string> uniquely matches one of the detached
+# sessions (from "screen -list").
+#
+# debugger_command =
+#      PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen
+#      -dmS $process_name gdb $daemon_directory/$process_name
+#      $process_id & sleep 1
+
+# INSTALL-TIME CONFIGURATION INFORMATION
+#
+# The following parameters are used when installing a new Postfix version.
+# 
+# sendmail_path: The full pathname of the Postfix sendmail command.
+# This is the Sendmail-compatible mail posting interface.
+# 
+sendmail_path = /usr/sbin/sendmail
+
+# newaliases_path: The full pathname of the Postfix newaliases command.
+# This is the Sendmail-compatible command to build alias databases.
+#
+newaliases_path = /usr/bin/newaliases
+
+# mailq_path: The full pathname of the Postfix mailq command.  This
+# is the Sendmail-compatible mail queue listing command.
+# 
+mailq_path = /usr/bin/mailq
+
+# setgid_group: The group for mail submission and queue management
+# commands.  This must be a group name with a numerical group ID that
+# is not shared with other accounts, not even with the Postfix account.
+#
+setgid_group = postdrop
+
+# html_directory: The location of the Postfix HTML documentation.
+#
+html_directory = /usr/share/doc/postfix-2.8.7/html
+
+# manpage_directory: The location of the Postfix on-line manual pages.
+#
+manpage_directory = /usr/share/man
+
+# sample_directory: The location of the Postfix sample configuration files.
+# This parameter is obsolete as of Postfix 2.1.
+#
+sample_directory = /etc/postfix
+
+# readme_directory: The location of the Postfix README files.
+#
+readme_directory = /usr/share/doc/postfix-2.8.7/readme
+home_mailbox = .maildir/
+
+smtpd_sasl_auth_enable = yes
+smtpd_sasl2_auth_enable = yes
+smtpd_sasl_security_options = noanonymous
+broken_sasl_auth_clients = yes
+smtpd_sasl_local_domain = $myhostname
+
+# Authentifizierter Relay-Mail-Versand
+smtp_sasl_auth_enable = yes 
+smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth
+smtp_sasl_security_options = noanonymous
+relayhost = [mail.brehm-online.com]
+#relayhost = [helga-six.brehm-online.com]
+
+smtpd_use_tls = yes
+#smtpd_tls_auth_only = yes
+smtpd_tls_key_file = /etc/postfix/postfix.pem
+smtpd_tls_cert_file = /etc/postfix/postfix.pem
+#smtpd_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem
+smtpd_tls_loglevel = 1
+smtpd_tls_received_header = yes
+smtpd_tls_session_cache_timeout = 3600s
+tls_random_source = dev:/dev/urandom
+
+# schön tls verwenden
+smtp_use_tls = yes
+smtp_tls_key_file = /etc/postfix/postfix.pem
+smtp_tls_cert_file = /etc/postfix/postfix.pem
+#smtp_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem
+# vermurkste zertifikate: egal
+smtp_tls_enforce_peername = no
+
+#debug_peer_list = 217.237.40.156
+
+inet_protocols = all
index 3dc53047fca46186747669326c53ab4bfac366e3..849ec43332f2de4a8db56ddd74fb87308362f2e8 100644 (file)
@@ -640,7 +640,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.0/html
+html_directory = /usr/share/doc/postfix-2.10.1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -653,6 +653,5 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.0/readme
+readme_directory = /usr/share/doc/postfix-2.10.1/readme
 home_mailbox = .maildir/
-smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
diff --git a/config-archive/etc/smartd.conf b/config-archive/etc/smartd.conf
new file mode 100644 (file)
index 0000000..8021499
--- /dev/null
@@ -0,0 +1,147 @@
+# Sample configuration file for smartd.  See man smartd.conf.
+
+# Home page is: http://smartmontools.sourceforge.net
+
+# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $
+
+# smartd will re-read the configuration file if it receives a HUP
+# signal
+
+# The file gives a list of devices to monitor using smartd, with one
+# device per line. Text after a hash (#) is ignored, and you may use
+# spaces and tabs for white space. You may use '\' to continue lines.
+
+# You can usually identify which hard disks are on your system by
+# looking in /proc/ide and in /proc/scsi.
+
+# The word DEVICESCAN will cause any remaining lines in this
+# configuration file to be ignored: it tells smartd to scan for all
+# ATA and SCSI devices.  DEVICESCAN may be followed by any of the
+# Directives listed below, which will be applied to all devices that
+# are found.  Most users should comment out DEVICESCAN and explicitly
+# list the devices that they wish to monitor.
+#DEVICESCAN
+
+# Alternative setting to ignore temperature and power-on hours reports
+# in syslog.
+#DEVICESCAN -I 194 -I 231 -I 9
+
+# Alternative setting to report more useful raw temperature in syslog.
+#DEVICESCAN -R 194 -R 231 -I 9
+
+# Alternative setting to report raw temperature changes >= 5 Celsius
+# and min/max temperatures.
+#DEVICESCAN -I 194 -I 231 -I 9 -W 5
+
+# First (primary) ATA/IDE hard disk.  Monitor all attributes, enable
+# automatic online data collection, automatic Attribute autosave, and
+# start a short self-test every day between 2-3am, and a long self test
+# Saturdays between 3-4am.
+#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03)
+/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
+/dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
+#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
+
+# Monitor SMART status, ATA Error Log, Self-test log, and track
+# changes in all attributes except for attribute 194
+#/dev/hdb -H -l error -l selftest -t -I 194 
+
+# Monitor all attributes except normalized Temperature (usually 194),
+# but track Temperature changes >= 4 Celsius, report Temperatures
+# >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5).
+# Send mail on SMART failures or when Temperature is >= 55 Celsius.
+#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com
+
+# An ATA disk may appear as a SCSI device to the OS. If a SCSI to
+# ATA Translation (SAT) layer is between the OS and the device then
+# this can be flagged with the '-d sat' option. This situation may
+# become common with SATA disks in SAS and FC environments.
+# /dev/sda -a -d sat
+
+# A very silent check.  Only report SMART health status if it fails
+# But send an email in this case
+#/dev/hdc -H -C 0 -U 0 -m admin@example.com
+
+# First two SCSI disks.  This will monitor everything that smartd can
+# monitor.  Start extended self-tests Wednesdays between 6-7pm and
+# Sundays between 1-2 am
+#/dev/sda -d scsi -s L/../../3/18
+#/dev/sdb -d scsi -s L/../../7/01
+
+# Monitor 4 ATA disks connected to a 3ware 6/7/8000 controller which uses
+# the 3w-xxxx driver. Start long self-tests Sundays between 1-2, 2-3, 3-4, 
+# and 4-5 am.
+# NOTE: starting with the Linux 2.6 kernel series, the /dev/sdX interface
+# is DEPRECATED.  Use the /dev/tweN character device interface instead.
+# For example /dev/twe0, /dev/twe1, and so on.
+#/dev/sdc -d 3ware,0 -a -s L/../../7/01
+#/dev/sdc -d 3ware,1 -a -s L/../../7/02
+#/dev/sdc -d 3ware,2 -a -s L/../../7/03
+#/dev/sdc -d 3ware,3 -a -s L/../../7/04
+
+# Monitor 2 ATA disks connected to a 3ware 9000 controller which
+# uses the 3w-9xxx driver (Linux, FreeBSD). Start long self-tests Tuesdays
+# between 1-2 and 3-4 am.
+#/dev/twa0 -d 3ware,0 -a -s L/../../2/01
+#/dev/twa0 -d 3ware,1 -a -s L/../../2/03
+
+# Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which
+# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays
+# between 1-2 and 3-4 am.
+#/dev/twl0 -d 3ware,0 -a -s L/../../2/01
+#/dev/twa0 -d 3ware,1 -a -s L/../../2/03
+
+# Same as above for Windows. Option '-d 3ware,N' is not necessary,
+# disk (port) number is specified in device name.
+# NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
+#/dev/hdc,0 -a -s L/../../2/01
+#/dev/hdc,1 -a -s L/../../2/03
+
+# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
+# self-tests Sundays between 1-2, 2-3, and 3-4 am. 
+#/dev/sdd -d hpt,1/1 -a -s L/../../7/01
+#/dev/sdd -d hpt,1/2 -a -s L/../../7/02
+#/dev/sdd -d hpt,1/3 -a -s L/../../7/03
+
+# Monitor 2 ATA disks connected to the same PMPort which connected to the
+# HighPoint RocketRAID. Start long self-tests Tuesdays between 1-2 and 3-4 am
+#/dev/sdd -d hpt,1/4/1 -a -s L/../../2/01
+#/dev/sdd -d hpt,1/4/2 -a -s L/../../2/03
+
+# HERE IS A LIST OF DIRECTIVES FOR THIS CONFIGURATION FILE.
+# PLEASE SEE THE smartd.conf MAN PAGE FOR DETAILS
+#
+#   -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, hpt,L/M/N
+#   -T TYPE set the tolerance to one of: normal, permissive
+#   -o VAL  Enable/disable automatic offline tests (on/off)
+#   -S VAL  Enable/disable attribute autosave (on/off)
+#   -n MODE No check. MODE is one of: never, sleep, standby, idle
+#   -H      Monitor SMART Health Status, report if failed
+#   -l TYPE Monitor SMART log.  Type is one of: error, selftest
+#   -f      Monitor for failure of any 'Usage' Attributes
+#   -m ADD  Send warning email to ADD for -H, -l error, -l selftest, and -f
+#   -M TYPE Modify email warning behavior (see man page)
+#   -s REGE Start self-test when type/date matches regular expression (see man page)
+#   -p      Report changes in 'Prefailure' Normalized Attributes
+#   -u      Report changes in 'Usage' Normalized Attributes
+#   -t      Equivalent to -p and -u Directives
+#   -r ID   Also report Raw values of Attribute ID with -p, -u or -t
+#   -R ID   Track changes in Attribute ID Raw value with -p, -u or -t
+#   -i ID   Ignore Attribute ID for -f Directive
+#   -I ID   Ignore Attribute ID for -p, -u or -t Directive
+#   -C ID   Report if Current Pending Sector count non-zero
+#   -U ID   Report if Offline Uncorrectable count non-zero
+#   -W D,I,C Monitor Temperature D)ifference, I)nformal limit, C)ritical limit
+#   -v N,ST Modifies labeling of Attribute N (see man page)
+#   -a      Default: equivalent to -H -f -t -l error -l selftest -C 197 -U 198
+#   -F TYPE Use firmware bug workaround. Type is one of: none, samsung
+#   -P TYPE Drive-specific presets: use, ignore, show, showall
+#    #      Comment: text after a hash sign is ignored
+#    \      Line continuation character
+# Attribute ID is a decimal integer 1 <= ID <= 255
+# except for -C and -U, where ID = 0 turns them off.
+# All but -d, -m and -M Directives are only implemented for ATA devices
+#
+# If the test string DEVICESCAN is the first uncommented text
+# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z]
+# DEVICESCAN may be followed by any desired Directives.
diff --git a/config-archive/etc/smartd.conf.dist b/config-archive/etc/smartd.conf.dist
new file mode 100644 (file)
index 0000000..5ef85b1
--- /dev/null
@@ -0,0 +1,145 @@
+# Sample configuration file for smartd.  See man smartd.conf.
+
+# Home page is: http://smartmontools.sourceforge.net
+
+# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $
+
+# smartd will re-read the configuration file if it receives a HUP
+# signal
+
+# The file gives a list of devices to monitor using smartd, with one
+# device per line. Text after a hash (#) is ignored, and you may use
+# spaces and tabs for white space. You may use '\' to continue lines.
+
+# You can usually identify which hard disks are on your system by
+# looking in /proc/ide and in /proc/scsi.
+
+# The word DEVICESCAN will cause any remaining lines in this
+# configuration file to be ignored: it tells smartd to scan for all
+# ATA and SCSI devices.  DEVICESCAN may be followed by any of the
+# Directives listed below, which will be applied to all devices that
+# are found.  Most users should comment out DEVICESCAN and explicitly
+# list the devices that they wish to monitor.
+DEVICESCAN
+
+# Alternative setting to ignore temperature and power-on hours reports
+# in syslog.
+#DEVICESCAN -I 194 -I 231 -I 9
+
+# Alternative setting to report more useful raw temperature in syslog.
+#DEVICESCAN -R 194 -R 231 -I 9
+
+# Alternative setting to report raw temperature changes >= 5 Celsius
+# and min/max temperatures.
+#DEVICESCAN -I 194 -I 231 -I 9 -W 5
+
+# First (primary) ATA/IDE hard disk.  Monitor all attributes, enable
+# automatic online data collection, automatic Attribute autosave, and
+# start a short self-test every day between 2-3am, and a long self test
+# Saturdays between 3-4am.
+#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03)
+
+# Monitor SMART status, ATA Error Log, Self-test log, and track
+# changes in all attributes except for attribute 194
+#/dev/hdb -H -l error -l selftest -t -I 194 
+
+# Monitor all attributes except normalized Temperature (usually 194),
+# but track Temperature changes >= 4 Celsius, report Temperatures
+# >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5).
+# Send mail on SMART failures or when Temperature is >= 55 Celsius.
+#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com
+
+# An ATA disk may appear as a SCSI device to the OS. If a SCSI to
+# ATA Translation (SAT) layer is between the OS and the device then
+# this can be flagged with the '-d sat' option. This situation may
+# become common with SATA disks in SAS and FC environments.
+# /dev/sda -a -d sat
+
+# A very silent check.  Only report SMART health status if it fails
+# But send an email in this case
+#/dev/hdc -H -C 0 -U 0 -m admin@example.com
+
+# First two SCSI disks.  This will monitor everything that smartd can
+# monitor.  Start extended self-tests Wednesdays between 6-7pm and
+# Sundays between 1-2 am
+#/dev/sda -d scsi -s L/../../3/18
+#/dev/sdb -d scsi -s L/../../7/01
+
+# Monitor 4 ATA disks connected to a 3ware 6/7/8000 controller which uses
+# the 3w-xxxx driver. Start long self-tests Sundays between 1-2, 2-3, 3-4, 
+# and 4-5 am.
+# NOTE: starting with the Linux 2.6 kernel series, the /dev/sdX interface
+# is DEPRECATED.  Use the /dev/tweN character device interface instead.
+# For example /dev/twe0, /dev/twe1, and so on.
+#/dev/sdc -d 3ware,0 -a -s L/../../7/01
+#/dev/sdc -d 3ware,1 -a -s L/../../7/02
+#/dev/sdc -d 3ware,2 -a -s L/../../7/03
+#/dev/sdc -d 3ware,3 -a -s L/../../7/04
+
+# Monitor 2 ATA disks connected to a 3ware 9000 controller which
+# uses the 3w-9xxx driver (Linux, FreeBSD). Start long self-tests Tuesdays
+# between 1-2 and 3-4 am.
+#/dev/twa0 -d 3ware,0 -a -s L/../../2/01
+#/dev/twa0 -d 3ware,1 -a -s L/../../2/03
+
+# Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which
+# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays
+# between 1-2 and 3-4 am.
+# On FreeBSD /dev/tws0 should be used instead
+#/dev/twl0 -d 3ware,0 -a -s L/../../2/01
+#/dev/twl0 -d 3ware,1 -a -s L/../../2/03
+
+# Same as above for Windows. Option '-d 3ware,N' is not necessary,
+# disk (port) number is specified in device name.
+# NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
+#/dev/hdc,0 -a -s L/../../2/01
+#/dev/hdc,1 -a -s L/../../2/03
+
+# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
+# self-tests Sundays between 1-2, 2-3, and 3-4 am. 
+#/dev/sdd -d hpt,1/1 -a -s L/../../7/01
+#/dev/sdd -d hpt,1/2 -a -s L/../../7/02
+#/dev/sdd -d hpt,1/3 -a -s L/../../7/03
+
+# Monitor 2 ATA disks connected to the same PMPort which connected to the
+# HighPoint RocketRAID. Start long self-tests Tuesdays between 1-2 and 3-4 am
+#/dev/sdd -d hpt,1/4/1 -a -s L/../../2/01
+#/dev/sdd -d hpt,1/4/2 -a -s L/../../2/03
+
+# HERE IS A LIST OF DIRECTIVES FOR THIS CONFIGURATION FILE.
+# PLEASE SEE THE smartd.conf MAN PAGE FOR DETAILS
+#
+#   -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, hpt,L/M/N
+#   -T TYPE set the tolerance to one of: normal, permissive
+#   -o VAL  Enable/disable automatic offline tests (on/off)
+#   -S VAL  Enable/disable attribute autosave (on/off)
+#   -n MODE No check. MODE is one of: never, sleep, standby, idle
+#   -H      Monitor SMART Health Status, report if failed
+#   -l TYPE Monitor SMART log.  Type is one of: error, selftest
+#   -f      Monitor for failure of any 'Usage' Attributes
+#   -m ADD  Send warning email to ADD for -H, -l error, -l selftest, and -f
+#   -M TYPE Modify email warning behavior (see man page)
+#   -s REGE Start self-test when type/date matches regular expression (see man page)
+#   -p      Report changes in 'Prefailure' Normalized Attributes
+#   -u      Report changes in 'Usage' Normalized Attributes
+#   -t      Equivalent to -p and -u Directives
+#   -r ID   Also report Raw values of Attribute ID with -p, -u or -t
+#   -R ID   Track changes in Attribute ID Raw value with -p, -u or -t
+#   -i ID   Ignore Attribute ID for -f Directive
+#   -I ID   Ignore Attribute ID for -p, -u or -t Directive
+#   -C ID   Report if Current Pending Sector count non-zero
+#   -U ID   Report if Offline Uncorrectable count non-zero
+#   -W D,I,C Monitor Temperature D)ifference, I)nformal limit, C)ritical limit
+#   -v N,ST Modifies labeling of Attribute N (see man page)
+#   -a      Default: equivalent to -H -f -t -l error -l selftest -C 197 -U 198
+#   -F TYPE Use firmware bug workaround. Type is one of: none, samsung
+#   -P TYPE Drive-specific presets: use, ignore, show, showall
+#    #      Comment: text after a hash sign is ignored
+#    \      Line continuation character
+# Attribute ID is a decimal integer 1 <= ID <= 255
+# except for -C and -U, where ID = 0 turns them off.
+# All but -d, -m and -M Directives are only implemented for ATA devices
+#
+# If the test string DEVICESCAN is the first uncommented text
+# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z]
+# DEVICESCAN may be followed by any desired Directives.
index 45827938b42bdf093c8e42947c59b18ae1b7ae7b..20e93366f452332c62ab8a6da6287df2d5cdf0f3 100644 (file)
@@ -18,20 +18,23 @@ options {
        # people so turn it down to once an hour.  Set it to zero
        # if you don't want the functionality at all.
        mark_freq(3600); 
+
+       frac_digits(3);
+       ts_format(iso);
 };
 
 source src {
     unix-stream("/dev/log" max-connections(256));
     internal();
     file("/proc/kmsg");
-    udp();
+    #udp();
 };
 
 #########################################################
 # Logging-Ziele
 
 destination d_syslog      { file("/var/log/syslog"); };
-destination d_fac         { file("/var/log/facility/$FACILITY"); };
+destination d_fac         { file("/var/log/syslog.d/$FACILITY"); };
 destination d_debug       { file("/var/log/debug"); };
 destination d_all         { file("/var/log/all"); };
 destination d_messages    { file("/var/log/messages"); };
@@ -50,6 +53,13 @@ destination d_console_12  { file("/dev/tty12"); };
 #destination d_xconsole    { pipe("/dev/xconsole"); };
 destination d_xconsole    { pipe("/dev/console"); };
 
+# By default messages are logged to tty12...
+#destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
 #########################################################
 # Filter-Definitionen
 
@@ -83,12 +93,5 @@ log { source(src); filter(f_syslog);    destination(d_syslog); };
 log { source(src); filter(f_debug);     destination(d_debug); };
 log { source(src);                      destination(d_all); };
 
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
 #log { source(src); destination(messages); };
 #log { source(src); destination(console_all); };
diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1
new file mode 100644 (file)
index 0000000..4582793
--- /dev/null
@@ -0,0 +1,94 @@
+@version: 3.2
+# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+options { 
+       long_hostnames(off);
+       chain_hostnames(no); 
+       flush_lines(0); 
+
+       # The default action of syslog-ng is to log a STATS line
+       # to the file every 10 minutes.  That's pretty ugly after a while.
+       # Change it to every 12 hours so you get a nice daily update of
+       # how many messages syslog-ng missed (0).
+       stats_freq(43200); 
+       # The default action of syslog-ng is to log a MARK line
+       # to the file every 20 minutes.  That's seems high for most
+       # people so turn it down to once an hour.  Set it to zero
+       # if you don't want the functionality at all.
+       mark_freq(3600); 
+};
+
+source src {
+    unix-stream("/dev/log" max-connections(256));
+    internal();
+    file("/proc/kmsg");
+    udp();
+};
+
+#########################################################
+# Logging-Ziele
+
+destination d_syslog      { file("/var/log/syslog"); };
+destination d_fac         { file("/var/log/facility/$FACILITY"); };
+destination d_debug       { file("/var/log/debug"); };
+destination d_all         { file("/var/log/all"); };
+destination d_messages    { file("/var/log/messages"); };
+
+destination d_console     { usertty("root"); };
+destination d_console_all { usertty("*"); };
+#destination loghost { udp("loghost" port(999)); };
+
+# By default messages are logged to tty12...
+destination d_console_12  { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all   { file("/dev/console"); };
+
+#destination d_xconsole    { pipe("/dev/xconsole"); };
+destination d_xconsole    { pipe("/dev/console"); };
+
+#########################################################
+# Filter-Definitionen
+
+filter f_syslog         { not facility(authpriv, mail); };
+filter f_debug          { not facility(auth, authpriv, news, mail); };
+filter f_messages       { level(info..emerg)
+                          and not facility(auth, authpriv, mail, news); };
+filter f_emergency      { level(emerg); };
+
+filter f_warnings       { level(warn..emerg)
+                          and not facility( mail, news); };
+
+filter f_info           { level(info); };
+filter f_notice         { level(notice); };
+filter f_warn           { level(warn); };
+filter f_crit           { level(crit); };
+filter f_err            { level(err); };
+filter f_alarm          { level(crit, alert); };
+
+########################################################
+# Log-Definitionen
+
+log { source(src);                      destination(d_fac); };
+
+log { source(src); filter(f_messages);  destination(d_messages); };
+#log { source(src); filter(f_messages);  destination(d_xconsole); };
+log { source(src); filter(f_warnings);  destination(d_console_12); };
+log { source(src); filter(f_alarm);     destination(d_console); };
+log { source(src); filter(f_emergency); destination(d_console_all); };
+log { source(src); filter(f_syslog);    destination(d_syslog); };
+log { source(src); filter(f_debug);     destination(d_debug); };
+log { source(src);                      destination(d_all); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+#log { source(src); destination(messages); };
+#log { source(src); destination(console_all); };
diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist b/config-archive/etc/syslog-ng/syslog-ng.conf.dist
new file mode 100644 (file)
index 0000000..e8d3b4f
--- /dev/null
@@ -0,0 +1,37 @@
+@version: 3.4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options { 
+       threaded(yes);
+       chain_hostnames(no); 
+
+       # The default action of syslog-ng is to log a STATS line
+       # to the file every 10 minutes.  That's pretty ugly after a while.
+       # Change it to every 12 hours so you get a nice daily update of
+       # how many messages syslog-ng missed (0).
+       stats_freq(43200); 
+       # The default action of syslog-ng is to log a MARK line
+       # to the file every 20 minutes.  That's seems high for most
+       # people so turn it down to once an hour.  Set it to zero
+       # if you don't want the functionality at all.
+       mark_freq(3600); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new b/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new
deleted file mode 100644 (file)
index 2589f2f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-@version: 3.2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-options { 
-       chain_hostnames(no); 
-
-       # The default action of syslog-ng is to log a STATS line
-       # to the file every 10 minutes.  That's pretty ugly after a while.
-       # Change it to every 12 hours so you get a nice daily update of
-       # how many messages syslog-ng missed (0).
-       stats_freq(43200); 
-       # The default action of syslog-ng is to log a MARK line
-       # to the file every 20 minutes.  That's seems high for most
-       # people so turn it down to once an hour.  Set it to zero
-       # if you don't want the functionality at all.
-       mark_freq(3600); 
-};
-
-source src {
-    unix-stream("/dev/log" max-connections(256));
-    internal();
-    file("/proc/kmsg");
-};
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
index 23b42d9cd0f16fbc169ba20e36df6dacc81ab971..4299e1744bed726b0d7070762aa6a973b3c9ffcf 100644 (file)
@@ -449,7 +449,7 @@ FaceDir=/var/lib/kdm/faces
 # Random seed for forging saved session types, etc. of unknown users.
 # This value should be random but constant across the login domain.
 # Default is 0
-ForgingSeed=1372757330
+ForgingSeed=1376268632
 # Specify conversation plugins for the login dialog. Each plugin can be
 # specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
 # or as a full pathname.
diff --git a/cron.daily/hplip_cron b/cron.daily/hplip_cron
deleted file mode 100755 (executable)
index a32906f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-LC_ALL=C
-LANG=C
-
-LOG_DIR=/var/log/hp/tmp/
-
-# Default for number of days to keep old log files in /var/log/hp/tmp
-LOGFILE_DAYS=1
-MAXSIZE=1048576        # 1 GB
-
-# Clears the logs which are less than 3 days.
-if [ -d $LOG_DIR ]; then
-       find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0  2>/dev/null | xargs -r -0 rm -rf
-else
-       mkdir -p $LOG_DIR
-       chgrp "lp" -R $LOG_DIR
-       chmod 1774 $LOG_DIR     
-fi
-
-USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1`
-
-# Clears the logs if size is greater that specificed limit
-while [ $USAGE -gt $MAXSIZE ]; do
-
-       # changing the user specified LOGFILE_DAYS days to 1 days lesser.
-       LOGFILE_DAYS=`expr $LOGFILE_DAYS "-" 1`
-
-       # If same day logs are reaching Max size, deleting all log files.
-       if [ $LOGFILE_DAYS -eq 0 ]; then
-               find $LOG_DIR -type f -print0 2>/dev/null | xargs -r -0 rm -rf
-       else    
-               find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -rf
-       fi
-       USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1`
-done
diff --git a/csh.env b/csh.env
index c3c3568b284efb9fcbaaed94035a6037e93141fb..db791bc883c9e449c32c1ad462c39e3852fd8b38 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -10,7 +10,7 @@ setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0-r1/html'
 setenv GCC_SPECS ''
 setenv GSETTINGS_BACKEND 'dconf'
 setenv HG '/usr/bin/hg'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info'
 setenv JAVACC_HOME '/usr/share/javacc/'
 setenv LANG 'de_DE.UTF-8'
 setenv LC_ADDRESS 'de_DE.utf8'
@@ -28,7 +28,7 @@ setenv LC_TIME 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PAGER '/usr/bin/less'
index 8050a21ed669ccbea40ea0d1a8220abbef7100d7..fea33e5e391240aef5394343721af860ad306193 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.6.2
-# Written by cupsd on 2013-07-28 22:12
+# Written by cupsd on 2013-08-13 07:06
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
index 184f58f6429e90b4ed3c77f8b98c8c32b23a9427..d3fcb4221b96daf29325b524ccd2c8ccfa09e330 100644 (file)
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.6.2
-# Written by cupsd on 2013-07-28 22:12
-NextSubscriptionId 182
+# Written by cupsd on 2013-08-09 00:41
+NextSubscriptionId 184
index bf004d1da491374b49a969b0efe889ba7ed20b9f..40c7c1f53aa9f753f6003fb81660c77d81c4140d 100644 (file)
@@ -1,2 +1,2 @@
-MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man
-INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info
+MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man
+INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info
index 11427ca8faf4dfcc409a8110832426d624d93e59..930d9b82a1f2e4998538137bc81aa66e01f0152e 100644 (file)
@@ -1 +1 @@
-CURRENT=2.22
+CURRENT=2.23.1
diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.22 b/env.d/binutils/x86_64-pc-linux-gnu-2.22
deleted file mode 100644 (file)
index aac9c13..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET="x86_64-pc-linux-gnu"
-VER="2.22"
-LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.22"
-FAKE_TARGETS="x86_64-pc-linux-gnu"
diff --git a/env.d/binutils/x86_64-pc-linux-gnu-2.23.1 b/env.d/binutils/x86_64-pc-linux-gnu-2.23.1
new file mode 100644 (file)
index 0000000..d9ce38f
--- /dev/null
@@ -0,0 +1,4 @@
+TARGET="x86_64-pc-linux-gnu"
+VER="2.23.1"
+LIBPATH="/usr/lib64/binutils/x86_64-pc-linux-gnu/2.23.1"
+FAKE_TARGETS="x86_64-pc-linux-gnu"
diff --git a/etckeeper/commit.d/99push b/etckeeper/commit.d/99push
new file mode 100755 (executable)
index 0000000..9a5d81e
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -n "$PUSH_REMOTE" ]; then
+       if [ "$VCS" = git ] && [ -d .git ]; then
+               git push "$PUSH_REMOTE" master || true
+       else
+               echo "PUSH_REMOTE not yet supported for $VCS" >&2
+       fi
+fi
index b910c8a050d260afbc6da98968b3756e69a76b67..9492c8f39ccb9bf12fd661c83d510751294ef1e7 100644 (file)
@@ -30,7 +30,7 @@ DARCS_COMMIT_OPTIONS="-a"
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum etc)
+# (apt, pacman-g2, yum, zypper etc)
 # For gentoo this is emerge
 HIGHLEVEL_PACKAGE_MANAGER=emerge
 
@@ -38,3 +38,7 @@ HIGHLEVEL_PACKAGE_MANAGER=emerge
 # (dpkg, rpm, pacman-g2, etc)
 # For gentoo this is qlist
 LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git).
+PUSH_REMOTE=""
index 455429af13e8fe77b03b1b9a199f2ae5ee44b240..d445db102e94110c72f0330fdd5633abf3512d28 100755 (executable)
@@ -81,14 +81,16 @@ generate_metadata() {
                        if (exists $uidcache{$want}) {
                                return $uidcache{$want};
                        }
-                       return $uidcache{$want}=scalar getpwuid($want);
+                       my $name=scalar getpwuid($want);
+                       return $uidcache{$want}=defined $name ? $name : $want;
                }
                sub gidname {
                        my $want=shift;
                        if (exists $gidcache{$want}) {
                                return $gidcache{$want};
                        }
-                       return $gidcache{$want}=scalar getgrgid($want);
+                       my $name=scalar getgrgid($want);
+                       return $gidcache{$want}=defined $name ? $name : $want;
                }
                chomp;
                my @stat=stat($_);
index 803b0b53c9e27b1eab4027ca9d0326827b5bbbd9..b61abfdee4d2d470daaeee20a425e600dcd2936e 100755 (executable)
@@ -21,9 +21,9 @@ if ! grep -q "$managed_by_etckeeper" "$file"; then
        exit 0
 else
        realfile="$file"
-       if [ -n "`type -p tempfile`" ]; then
+       if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then
                tempfile="tempfile"
-       elif [ -n "`type -p mktemp`" ]; then
+       elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then
                tempfile="mktemp"
        else
                echo "etckeeper warning: can't find tempfile or mktemp" >&2
index 46d8162792d0be48e2854951f256b65fbf815c77..d59ad14993077aa44876996d7fafcd22cd11f4c1 100755 (executable)
@@ -149,6 +149,7 @@ writefile () {
        ignore "openvpn/openvpn-status.log"
        ignore "cups/subscriptions.conf"
        ignore "cups/subscriptions.conf.O"
+       ignore "fake-hwclock.data"
        nl
        
        comment "editor temp files"
@@ -174,9 +175,9 @@ if [ -e "$file" ]; then
                fi
        fi
        realfile="$file"
-       if [ -n "`type -p tempfile`" ]; then
+       if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then
                tempfile="tempfile"
-       elif [ -n "`type -p mktemp`" ]; then
+       elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then
                tempfile="mktemp"
        else
                echo "etckeeper warning: can't find tempfile or mktemp" >&2
index 3ebb3c4b70bd7f7cb25a2086f18507400aa5747b..56df53c5aacad1bc1c69dff28b8f8245ed882887 100644 (file)
@@ -12,6 +12,9 @@
        <!-- This is also set in aliases above -->
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>sans-serif</string>
                </test>
@@ -20,6 +23,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>serif</string>
                </test>
@@ -28,6 +34,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>monospace</string>
                </test>
index 4d9dddd0cc6ffcd933c02c4c4d2063dd5a9ad652..38bf534484cb7326a2f226d6763b89f8c11b1df6 100644 (file)
@@ -13,6 +13,9 @@
        <!-- Infinality Appearance - Replace Various Fonts -->
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family" qual="first">
                        <string>Helvetica</string>
                </test>
@@ -21,6 +24,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Helvetica</string>
                </test>
@@ -30,6 +36,9 @@
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family" qual="first">
                        <string>Courier 10 Pitch</string>
                </test>
@@ -38,6 +47,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier 10 Pitch</string>
                </test>
@@ -47,6 +59,9 @@
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family" qual="first">
                        <string>Helvetica Neue</string>
                </test>
@@ -55,6 +70,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Helvetica Neue</string>
                </test>
@@ -64,6 +82,9 @@
        </match>
        
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino</string>
                </test>
@@ -72,6 +93,9 @@
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino</string>
                </test>
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
                </test>
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
                </test>
        <!-- Replace Courier New 10px and under with Courier -->
        <!-- doesn't work on chrome -->
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier New</string>
                </test>
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier New</string>
                </test>         
 
        <!-- Replace Times with Times New Roman -->
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
                </test>
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
                </test>         
index 56a9f904757c238c9323f71190ee13b036d0bc6c..9c84a2215efd61acbc9e259cdc45bdcad991d0ab 100644 (file)
 
        <!-- Linux Appearance - Replace with Linux fonts -->
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Arial</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica Neue</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Liberation Sans</string>
                </edit>
        </match>
+
+
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Arial</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica Neue</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Sans</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
                </edit>
        </match>
 
+
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Bitstream Vera Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>DejaVu Sans</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Verdana</string>
                </test>
                <edit name="family" mode="assign">
                        <string>DejaVu Sans</string>
                </edit>
        </match>
+
+
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Bitstream Vera Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Sans</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Verdana</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Courier New</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Liberation Mono</string>
                </edit>
        </match>
+
+
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Liberation Mono</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Courier New</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
                </edit>
        </match>
 
+
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>DejaVu Serif</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>DejaVu Serif</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Times New Roman</string>
                </test>
                <edit name="family" mode="assign">
                        <string>DejaVu Serif</string>
                </edit>
        </match>
+
+        
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Serif</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Serif</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Times New Roman</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
index 9ced9fbb445e9372c0acf2257c0e8548618cbc60..0b22c30391a28b32776231240e4d02bcc86cfeeb 100644 (file)
@@ -6,11 +6,54 @@
 
        <!-- OSX Appearance - Replace with OSX fonts -->
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Arial</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Arial</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Helvetica Neue</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier New</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Courier</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Courier</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier New</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Courier</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Courier</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times New Roman</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Serif</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Serif</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeSerif</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times New Roman</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Serif</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Serif</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeSerif</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino Linotype</string>
                </test>
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino Linotype</string>
                </test>
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Lucida Grande</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Sans Unicode</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Lucida Grande</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Sans Unicode</string>
                </test>
                <edit name="family" mode="assign">
index 5e66fd44ef640e85fb0cb60723427e8c46643315..d0e6b152625af4eb86a6683221f63d0e9dffb917 100644 (file)
@@ -6,12 +6,65 @@
 
        <!-- Microsoft Appearance - Replace With MS Fonts -->
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica Neue</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Sans L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica Neue</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Helvetica</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Arial</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Freesans</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Bitstream Vera Sans</string>
                        <string>DejaVu Sans</string>
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Bitstream Vera Sans</string>
                        <string>DejaVu Sans</string>
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Courier New</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Courier New</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Courier</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Courier New</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Courier New</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Mono L</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Serif</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Serif</string>
                </test>
                <edit name="family" mode="assign">
                </edit>
        </match>
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Times</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Serif</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Nimbus Serif L</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Times New Roman</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Serif</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino</string>
                </test>
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Palatino</string>
                </test>
        </match>
 
        <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Lucida Sans Unicode</string>
+               </edit>
+       </match>
+       <match target="pattern">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Grande</string>
                </test>
                <edit name="family" mode="prepend" binding="strong">
                </edit>
        </match>
        <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
                <test name="family">
                        <string>Lucida Sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>Lucida Sans Unicode</string>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="do_substitutions">
+                       <bool>true</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Grande</string>
                </test>
                <edit name="family" mode="assign">
index 027a85e433618ffc586b50a83f33c6a9e836851a..a7e170163db7f975657aa5a7f6b30d4faa734c73 100644 (file)
        <!-- A list of non TT instructed fonts -->
        <match target="font">
                <test name="family">
-                       <string>Abel</string>
                        <string>AR PL ShanHeiSun Uni</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Abel</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Abril Fatface</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Aclonica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Acme</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Actor</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Aladin</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Aldrich</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Alex Brush</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Alfa Slab One</string>
-                       <string>Alike Angular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Alike</string>
-                       <string>Allerta Stencil</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Alike Angular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Allerta</string>
-                       <string>Almendra SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Allerta Stencil</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Almendra</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Almendra SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Amaranth</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>American Typewriter</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Andada</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Andika</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Annie Use Your Telescope</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Anton</string>
-                       <string>Apple Garamond Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Apple Garamond</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Apple Garamond Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Apple Symbols</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>AppleGothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Arabic Typesetting</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Arapey</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Arbutus</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Architects Daughter</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Arizonia</string>
-                       <string>Armata</string>
-                       <string>Asset</string>
-                       <string>Astloch</string>
-                       <string>Asul</string>
-                       <string>Atomic Age</string>
-                       <string>Aubrey</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Armata</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Asset</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Astloch</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Asul</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Atomic Age</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Aubrey</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bad Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Baekmuk Gulim</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Balthazar</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bangers</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Basic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Baskerville</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Baumans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Belgrano</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bentham</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bevan</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Big Caslon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bigshot One</string>
-                       <string>Bilbo Swash Caps</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bilbo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Bilbo Swash Caps</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bitter</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Black Ops One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bonbon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Boogaloo</string>
-                       <string>Bowlby One SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bowlby One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Bowlby One SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Brawler</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bree Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>BrushScript</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bubblegum Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Buda</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Buenard</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Butcherman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>CMU Bright</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Cabin</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cabin Condensed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cabin Sketch</string>
-                       <string>Cabin</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Caesar Dressing</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cagliostro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Calligraffitti</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cambo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Candal</string>
-                       <string>Cantarell Regular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cantarell</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Cantarell Regular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>CantarellRegular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cardo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Carme</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Carter One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Caudex</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cedarville Cursive</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Century Schoolbook L</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ceviche One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Changa One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Chango</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Charis SIL</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cherry Cream Soda</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Chewy</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Chicle</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Chivo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cochin</string>
-                       <string>Coda Caption</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Coda</string>
-                       <string>Comfortaa Regular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Coda Caption</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Comfortaa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Comfortaa Regular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ComfortaaRegular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Coming Soon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Concert One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Contrail One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Convergence</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cookie</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Copperplate</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Copse</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Corben</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Courier Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Courier10 BT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Coustard</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Covered By Your Grace</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Crafty Girls</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Creepster</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Crete Round</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Crimson Text</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Crushed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Cuprum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Damion</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dancing Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>David</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dawning of a New Day</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Days One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Delius</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Delius Swash Caps</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Delius Unicase</string>
-                       <string>Delius</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Devonshire</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Didact Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Didot</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>DilenniaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>District</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>DokChampa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dorsa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dr Sugiyama</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Duru Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dutch801 Rm BT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Dynalight</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>EB Garamond</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Eater</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Electrolize</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Engagement</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Enriqueta</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>EucrosiaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Eurostile LT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Expletus Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fanwood Text</string>
-                       <string>Fascinate Inline</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fascinate</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Fascinate Inline</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Federant</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Federo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fjord One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Flamenco</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Flavors</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fondamento</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fontdiner Swanky</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Forum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Francois One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>FreeMono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>FreeSans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>FreeSerif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>FreesiaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fresca</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Frijole</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Frutiger LT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Frutiger-Normal</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Fugaz One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Galdeano</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Gautami</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Geneva Regular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Geo</string>
-                       <string>Geostar Fill</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Geostar</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Geostar Fill</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Give You Glory</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Gloria Hallelujah</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Goblin One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Gochi Hand</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Goudy Bookletter 1911</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Gravitas One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Gruppo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Habibi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Hammersmith One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Handlee</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Helvetica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Helvetica CY</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Helvetica Neue</string>
-                       <string>Helvetica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Herr Von Muellerhoff</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Holtwood One SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Homemade Apple</string>
-                       <string>IM Fell DW Pica SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IM Fell DW Pica</string>
-                       <string>IM Fell Double Pica SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell DW Pica SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IM Fell Double Pica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell Double Pica SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell English</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IM Fell English SC</string>
-                       <string>IM Fell English</string>
-                       <string>IM Fell French Canon SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IM Fell French Canon</string>
-                       <string>IM Fell Great Primer SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell French Canon SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IM Fell Great Primer</string>
-                       <string>IM Fell</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>IM Fell Great Primer SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Iceland</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Inder</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Indie Flower</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>IrisUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Irish Grover</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Italianno</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>JasmineUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Jockey One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Jomolhari</string>
-                       <string>Josefin Sans Std Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Josefin Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Josefin Sans Std Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Josefin Slab</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Judson</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Julee</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Jura</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Just Another Hand</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Just Me Again Down Here</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kai</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kalinga</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kameron</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kelly Slab</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kenia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Knewave</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>KodchiangUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kranky</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kreon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Kristi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>La Belle Aurore</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Laconic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lacuna</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lancelot</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lato</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>League Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Leckerli One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lekton</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lemon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Levenim MT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>LilyUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Limelight</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Linden Hill</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Linux Biolinum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Linux Libertine</string>
-                       <string>Lobster Two</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Linux Libertine Display O</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Linux Libertine Initials O</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Linux Libertine Mono O</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Linux Libertine O</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lobster</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Lobster Two</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Bengali</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Lohit Devanagari</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Gujarati</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Hindi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Kannada</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Malayalam</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Oriya</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Punjabi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Tamil</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lohit Telugu</string>
-                       <string>Lohit Devanagari</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lora</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Love Ya Like A Sister</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Loved by the King</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lucida Sans Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Luckiest Guy</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Luxi Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Luxi Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>M+ 2p</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MS-Mincho</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Maiden Orange</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Marck Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Marko One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Marmelad</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Marvel</string>
-                       <string>Mate SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mate</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Mate SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Maven Pro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Meddon</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MedievalSharp</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Medula One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Megalopolis</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Megrim</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Merienda One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Merriweather</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Metamorphous</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Metrophobic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MgOpen Canonica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MgOpen Cosmetica</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MgOpen Modata</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MgOpen Moderna</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Michroma</string>
-                       <string>Miltonian Tattoo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Miltonian</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Miltonian Tattoo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Miniver</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Miriam</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Miss Fajardose</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Miss Saint Delafield</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Modern Antiqua</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Monofett</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Monoton</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Monsieur La Doulaise</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Montez</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Montserrat</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mountains of Christmas</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mr Bedford</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mr Dafoe</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mr De Haviland</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Mrs Sheppards</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Muli</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Myriad Pro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MyriadRegular</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Neucha</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>News Cycle</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Niconne</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nimbus Mono L</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nimbus Roman No9 L</string>
-                       <string>Nimbus Sans L</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nimbus Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Nimbus Sans L</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nixie One</string>
-                       <string>Nobile-bold-italic002</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Nobile</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nobile-bold</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Nobile-bold-italic002</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nobile-italic002</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nobile002</string>
-                       <string>Nobile</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nosifer</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nothing You Could Do</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Noticia Text</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Numans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Nunito</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>OFL Sorts Mill Goudy TT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>OTS derived font</string>
-                       <string>OTS derivied font</string>      <!-- bug in chrome code? -->
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>OTS derivied font       <!-- bug in chrome code? --></string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ocean Sans Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Old Standard TT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Optima</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Orbitron</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Original Surfer</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Oswald</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Over the Rainbow</string>
-                       <string>Overlock SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Overlock</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Overlock SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ovo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Oxygen</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Pacifico</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Palladio</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Passero One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Passion One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Patrick Hand</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Patua One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Paytone One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Permanent Marker</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Petrona</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Philosopher</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Piedra</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Pinyon Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Plaster</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Playball</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Playfair Display</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Podkova</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Poller One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Poly</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Pompiere</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Prata</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>PrimaSans BT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Prociono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Puritan</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Quantico</string>
-                       <string>Quattrocento Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Quattrocento</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Quattrocento Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Questrial</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Quicksand</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Qwigley</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Radley</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Raleway</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rammetto One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rancho</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rationale</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Redressed</string>
-                       <string>Ribeye Marrow</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ribeye</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Ribeye Marrow</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Righteous</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rochester</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rock Salt</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rokkitt</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Rosario</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ruge Boogie</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ruslan Display</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ruthie</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sail</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Salsa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sancreek</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sansita One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sarina</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Satisfy</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Schoolbell</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Shadows Into Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Shanti</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Short Stack</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sigmar One</string>
-                       <string>Signika Negative</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Signika</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Signika Negative</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>SimHei</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Six Caps</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Slackey</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Smokum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Smythe</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sniglet</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Snippet</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sofia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sorts Mill Goudy</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Special Elite</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Spicy Rice</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Spinnaker</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Spirax</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Squada One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Stardos Stencil</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Stint Ultra Condensed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Stoke</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sue Ellen Francisco</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Sunshiney</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Supermercado One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Swanky and Moo Moo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Swansea</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Swiss721</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Syncopate</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Tenor Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Terminal Dosis</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>The Girl Next Door</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>TheSans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Tienne</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Times LT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Times New Roman MT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Times Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Times Ten LT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Trade Winds</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Trykker</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Tulpen One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>URWClassico</string>
-                       <string>Ultra-Light 100</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ultra</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Ultra-Light 100</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Uncial Antiqua</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>UnifrakturCook</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>UnifrakturMaguntia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Univers LT Std</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Unkempt</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Unlock</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Unna</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Utopia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>VT323</string>
-                       <string>Varela Round</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Varela</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>Varela Round</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Vast Shadow</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Verdimka</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Vibur</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Vidaloka</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Viga</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Volkhov</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Voltaire</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Waiting for the Sunrise</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Wallpoet</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Walter Turncoat</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Wire One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Yellowtail</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Yeseva One</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Yesteryear</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Zeyada</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmbx10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmex10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmmi10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmr10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmsy10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>cmtt10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>eufm10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>msam10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>msbm10</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
+                       <string>proxima nova</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>proxima nova bold</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>proxima nova regular</string>
-                       <string>proxima nova</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>proxima-nova-1</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>proxima-nova-2</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>NON TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>wasy10</string>
                </test>
                <edit name="font_type" mode="assign">
        </match>
 
 </fontconfig>
+
index 62a6d9dee1d7ba2c6e8c534d5e6a49483dae462a..a56d990bdc64d82a049a574d5eb1c04a15410220 100644 (file)
@@ -5,7 +5,7 @@
        <!-- ##Style: common -->
 
        <!-- A list of TT instructed fonts that are verified
-         to look OK with infinality patches -->
+               to look OK with infinality patches -->
 
        <match target="font">
                <test name="force_autohint">
                </test>
                <test name="family">
                        <string>Adamina</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Aguafina Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Alice</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Allan</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Aller</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Aller Display</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Aller Light</string>
-                       <string>Aller</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Amatic SC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Andale Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Andalus</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Angsana New</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>AngsanaUPC</string>
-                       <string>Anonymous Pro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Anonymous</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Anonymous Pro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Antic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Aparajita</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Apple Chancery</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Apple LiGothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Aquabase</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Arabic Typesetting</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arial</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Arial Black</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Arial MT</string>
-                       <string>Arial Monospaced</string>
-                       <string>Arial Narrow</string>
-                       <string>Arial SF MT</string>
-                       <string>Arial Unicode MS</string>
-                       <string>Arial</string>
-                       <string>ArialMT</string>
-                       <string>Arimo</string>
-                       <string>Arimo</string>
-                       <string>Artifika</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arial Monospaced</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arial Narrow</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arial SF MT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arial Unicode MS</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>ArialMT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arimo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Arimo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Artifika</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Arvo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>BPmono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Batang</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>BatangChe</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Bitstream Charter</string>
-                       <string>Bitstream Vera Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Bitstream Vera Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Bitstream Vera Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Bitstream Vera Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Book Antiqua</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Bookman Old Style</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Browallia New</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>BrowalliaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Calibri</string>
-                       <string>Cambria Math</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Cambria</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Cambria Math</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Candara</string>
-                       <string>Century Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Century</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Century Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Chalkboard</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Chalkduster</string>
-                       <string>Charcoal CY</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Charcoal</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Charcoal CY</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Charis SIL</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Chicago</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Comic Sans MS</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Consolas</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Constantia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Corbel</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Cordia New</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>CordiaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Courier</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Courier 10 Pitch</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Courier New</string>
-                       <string>Courier</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Cousine</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DFKai-SB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Dark Courier</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DaunPenh</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>David</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu LGC Sans Mono</string>
-                       <string>DejaVu Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>DejaVu Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DejaVu Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Delicious</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DilleniaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DokChampa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Dotum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>DotumChe</string>
-                       <string>Droid Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Droid Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Droid Sans Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Droid Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Ebrima</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Essential PragmataPro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Estrangelo Edessa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>EucrosiaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Euphemia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>FangSong</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>FrankRuehl</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Franklin Gothic Medium</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>FreesiaUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Frutiger Linotype</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Futura</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gabriola</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Garamond</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gautami</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Geneva</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Geneva CY</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Gentium</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gentium Basic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gentium Book Basic</string>
-                       <string>Gentium</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Georgia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gill Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gisha</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gotham Book</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gotham Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gotham Medium</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Guatami</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gulim</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>GulimChe</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Gungsuh</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>GungsuhChe</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Hard Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Herculanum</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Hoefler Text</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Impact</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Inconsolata</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>IrisUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Iskoola Pota</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Istok Web</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>JasmineUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>KaiTi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Kalinga</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Kartika</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Khmer UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>KodchiangUPC</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Kokila</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lao UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Latha</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Leelawadee</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Levenim MT</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Liberation Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>LilyUPC</string>
-                       <string>Linux Libertine</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lobster</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Console</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Grande</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Lucida Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Sans Typewriter</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Lucida Sans Unicode</string>
-                       <string>Lucida Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Luxi Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MS Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MS Mincho</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MS PGothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MS PMincho</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MS UI Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MV Boli</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Mako</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Malgun Gothic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Mangal</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Marker Felt</string>
-                       <string>Meiryo UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Meiryo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Meiryo UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Menlo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MetaBold-Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MetaBook-Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MetaMedium-Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft Himalaya</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft JhengHei</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft New Tai Lue</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft PhagsPa</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft Sans Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft Tai Le</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft Uighur</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft YaHei</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Microsoft Yi Baiti</string>
-                       <string>MingLiU-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MingLiU</string>
-                       <string>MingLiU_HKSCS-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>MingLiU-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MingLiU_HKSCS</string>
-                       <string>Miriam Fixed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>MingLiU_HKSCS-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Miriam</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Miriam Fixed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Molengo</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Monaco</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Mongolian Baiti</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>MoolBoran</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>NSimSun</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Narkisim</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Neuton</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nina</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Cut</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Flat</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Oval</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Round</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Slim</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nova Square</string>
-                       <string>NovaMono </string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>NovaMono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Nyala</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Open Sans</string>
-                       <string>PMingLiU-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>PMingLiU</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>PMingLiU-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>PT Sans</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>PT Sans Caption</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>PT Sans Narrow</string>
-                       <string>PT Sans</string>
-                       <string>PT Serif Caption</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>PT Serif</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>PT Serif Caption</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Padauk</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Palatino Linotype</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Papyrus</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Plantagenet Cherokee</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Play</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Pragmata</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>PragmataPro</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Raavi</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Reenie Beanie</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Rod</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Sakkal Majalla</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Segoe Print</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Segoe Script</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Segoe UI Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe UI Mono</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Segoe UI Semibold</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Segoe UI Symbol</string>
-                       <string>Segoe UI</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe WP</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe WP Black</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe WP Light</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe WP SemiLight</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Segoe WP Semibold</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Shonar Bangla</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Shruti</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>SimHei</string>
-                       <string>SimSun-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>SimSun</string>
-                       <string>Simplified Arabic Fixed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>SimSun-ExtB</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Simplified Arabic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Simplified Arabic Fixed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Skia</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Sylfaen</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Symbol</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>TITUS Cyberbit Basic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Tahoma</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Tangerine</string>
-                       <string>Times New Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Times</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Times New Roman</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Tinos</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Traditional Arabic</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Trebuchet MS</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Tunga</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
+                       <string>Ubuntu</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Ubuntu Condensed</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Ubuntu Mono</string>
-                       <string>Ubuntu</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Utsaah</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Vani</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Verdana</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Vijaya</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Vollkorn</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Vrinda</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Webdings</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Wingdings</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Yanone Kaffeesatz</string>
+               </test>
+               <edit name="font_type" mode="assign">
+                       <string>TT Instructed Font</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="force_autohint">
+                       <bool>false</bool>
+               </test>
+               <test name="family">
                        <string>Zapfino</string>
                </test>
                <edit name="font_type" mode="assign">
        </match>
 
 </fontconfig>
+
diff --git a/fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf b/fonts/infinality/conf.src/61-group-non-tt-rendering-default.conf
new file mode 100644 (file)
index 0000000..3f7402f
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+
+       <!-- ##Style: common -->
+
+       <!-- Make these fonts use autohint slight hinting -->
+       <!-- Makes only horizontal stems align to pixels.  Truer to glyph -->
+
+       <match target="font">
+               <test name="font_type">
+                       <string>NON TT Instructed Font</string>
+               </test>
+               <edit name="autohint" mode="assign">
+                       <bool>true</bool>
+               </edit>
+               <edit name="hintstyle" mode="assign">
+                       <const>hintslight</const>
+               </edit>
+               <edit name="hinting" mode="assign">
+                       <bool>true</bool>
+               </edit>
+               <edit name="antialias" mode="assign">
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+</fontconfig>
index 70a9cfa9087491f945bbd6c726af4a1c660552bd..290f1f0721cf4e8cd34830a31f32609636919c22 100644 (file)
        <!-- Monochrome BCI for these fonts (circa Windows 98) -->
        <!-- This will make them look like crisp bitmap fonts. -->
        <!-- This should only be used by fonts that contain good TrueType instructions -->
+       
        <match target="font">
                <test name="family">
                        <string>Andale Mono</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Anonymous Pro</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Bitstream Vera Sans Mono</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Courier New</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>DejaVu Sans Mono</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Essential PragmataPro</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Inconsolata</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Liberation Mono</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lucida Console</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Lucida Sans Typewriter</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Monaco</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Pragmata</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>PragmataPro</string>
+               </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Ubuntu Mono</string>
                </test>
+               <edit name="tt-monospace-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="tt-monospace-rendering">
+                       <string>use-bitmaps-if-set</string>
+               </test>
                <test name="bitmap_monospace">
                        <bool>true</bool>
                </test>
index 46c4b67349fb875c327756b13c5eeb4e9d80786b..eda8ff5e4445b3bd0afd573f5e34d71fa4bd39ff 100644 (file)
@@ -7,18 +7,92 @@
        <!-- OVERRIDE SETTINGS -->
        <!-- Make these fonts use no antialiasing or hinting (circa DOS / X11) -->
        <!-- This should only be used on TTF outline fonts made from traced bitmaps and/or containing embedded bitmaps -->
+
        <match target="font">
                <test name="family">
                        <string>ProFontWindows</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ProggyCleanTT</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ProggySquareTTSZ</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ProggyTinyTTSZ</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ProggyCleanTT CE</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>ProFont</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Terminus</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>Terminus (TTF)</string>
+               </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family">
                        <string>MonteCarlo</string>
                </test>
+               <edit name="tt-traced-bitmap-rendering" mode="assign">
+                       <string>use-bitmaps-if-set</string>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="tt-traced-bitmap-rendering">
+                       <string>use-bitmaps-if-set</string>
+               </test>
                <edit name="hintstyle" mode="assign">
                        <const>hintnone</const>
                </edit>
        <match target="pattern">
                <test name="family">
                        <string>ProggyCleanTT</string>
+               </test>
+               <test name="pixelsize" compare="not_eq">
+                       <double>16</double>
+               </test>
+               <edit name="pixelsize" mode="assign">
+                       <double>16</double>
+               </edit>
+       </match>
+
+       <match target="pattern">
+               <test name="family">
                        <string>ProggyCleanTT CE</string>
+               </test>
+               <test name="pixelsize" compare="not_eq">
+                       <double>16</double>
+               </test>
+               <edit name="pixelsize" mode="assign">
+                       <double>16</double>
+               </edit>
+       </match>
+
+       <match target="pattern">
+               <test name="family">
                        <string>ProggySquareTTSZ</string>
+               </test>
+               <test name="pixelsize" compare="not_eq">
+                       <double>16</double>
+               </test>
+               <edit name="pixelsize" mode="assign">
+                       <double>16</double>
+               </edit>
+       </match>
+
+       <match target="pattern">
+               <test name="family">
                        <string>ProggyTinyTTSZ</string>
                </test>
                <test name="pixelsize" compare="not_eq">
index 029b0840e925a6db45913a8face9cc1e274c8a11..ba21a53846dae0af5ada2e981a025cb8e41db296 100644 (file)
        <match target="font">
                <test name="family">
                        <string>Droid Sans Mono</string>
+               </test>
+               <test name="pixelsize" compare="more_eq" >
+                       <double>19</double>
+               </test>
+               <edit name="autohint" mode="assign" >
+                       <bool>true</bool>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="family">
                        <string>Droid Sans</string>
                </test>
                <test name="pixelsize" compare="more_eq" >
        <match target="font">
                <test name="family">
                        <string>Aquabase</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>14</double>
+               </test>
+               <edit name="hintstyle" mode="assign">
+                       <const>hintslight</const>
+               </edit>
+               <edit name="autohint" mode="assign">
+                       <bool>true</bool>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="family">
                        <string>Browallia New</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>14</double>
+               </test>
+               <edit name="hintstyle" mode="assign">
+                       <const>hintslight</const>
+               </edit>
+               <edit name="autohint" mode="assign">
+                       <bool>true</bool>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="family">
                        <string>BrowalliaUPC</string>
                </test>
                <test name="pixelsize" compare="less">
                <test name="slant" compare="not_eq">
                        <const>roman</const>
                </test>
-               <test name="pixelsize" compare="eq" >
+               <test name="pixelsize" compare="more_eq" >
                        <double>18</double>
+               </test>
+               <test name="pixelsize" compare="less_eq" >
                        <double>19</double>
                </test>
                <edit name="autohint" mode="assign" >
                <test name="family">
                        <string>Gill Sans</string>
                </test>
-               <test name="pixelsize" compare="eq" >
+               <test name="pixelsize" compare="more_eq" >
                        <double>11</double>
+               </test>
+               <test name="pixelsize" compare="less_eq" >
                        <double>12</double>
                </test>
                <edit name="autohint" mode="assign" >
                <test name="family">
                        <string>Droid Sans</string>
                </test>
-               <test name="pixelsize" compare="eq" >
+               <test name="pixelsize" compare="more_eq" >
                        <double>9</double>
-                       <double>10</double>
+               </test>
+               <test name="pixelsize" compare="less_eq" >
                        <double>11</double>
+               </test>
+               <test name="weight" compare="more" >
+                       <const>medium</const>
+               </test>
+               <edit name="autohint" mode="assign" >
+                       <bool>true</bool>
+               </edit>
+               <edit name="hintstyle" mode="assign">
+                       <const>hintslight</const>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="family">
+                       <string>Droid Sans</string>
+               </test>
+               <test name="pixelsize" compare="eq" >
                        <double>14</double>
                </test>
                <test name="weight" compare="more" >
                <test name="family">
                        <string>Ubuntu Mono</string>
                </test>
-               <test name="pixelsize" compare="eq" >
+               <test name="pixelsize" compare="more_eq" >
                        <double>12</double>
+               </test>
+               <test name="pixelsize" compare="less_eq" >
                        <double>13</double>
                </test>
                <test name="weight" compare="more" >
diff --git a/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk
new file mode 100644 (file)
index 0000000..7df981c
--- /dev/null
@@ -0,0 +1,44 @@
+BEGIN {
+       printf "<?xml version='1.0'?>\n"
+       printf "<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>\n"
+       printf "<fontconfig>\n\n"
+       printf "\t<!-- ##Style: common -->\n\n"
+       printf "\t<!-- Make these fonts use autohint slight hinting -->\n"
+       printf "\t<!-- Makes only horizontal stems align to pixels.  Truer to glyph -->\n\n"
+       printf "\t<!-- A list of non TT instructed fonts -->\n"
+}
+
+{
+       printf "\t<match target=\"font\">\n"
+       printf "\t\t<test name=\"family\">\n"
+       printf "\t\t\t<string>" 
+       printf $0
+       printf "</string>\n"
+       printf "\t\t</test>\n"
+       printf "\t\t<edit name=\"font_type\" mode=\"assign\">\n"
+       printf "\t\t\t<string>NON TT Instructed Font</string>\n"
+       printf "\t\t</edit>\n"
+       printf "\t</match>\n\n"
+}
+
+END {
+       printf "\t<match target=\"font\">\n"
+       printf "\t\t<test name=\"font_type\">\n"
+       printf "\t\t\t<string>NON TT Instructed Font</string>\n"
+       printf "\t\t</test>\n"
+       printf "\t\t<edit name=\"autohint\" mode=\"assign\">\n"
+       printf "\t\t\t<bool>true</bool>\n"
+       printf "\t\t</edit>\n"
+       printf "\t\t<edit name=\"hintstyle\" mode=\"assign\">\n"
+       printf "\t\t\t<const>hintslight</const>\n"
+       printf "\t\t</edit>\n"
+       printf "\t\t<edit name=\"hinting\" mode=\"assign\">\n"
+       printf "\t\t\t<bool>true</bool>\n"
+       printf "\t\t</edit>\n"
+       printf "\t\t<edit name=\"antialias\" mode=\"assign\">\n"
+       printf "\t\t\t<bool>true</bool>\n"
+       printf "\t\t</edit>\n"
+       printf "\t</match>\n\n"
+       printf "</fontconfig>\n\n"
+}
+
diff --git a/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list b/fonts/infinality/conf.src/generate60/60-group-non-tt-fonts.list
new file mode 100644 (file)
index 0000000..7c4cb20
--- /dev/null
@@ -0,0 +1,474 @@
+AR PL ShanHeiSun Uni
+Abel
+Abril Fatface
+Aclonica
+Acme
+Actor
+Aladin
+Aldrich
+Alex Brush
+Alfa Slab One
+Alike
+Alike Angular
+Allerta
+Allerta Stencil
+Almendra
+Almendra SC
+Amaranth
+American Typewriter
+Andada
+Andika
+Annie Use Your Telescope
+Anton
+Apple Garamond
+Apple Garamond Light
+Apple Symbols
+AppleGothic
+Arabic Typesetting
+Arapey
+Arbutus
+Architects Daughter
+Arizonia
+Armata
+Asset
+Astloch
+Asul
+Atomic Age
+Aubrey
+Bad Script
+Baekmuk Gulim
+Balthazar
+Bangers
+Basic
+Baskerville
+Baumans
+Belgrano
+Bentham
+Bevan
+Big Caslon
+Bigshot One
+Bilbo
+Bilbo Swash Caps
+Bitter
+Black Ops One
+Bonbon
+Boogaloo
+Bowlby One
+Bowlby One SC
+Brawler
+Bree Serif
+BrushScript
+Bubblegum Sans
+Buda
+Buenard
+Butcherman
+CMU Bright
+Cabin
+Cabin Condensed
+Cabin Sketch
+Caesar Dressing
+Cagliostro
+Calligraffitti
+Cambo
+Candal
+Cantarell
+Cantarell Regular
+CantarellRegular
+Cardo
+Carme
+Carter One
+Caudex
+Cedarville Cursive
+Century Schoolbook L
+Ceviche One
+Changa One
+Chango
+Charis SIL
+Cherry Cream Soda
+Chewy
+Chicle
+Chivo
+Cochin
+Coda
+Coda Caption
+Comfortaa
+Comfortaa Regular
+ComfortaaRegular
+Coming Soon
+Concert One
+Contrail One
+Convergence
+Cookie
+Copperplate
+Copse
+Corben
+Courier Std
+Courier10 BT
+Coustard
+Covered By Your Grace
+Crafty Girls
+Creepster
+Crete Round
+Crimson Text
+Crushed
+Cuprum
+Damion
+Dancing Script
+David
+Dawning of a New Day
+Days One
+Delius
+Delius Swash Caps
+Delius Unicase
+Devonshire
+Didact Gothic
+Didot
+DilenniaUPC
+District
+DokChampa
+Dorsa
+Dr Sugiyama
+Duru Sans
+Dutch801 Rm BT
+Dynalight
+EB Garamond
+Eater
+Electrolize
+Engagement
+Enriqueta
+EucrosiaUPC
+Eurostile LT Std
+Expletus Sans
+Fanwood Text
+Fascinate
+Fascinate Inline
+Federant
+Federo
+Fjord One
+Flamenco
+Flavors
+Fondamento
+Fontdiner Swanky
+Forum
+Francois One
+FreeMono
+FreeSans
+FreeSerif
+FreesiaUPC
+Fresca
+Frijole
+Frutiger LT Std
+Frutiger-Normal
+Fugaz One
+Galdeano
+Gautami
+Geneva Regular
+Geo
+Geostar
+Geostar Fill
+Give You Glory
+Gloria Hallelujah
+Goblin One
+Gochi Hand
+Goudy Bookletter 1911
+Gravitas One
+Gruppo
+Habibi
+Hammersmith One
+Handlee
+Helvetica
+Helvetica CY
+Helvetica Neue
+Herr Von Muellerhoff
+Holtwood One SC
+Homemade Apple
+IM Fell
+IM Fell DW Pica
+IM Fell DW Pica SC
+IM Fell Double Pica
+IM Fell Double Pica SC
+IM Fell English
+IM Fell English SC
+IM Fell French Canon
+IM Fell French Canon SC
+IM Fell Great Primer
+IM Fell Great Primer SC
+Iceland
+Inder
+Indie Flower
+IrisUPC
+Irish Grover
+Italianno
+JasmineUPC
+Jockey One
+Jomolhari
+Josefin Sans
+Josefin Sans Std Light
+Josefin Slab
+Judson
+Julee
+Jura
+Just Another Hand
+Just Me Again Down Here
+Kai
+Kalinga
+Kameron
+Kelly Slab
+Kenia
+Knewave
+KodchiangUPC
+Kranky
+Kreon
+Kristi
+La Belle Aurore
+Laconic
+Lacuna
+Lancelot
+Lato
+League Script
+Leckerli One
+Lekton
+Lemon
+Levenim MT
+LilyUPC
+Limelight
+Linden Hill
+Linux Biolinum
+Linux Libertine
+Linux Libertine Display O
+Linux Libertine Initials O
+Linux Libertine Mono O
+Linux Libertine O
+Lobster
+Lobster Two
+Lohit Bengali
+Lohit Devanagari
+Lohit Gujarati
+Lohit Hindi
+Lohit Kannada
+Lohit Malayalam
+Lohit Oriya
+Lohit Punjabi
+Lohit Tamil
+Lohit Telugu
+Lora
+Love Ya Like A Sister
+Loved by the King
+Lucida Sans Std
+Luckiest Guy
+Luxi Sans
+Luxi Serif
+M+ 2p
+MS-Mincho
+Maiden Orange
+Marck Script
+Marko One
+Marmelad
+Marvel
+Mate
+Mate SC
+Maven Pro
+Meddon
+MedievalSharp
+Medula One
+Megalopolis
+Megrim
+Merienda One
+Merriweather
+Metamorphous
+Metrophobic
+MgOpen Canonica
+MgOpen Cosmetica
+MgOpen Modata
+MgOpen Moderna
+Michroma
+Miltonian
+Miltonian Tattoo
+Miniver
+Miriam
+Miss Fajardose
+Miss Saint Delafield
+Modern Antiqua
+Monofett
+Monoton
+Monsieur La Doulaise
+Montez
+Montserrat
+Mountains of Christmas
+Mr Bedford
+Mr Dafoe
+Mr De Haviland
+Mrs Sheppards
+Muli
+Myriad Pro
+MyriadRegular
+Neucha
+News Cycle
+Niconne
+Nimbus Mono L
+Nimbus Roman No9 L
+Nimbus Sans
+Nimbus Sans L
+Nixie One
+Nobile
+Nobile-bold
+Nobile-bold-italic002
+Nobile-italic002
+Nobile002
+Nosifer
+Nothing You Could Do
+Noticia Text
+Numans
+Nunito
+OFL Sorts Mill Goudy TT
+OTS derived font
+OTS derivied font      <!-- bug in chrome code? -->
+Ocean Sans Std
+Old Standard TT
+Optima
+Orbitron
+Original Surfer
+Oswald
+Over the Rainbow
+Overlock
+Overlock SC
+Ovo
+Oxygen
+Pacifico
+Palladio
+Passero One
+Passion One
+Patrick Hand
+Patua One
+Paytone One
+Permanent Marker
+Petrona
+Philosopher
+Piedra
+Pinyon Script
+Plaster
+Playball
+Playfair Display
+Podkova
+Poller One
+Poly
+Pompiere
+Prata
+PrimaSans BT
+Prociono
+Puritan
+Quantico
+Quattrocento
+Quattrocento Sans
+Questrial
+Quicksand
+Qwigley
+Radley
+Raleway
+Rammetto One
+Rancho
+Rationale
+Redressed
+Ribeye
+Ribeye Marrow
+Righteous
+Rochester
+Rock Salt
+Rokkitt
+Rosario
+Ruge Boogie
+Ruslan Display
+Ruthie
+Sail
+Salsa
+Sancreek
+Sansita One
+Sarina
+Satisfy
+Schoolbell
+Shadows Into Light
+Shanti
+Short Stack
+Sigmar One
+Signika
+Signika Negative
+SimHei
+Six Caps
+Slackey
+Smokum
+Smythe
+Sniglet
+Snippet
+Sofia
+Sorts Mill Goudy
+Special Elite
+Spicy Rice
+Spinnaker
+Spirax
+Squada One
+Stardos Stencil
+Stint Ultra Condensed
+Stoke
+Sue Ellen Francisco
+Sunshiney
+Supermercado One
+Swanky and Moo Moo
+Swansea
+Swiss721
+Syncopate
+Tenor Sans
+Terminal Dosis
+The Girl Next Door
+TheSans Mono
+Tienne
+Times LT Std
+Times New Roman MT Std
+Times Roman
+Times Ten LT Std
+Trade Winds
+Trykker
+Tulpen One
+URWClassico
+Ultra
+Ultra-Light 100
+Uncial Antiqua
+UnifrakturCook
+UnifrakturMaguntia
+Univers LT Std
+Unkempt
+Unlock
+Unna
+Utopia
+VT323
+Varela
+Varela Round
+Vast Shadow
+Verdimka
+Vibur
+Vidaloka
+Viga
+Volkhov
+Voltaire
+Waiting for the Sunrise
+Wallpoet
+Walter Turncoat
+Wire One
+Yellowtail
+Yeseva One
+Yesteryear
+Zeyada
+cmbx10
+cmex10
+cmmi10
+cmr10
+cmsy10
+cmtt10
+eufm10
+msam10
+msbm10
+proxima nova
+proxima nova bold
+proxima nova regular
+proxima-nova-1
+proxima-nova-2
+wasy10
diff --git a/fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.conf.awk
new file mode 100644 (file)
index 0000000..22e0382
--- /dev/null
@@ -0,0 +1,29 @@
+BEGIN {
+       printf "<?xml version='1.0'?>\n"
+       printf "<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>\n"
+       printf "<fontconfig>\n\n"
+       printf "\t<!-- ##Style: common -->\n\n"
+       printf "\t<!-- A list of TT instructed fonts that are verified\n"
+       printf "\t\tto look OK with infinality patches -->\n\n"
+}
+
+{
+       printf "\t<match target=\"font\">\n"
+       printf "\t\t<test name=\"force_autohint\">\n"
+       printf "\t\t\t<bool>false</bool>\n"
+       printf "\t\t</test>\n"
+       printf "\t\t<test name=\"family\">\n"
+       printf "\t\t\t<string>" 
+       printf $0
+       printf "</string>\n"
+       printf "\t\t</test>\n"
+       printf "\t\t<edit name=\"font_type\" mode=\"assign\">\n"
+       printf "\t\t\t<string>TT Instructed Font</string>\n"
+       printf "\t\t</edit>\n"
+       printf "\t</match>\n\n"
+}
+
+END {
+       printf "</fontconfig>\n\n"
+}
+
diff --git a/fonts/infinality/conf.src/generate60/60-group-tt-fonts.list b/fonts/infinality/conf.src/generate60/60-group-tt-fonts.list
new file mode 100644 (file)
index 0000000..0165708
--- /dev/null
@@ -0,0 +1,252 @@
+Adamina
+Aguafina Script
+Alice
+Allan
+Aller
+Aller Display
+Aller Light
+Amatic SC
+Andale Mono
+Andalus
+Angsana New
+AngsanaUPC
+Anonymous
+Anonymous Pro
+Antic
+Aparajita
+Apple Chancery
+Apple LiGothic
+Aquabase
+Arabic Typesetting
+Arial
+Arial Black
+Arial MT
+Arial Monospaced
+Arial Narrow
+Arial SF MT
+Arial Unicode MS
+ArialMT
+Arimo
+Arimo
+Artifika
+Arvo
+BPmono
+Batang
+BatangChe
+Bitstream Charter
+Bitstream Vera Sans
+Bitstream Vera Sans Mono
+Bitstream Vera Serif
+Book Antiqua
+Bookman Old Style
+Browallia New
+BrowalliaUPC
+Calibri
+Cambria
+Cambria Math
+Candara
+Century
+Century Gothic
+Chalkboard
+Chalkduster
+Charcoal
+Charcoal CY
+Charis SIL
+Chicago
+Comic Sans MS
+Consolas
+Constantia
+Corbel
+Cordia New
+CordiaUPC
+Courier
+Courier 10 Pitch
+Courier New
+Cousine
+DFKai-SB
+Dark Courier
+DaunPenh
+David
+DejaVu LGC Sans Mono
+DejaVu Sans
+DejaVu Sans Mono
+DejaVu Serif
+Delicious
+DilleniaUPC
+DokChampa
+Dotum
+DotumChe
+Droid Sans
+Droid Sans Mono
+Droid Serif
+Ebrima
+Essential PragmataPro
+Estrangelo Edessa
+EucrosiaUPC
+Euphemia
+FangSong
+FrankRuehl
+Franklin Gothic Medium
+FreesiaUPC
+Frutiger Linotype
+Futura
+Gabriola
+Garamond
+Gautami
+Geneva
+Geneva CY
+Gentium
+Gentium Basic
+Gentium Book Basic
+Georgia
+Gill Sans
+Gisha
+Gotham Book
+Gotham Light
+Gotham Medium
+Guatami
+Gulim
+GulimChe
+Gungsuh
+GungsuhChe
+Hard Gothic
+Herculanum
+Hoefler Text
+Impact
+Inconsolata
+IrisUPC
+Iskoola Pota
+Istok Web
+JasmineUPC
+KaiTi
+Kalinga
+Kartika
+Khmer UI
+KodchiangUPC
+Kokila
+Lao UI
+Latha
+Leelawadee
+Levenim MT
+Liberation Mono
+Liberation Sans
+Liberation Serif
+LilyUPC
+Lobster
+Lucida Console
+Lucida Grande
+Lucida Sans
+Lucida Sans Typewriter
+Lucida Sans Unicode
+Luxi Mono
+MS Gothic
+MS Mincho
+MS PGothic
+MS PMincho
+MS UI Gothic
+MV Boli
+Mako
+Malgun Gothic
+Mangal
+Marker Felt
+Meiryo
+Meiryo UI
+Menlo
+MetaBold-Roman
+MetaBook-Roman
+MetaMedium-Roman
+Microsoft Himalaya
+Microsoft JhengHei
+Microsoft New Tai Lue
+Microsoft PhagsPa
+Microsoft Sans Serif
+Microsoft Tai Le
+Microsoft Uighur
+Microsoft YaHei
+Microsoft Yi Baiti
+MingLiU
+MingLiU-ExtB
+MingLiU_HKSCS
+MingLiU_HKSCS-ExtB
+Miriam
+Miriam Fixed
+Molengo
+Monaco
+Mongolian Baiti
+MoolBoran
+NSimSun
+Narkisim
+Neuton
+Nina
+Nova Cut
+Nova Flat
+Nova Oval
+Nova Round
+Nova Script
+Nova Slim
+Nova Square
+NovaMono
+Nyala
+Open Sans
+PMingLiU
+PMingLiU-ExtB
+PT Sans
+PT Sans Caption
+PT Sans Narrow
+PT Serif
+PT Serif Caption
+Padauk
+Palatino Linotype
+Papyrus
+Plantagenet Cherokee
+Play
+Pragmata
+PragmataPro
+Raavi
+Reenie Beanie
+Rod
+Sakkal Majalla
+Segoe Print
+Segoe Script
+Segoe UI
+Segoe UI Light
+Segoe UI Mono
+Segoe UI Semibold
+Segoe UI Symbol
+Segoe WP
+Segoe WP Black
+Segoe WP Light
+Segoe WP SemiLight
+Segoe WP Semibold
+Shonar Bangla
+Shruti
+SimHei
+SimSun
+SimSun-ExtB
+Simplified Arabic
+Simplified Arabic Fixed
+Skia
+Sylfaen
+Symbol
+TITUS Cyberbit Basic
+Tahoma
+Tangerine
+Times
+Times New Roman
+Tinos
+Traditional Arabic
+Trebuchet MS
+Tunga
+Ubuntu
+Ubuntu Condensed
+Ubuntu Mono
+Utsaah
+Vani
+Verdana
+Vijaya
+Vollkorn
+Vrinda
+Webdings
+Wingdings
+Yanone Kaffeesatz
+Zapfino
diff --git a/fonts/infinality/conf.src/generate60/generate60.sh b/fonts/infinality/conf.src/generate60/generate60.sh
new file mode 100644 (file)
index 0000000..b332dc0
--- /dev/null
@@ -0,0 +1,5 @@
+ #!/bin/sh
+
+awk -f 60-group-tt-fonts.conf.awk 60-group-tt-fonts.list > 60-group-tt-fonts.conf
+awk -f 60-group-non-tt-fonts.conf.awk 60-group-non-tt-fonts.list > 60-group-non-tt-fonts.conf
+
index 6f02054beac76a8c46fc080c7c07999fad9156bc..4a69979dbde7e6edd6285a43c42121fa393ad206 100644 (file)
                </edit>
        </match>
 
+       <!-- Do font substitutions for the set style? -->
+       <!-- NOTE: Custom substitutions in 42-repl-global.conf will still be done -->
+       <!-- NOTE: Corrective substitutions will still be done -->
+       <match target="pattern" >
+               <edit name="do_substitutions" mode="assign">
+                       <bool>true</bool>
+               </edit>
+       </match>
+
        <!-- Make (some) monospace/coding TTF fonts render as bitmaps? -->
        <!-- courier new, andale mono, monaco, etc. -->
        <match target="pattern" >
@@ -89,7 +98,7 @@
        <!-- Some may need to set this to 96 though -->
        <match target="pattern">
                <edit name="dpi" mode="assign">
-                       <double>72</double>
+                       <double>96</double>
                </edit>
        </match>
        
index e332835bbfdd82426169f99afc2d8baf3fcde8bc..55242c1cff40004e62f2fa2908afe944fbda7da2 100644 (file)
@@ -10,9 +10,9 @@
 
        <!-- Non-latin fonts - Linux Appearance -->
 
-       <alias>
+       <alias binding="weak">
                <family>serif</family>
-               <accept>
+               <prefer>
                        <family>Liberation Serif</family>
                        <family>DejaVu Serif</family>
                        <family>FreeSerif</family>
                        <family>Georgia</family>
                        <family>Times</family>
                        <family>Palatino Linotype</family>
-               </accept>
+               </prefer>
        </alias>
-       <alias>
+       <alias binding="weak">
                <family>sans-serif</family>
-               <accept>
+               <prefer>
                        <family>Liberation Sans</family>
                        <family>Arial</family>
                        <family>DejaVu Sans</family>
                        <family>Helvetica</family>
                        <family>Tahoma</family>
                        <family>Arial Unicode MS</family>
-               </accept>
+               </prefer>
        </alias>
-       <alias>
+       <alias binding="weak">
                <family>monospace</family>
-               <accept>
+               <prefer>
                        <family>Liberation Mono</family>
                        <family>DejaVu Sans Mono</family>
                        <family>Droid Sans Mono</family>
                        <family>Microsoft YaHei</family>
                        <family>MPH 2B Damase</family>
                        <family>Courier</family>
-               </accept>
+               </prefer>
        </alias>
-       <alias>
+       <alias binding="weak">
                <family>fantasy</family>
-               <accept>
+               <prefer>
                        <family>Impact</family>
                        <family>Copperplate Gothic Std</family>
                        <family>Cooper Std</family>
                        <family>Bauhaus Std</family>
-               </accept>
+               </prefer>
        </alias>
-       <alias>
+       <alias binding="weak">
                <family>cursive</family>
-               <accept>
+               <prefer>
                        <family>ITC Zapf Chancery Std</family>
                        <family>Zapfino</family>
                        <family>Comic Sans MS</family>
                        <family>Chalkboard</family>
                        <family>Chalkduster</family>
-               </accept>
+               </prefer>
        </alias>
 
 </fontconfig>
diff --git a/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf b/fonts/infinality/styles.conf.avail/nyx/43-repl-terminus.conf
deleted file mode 120000 (symlink)
index b9c8de7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../conf.src/43-repl-terminus.conf
\ No newline at end of file
diff --git a/fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf b/fonts/infinality/styles.conf.avail/nyx/43-repl-tt-traced-bitmap.conf
new file mode 120000 (symlink)
index 0000000..8f2c919
--- /dev/null
@@ -0,0 +1 @@
+../../conf.src/43-repl-tt-traced-bitmap.conf
\ No newline at end of file
index c96c380d4614abe57b44bc671fe802933f45597d..e9b22b11706d70344444ffffc2a949bcb924ec21 100644 (file)
                        </dir>
                        <dir name="url-handlers">
                                <dir name="ymsgr">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
                                </dir>
                                <dir name="xmpp">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
                                </dir>
                                <dir name="sip">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
                                </dir>
                                <dir name="msnim">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
                                </dir>
                                <dir name="irc">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
                                </dir>
                                <dir name="icq">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
                                </dir>
                                <dir name="gg">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
                                </dir>
                                <dir name="icyx">
                                        <entry name="enabled" mtime="1359455568" schema="/schemas/desktop/gnome/url-handlers/icyx/enabled"/>
                                        <entry name="enabled" mtime="1348087078" schema="/schemas/desktop/gnome/url-handlers/callto/enabled"/>
                                </dir>
                                <dir name="aim">
-                                       <entry name="needs_terminal" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
-                                       <entry name="command" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
-                                       <entry name="enabled" mtime="1365454362" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
+                                       <entry name="command" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
+                                       <entry name="enabled" mtime="1376338480" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
                                </dir>
                                <dir name="mailto">
                                        <entry name="needs_terminal" mtime="1348087078" schema="/schemas/desktop/gnome/url-handlers/mailto/needs_terminal"/>
@@ -17833,13 +17833,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17849,13 +17847,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17865,13 +17861,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17881,13 +17875,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17897,13 +17889,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17913,13 +17903,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17929,13 +17917,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17945,13 +17931,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17961,13 +17945,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17977,13 +17959,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17993,13 +17973,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18009,13 +17987,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18025,13 +18001,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18041,13 +18015,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18057,13 +18029,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18073,13 +18043,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18089,13 +18057,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18105,13 +18071,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18121,13 +18085,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18137,13 +18099,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18153,13 +18113,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19887,13 +19845,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="url-handlers">
                                        <dir name="ymsgr">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;ymsgr&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19901,7 +19859,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;ymsgr&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;ymsgr&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;ymsgr&quot; URLs.</longdesc>
@@ -19909,13 +19867,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="xmpp">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;xmpp&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19923,7 +19881,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;xmpp&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;xmpp&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;xmpp&quot; URLs.</longdesc>
@@ -19931,13 +19889,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="sip">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;sip&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19945,7 +19903,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;sip&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;sip&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;sip&quot; URLs.</longdesc>
@@ -19953,13 +19911,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="msnim">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;msnim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19967,7 +19925,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;msnim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;msnim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;msnim&quot; URLs.</longdesc>
@@ -19975,13 +19933,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="irc">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;irc&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19989,7 +19947,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;irc&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;irc&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;irc&quot; URLs.</longdesc>
@@ -19997,13 +19955,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="icq">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;icq&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20011,7 +19969,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;icq&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;icq&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;icq&quot; URLs.</longdesc>
@@ -20019,13 +19977,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="gg">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;gg&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20033,7 +19991,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;gg&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;gg&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;gg&quot; URLs.</longdesc>
@@ -20319,13 +20277,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="aim">
-                                               <entry name="needs_terminal" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1365454362" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1376338480" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;aim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20333,7 +20291,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;aim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1365454362" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1376338480" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;aim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;aim&quot; URLs.</longdesc>
index 25902af2a1c1a12b732ec467cbaacbd785189aba..7a5c555194f940a37ef2484d76e67d7c2301830a 100644 (file)
@@ -1,39 +1,22 @@
-#
-# This is the GTK+ RC file for gentoo. The first (rudimentary)
-# GTK+ RC support was added in version 0.9.15.
-#
-# Currently named widgets are:
-# "mainPane{0,1}"      The CLists in the panes.
-# "cstPreview"         The preview CList in style config.
-# "txvText"            The Text widget used for viewing
-#                      text (output capture, ViewText & ViewHex cmds).
-#
-# Other widgets must be accessed by their class names.
-#
-# For information about how to write GTK+ RC files, see the
-# official GTK+ tutorial (doubtlessly available from www.gtk.org).
-#
+/* GTK+ 3.x styling for gentoo.
+ *
+ * Created in May 2012 by Emil Brink.
+ *
+ * See <http://gnomejournal.org/article/107/styling-gtk-with-css> for information.
+*/
 
-# style <name> [= <name>]
-# {
-#   <option>
-# }
-#
-# widget <widget_set> style <style_name>
-# widget_class <widget_class_set> style <style_name>
 
-style "paneStyle"
-{
-#  font_name = "Fixed"
-#  base[NORMAL] = "#c000c0"
+/* Here's some intricate styling to make the headers of the current pane stand
+ * out a bit. Note that doing the obvious, i.e. setting background-color,
+ * doesn't work.
+*/
+GtkWindow#gentoo * #pane-current column-header .button {
+       font-weight: bold;
+       color: @selected_bg_color;
 }
 
-style "textStyle"
-{
-  font_name = "Fixed"
-}
 
-widget "*mainPane0"  style "paneStyle"
-widget "*mainPane1"  style "paneStyle"
-widget "*cstPreview" style "textStyle"
-widget "*txvText"    style "textStyle"
+/* Make the text viewer use a fixed-width font. */
+#txvText, #cstPreview {
+       font: Monospace;
+}
index 37f74c99f8f65e33c35b8f23821b8ad5c2740724..3199dab1f37b3111c32b42c262f55ade9f586c6d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="yes"?>
 
 <GentooConfig>
- <version>"0.19.13"</version>
+ <version>"0.20.1"</version>
  <DirPanes>
   <count>2</count>
   <DirPaneLeft>
     <title>"Name"</title>
     <content>"name"</content>
     <DPExtra>
-     <show_type>FALSE</show_type>
+     <show_type>TRUE</show_type>
      <show_linkname>TRUE</show_linkname>
     </DPExtra>
     <justification>0</justification>
-    <width>267</width>
+    <width>273</width>
    </DPColumn>
    <DPColumn>
     <index>2</index>
@@ -38,7 +38,7 @@
      <dir_fs>TRUE</dir_fs>
     </DPExtra>
     <justification>1</justification>
-    <width>110</width>
+    <width>99</width>
    </DPColumn>
    <DPColumn>
     <index>3</index>
    <set_font>TRUE</set_font>
    <font_name>"Monospace 8"</font_name>
    <rubber_banding>TRUE</rubber_banding>
-   <sbar_pos>"system"</sbar_pos>
+   <rules>TRUE</rules>
+   <sbar_pos>"right"</sbar_pos>
   </DirPaneLeft>
   <DirPaneRight>
    <columns>9</columns>
    <set_font>TRUE</set_font>
    <font_name>"Monospace 8"</font_name>
    <rubber_banding>TRUE</rubber_banding>
+   <rules>TRUE</rules>
    <sbar_pos>"left"</sbar_pos>
   </DirPaneRight>
   <DirPanePaning>
   </DirPaneHistory>
  </DirPanes>
  <CmdSeqs>
-  <CmdSeq>
-   <name>"run_script"</name>
-   <flags>0</flags>
-   <CmdRows>
-    <CmdRow>
-     <type>"External"</type>
-     <def>"/usr/bin/env bash {fup}"</def>
-     <flags>0</flags>
-     <CX_External>
-      <gflags>16</gflags>
-      <bflags>20</bflags>
-      <aflags>0</aflags>
-     </CX_External>
-    </CmdRow>
-   </CmdRows>
-  </CmdSeq>
   <CmdSeq>
    <name>"test_checkbox"</name>
    <flags>0</flags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_rar"</name>
+   <name>"test_input"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"unrar lt {fup}"</def>
+     <def>"echo {It:&quot;String input defaults to first selected filename:&quot;} {It:&quot;-&quot;} {Is:&quot;Name:&quot;=&quot;prefix-{fQ}-postfix&quot;}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>4</gflags>
+      <gflags>0</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
-  <CmdSeq>
-   <name>"view_ps"</name>
-   <flags>0</flags>
-   <CmdRows>
-    <CmdRow>
-     <type>"External"</type>
-     <def>"gv {fut}"</def>
-     <flags>0</flags>
-     <CX_External>
-      <gflags>1</gflags>
-      <bflags>0</bflags>
-      <aflags>0</aflags>
-     </CX_External>
-    </CmdRow>
-   </CmdRows>
-  </CmdSeq>
   <CmdSeq>
    <name>"uncompress_tar_bzip2"</name>
    <flags>0</flags>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
+  <CmdSeq>
+   <name>"view_rpm"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"rpm -SOME_SMART_OPTION {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
   <CmdSeq>
    <name>"compress_gzip"</name>
    <flags>0</flags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"new_shell"</name>
+   <name>"view_video"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"xterm"</def>
+     <def>"mplayer -quiet -vo x11 {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>1</gflags>
-      <bflags>4</bflags>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
     </CmdRow>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
+  <CmdSeq>
+   <name>"echo_selection"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo  {FEu}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
   <CmdSeq>
    <name>"test_exec"</name>
    <flags>0</flags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"uncompress_zip"</name>
+   <name>"view_howto"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"unzip -qq -o {fup}"</def>
+     <def>"less {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>0</gflags>
-      <bflags>8</bflags>
-      <aflags>2</aflags>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_man"</name>
+   <name>"Unnamed"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"groff -man -Tascii -P-b -P-u {fup}"</def>
+     <def>"bzcat {fup}"</def>
      <flags>0</flags>
      <CX_External>
       <gflags>4</gflags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"edit_image"</name>
+   <name>"view_pdf"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"gimp {fup}"</def>
+     <def>" evince {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>3</gflags>
+      <gflags>0</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"gliv {Fup}"</def>
+     <def>"eog {Fup}"</def>
      <flags>0</flags>
      <CX_External>
       <gflags>0</gflags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_howto"</name>
+   <name>"uncompress_zip"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"less {fup}"</def>
+     <def>"unzip -qq -o {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>4</gflags>
-      <bflags>0</bflags>
-      <aflags>0</aflags>
+      <gflags>0</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"play_mp3"</name>
+   <name>"run_missing"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"xmms {Fup}"</def>
+     <def>"whatever {Fpu}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>1</gflags>
+      <gflags>0</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"mkdir_and_enter_selected"</name>
+   <name>"view_man"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
-     <type>"Built-In"</type>
-     <def>"MkDir 1"</def>
-     <flags>0</flags>
-    </CmdRow>
-    <CmdRow>
-     <type>"Built-In"</type>
-     <def>"DirEnter dir={fpu}"</def>
+     <type>"External"</type>
+     <def>"groff -man -Tascii -P-b -P-u {fup}"</def>
      <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"run_missing"</name>
-   <flags>0</flags>
+   <name>"echo_selection_first"</name>
+   <flags>1</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"whatever {Fpu}"</def>
+     <def>"echo {fu}"</def>
      <flags>0</flags>
      <CX_External>
       <gflags>0</gflags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_pdf"</name>
+   <name>"edit_image"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>" evince {fup}"</def>
+     <def>"gimp {fup}"</def>
      <flags>0</flags>
      <CX_External>
       <gflags>0</gflags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"Unnamed"</name>
+   <name>"play_mp3"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"echo {Fu}"</def>
+     <def>"xmms {Fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>0</gflags>
-      <bflags>16</bflags>
+      <gflags>1</gflags>
+      <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
+  <CmdSeq>
+   <name>"mkdir_and_enter_selected"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"MkDir 1"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"DirEnter dir={fpu}"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
   <CmdSeq>
    <name>"diff"</name>
    <flags>0</flags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"convert_mp3"</name>
-   <flags>1</flags>
+   <name>"view_deb"</name>
+   <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"bash -c &apos;mpg123 -q -w $(basename {f} .mp3).wav {fup}&apos;"</def>
+     <def>"dpkg-deb -c {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>0</gflags>
-      <bflags>4</bflags>
-      <aflags>1</aflags>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"test_input"</name>
+   <name>"view_rar"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"echo {It:&quot;String input defaults to first selected filename:&quot;} {It:&quot;-&quot;} {Is:&quot;Name:&quot;=&quot;prefix-{fQ}-postfix&quot;}"</def>
+     <def>"unrar lt {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>0</gflags>
+      <gflags>4</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_rpm"</name>
-   <flags>0</flags>
-   <CmdRows>
-    <CmdRow>
-     <type>"External"</type>
-     <def>"rpm -SOME_SMART_OPTION {fup}"</def>
-     <flags>0</flags>
-     <CX_External>
-      <gflags>4</gflags>
-      <bflags>0</bflags>
-      <aflags>0</aflags>
-     </CX_External>
-    </CmdRow>
-   </CmdRows>
-  </CmdSeq>
-  <CmdSeq>
-   <name>"view_bzip2"</name>
+   <name>"run_script"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"bzcat {fup}"</def>
+     <def>"/usr/bin/env bash {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>4</gflags>
-      <bflags>0</bflags>
+      <gflags>16</gflags>
+      <bflags>20</bflags>
       <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"play_mod"</name>
+   <name>"view_ps"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"xmp {fup}"</def>
+     <def>"gv {fut}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>3</gflags>
+      <gflags>1</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_video"</name>
+   <name>"run_calculator"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"mplayer -quiet -vo x11 {fup}"</def>
+     <def>"gnome-calculator"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>0</gflags>
+      <gflags>3</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_deb"</name>
+   <name>"view_zip"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"dpkg-deb -c {fup}"</def>
+     <def>"unzip -v {fup}"</def>
      <flags>0</flags>
      <CX_External>
       <gflags>4</gflags>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"run_calculator"</name>
+   <name>"convert_mp3"</name>
+   <flags>1</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"bash -c &apos;mpg123 -q -w $(basename {f} .mp3).wav {fup}&apos;"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>4</bflags>
+      <aflags>1</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"new_shell"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"gnome-calculator"</def>
+     <def>"xterm"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>3</gflags>
-      <bflags>0</bflags>
+      <gflags>1</gflags>
+      <bflags>4</bflags>
       <aflags>0</aflags>
      </CX_External>
     </CmdRow>
    </CmdRows>
   </CmdSeq>
   <CmdSeq>
-   <name>"view_zip"</name>
+   <name>"play_mod"</name>
    <flags>0</flags>
    <CmdRows>
     <CmdRow>
      <type>"External"</type>
-     <def>"unzip -v {fup}"</def>
+     <def>"xmp {fup}"</def>
      <flags>0</flags>
      <CX_External>
-      <gflags>4</gflags>
+      <gflags>3</gflags>
       <bflags>0</bflags>
       <aflags>0</aflags>
      </CX_External>
   <Delete>
    <set_mode>u1</set_mode>
   </Delete>
-  <DpFocus>
-   <fake_select>FALSE</fake_select>
-   <focus_select>FALSE</focus_select>
-  </DpFocus>
   <GetSize>
    <unselect>FALSE</unselect>
   </GetSize>
   <PathList>
    <Path>
     <index>0</index>
-    <path>"icons:/usr/share/gentoo/icons"</path>
+    <path>"icons:/usr/local/share/icons/gentoo/16x16:/usr/share/icons:gentoo/16x16:/usr/share/gentoo/icons"</path>
    </Path>
    <Path>
     <index>1</index>
-    <path>"~"</path>
+    <path>"~/.config/gentoo"</path>
    </Path>
    <Path>
     <index>2</index>
  </Errors>
  <Nagging>
   
-  
  </Nagging>
 </GentooConfig>
index a0c9df7c055ce4e57baf23d1de52448141c51ba4..6121eaa439381bdedc930dee941675547a478303 100644 (file)
@@ -1,19 +1,20 @@
 # hplip.conf.  Generated from hplip.conf.in by configure.
 
 [hplip]
-version=3.12.10a
+version=3.13.7
 
 [dirs]
 home=/usr/share/hplip
 run=/var/run
 ppd=/usr/share/ppd/HP
 ppdbase=/usr/share/ppd
-doc=/usr/share/doc/hplip-3.12.10a
-html=/usr/share/doc/hplip-3.12.10a/html
+doc=/usr/share/doc/hplip-3.13.7
+html=/usr/share/doc/hplip-3.13.7/html
 icon=/usr/share/applications
 cupsbackend=/usr/libexec/cups/backend
 cupsfilter=/usr/libexec/cups/filter
 drv=/usr/share/cups/drv/hp
+bin=/usr/bin
 
 # Following values are determined at configure time and cannot be changed.
 [configure]
@@ -34,13 +35,12 @@ foomatic-rip-hplip-install=no
 hpcups-install=yes
 cups-drv-install=yes
 cups-ppd-install=no
-internal-tag=3.12.10a
+internal-tag=3.13.7
 restricted-build=no
 ui-toolkit=qt4
 qt3=no
 qt4=yes
 policy-kit=yes
-hpijs-only-build=no
 lite-build=no
 udev-acl-rules=no
 udev_sysfs_rules=no
index adb71b0224b817f2a97d12c87a86ba6c70dc6453..a17c4a473e5a02c5d4d7042692c887ca11f0c3a2 100755 (executable)
@@ -1,39 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-006,v 1.2 2011/07/21 19:47:14 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-007,v 1.2 2013/05/06 11:09:09 lxnay Exp $
 
 change() {
-       local c ret=0 opts="$1"
-       shift
-       ebegin "Running cpufreq-set ${opts}"
-       for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
-               cpufreq-set -c ${c} ${opts}
-               : $(( ret += $? ))
-       done
-       eend ${ret}
-
-       if [ $# -gt 0 ] ; then
-               c=1
-               einfo "Setting extra options: $*"
-               if cd /sys/devices/system/cpu/cpufreq ; then
-                       local o v
-                       for o in "$@" ; do
-                               v=${o#*=}
-                               o=${o%%=*}
-                               echo ${v} > ${o} || break
-                       done
-                       c=0
-               fi
-               eend ${c}
-               : $(( ret += c ))
-       fi
-
-       return ${ret}
+       ebegin "Running cpufreq-set ${*}"
+       /usr/libexec/cpufrequtils-change.sh "${@}" > /dev/null
+       eend $?
 }
 
 start() {
-       change "${START_OPTS}" ${SYSFS_EXTRA}
+       change ${START_OPTS} -- ${SYSFS_EXTRA}
 }
 
 stop() {
diff --git a/init.d/dmcrypt b/init.d/dmcrypt
deleted file mode 100755 (executable)
index 130036b..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
-
-depend() {
-       before checkfs fsck
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-execute_hook="dm_crypt_execute_dmcrypt"
-# XXX: Should we drop this ?
-# execute_hook="dm_crypt_execute_localmount"
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-       . /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-       local dev ret mode foo
-
-       if [ -n "${target}" ] ; then
-               # let user set options, otherwise leave empty
-               : ${options:=' '}
-       elif [ -n "${swap}" ] ; then
-               if cryptsetup isLuks ${source} 2>/dev/null ; then
-                       ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-                       return
-               fi
-               target=${swap}
-               # swap contents do not need to be preserved between boots, luks not required.
-               # suspend2 users should have initramfs's init handling their swap partition either way.
-               : ${options:='-c aes -h sha1 -d /dev/urandom'}
-               : ${pre_mount:='mkswap ${dev}'}
-       else
-               return
-       fi
-       if [ -z "${source}" ] && [ ! -e "${source}" ] ; then
-               ewarn "source \"${source}\" for ${target} missing, skipping..."
-               return
-       fi
-
-       if [ -n "${loop_file}" ] ; then
-               dev="/dev/mapper/${target}"
-               ebegin "  Setting up loop device ${source}"
-               losetup ${source} ${loop_file}
-       fi
-
-       # cryptsetup:
-       # luksOpen <device> <name>      # <device> is $source
-       # create   <name>   <device>    # <name>   is $target
-       local arg1="create" arg2="${target}" arg3="${source}" luks=0
-
-       cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
-
-       # Older versions reported:
-       #       ${target} is active:
-       # Newer versions report:
-       #       ${target} is active[ and is in use.]
-       if cryptsetup status ${target} | egrep -q ' is active' ; then
-               einfo "dm-crypt mapping ${target} is already configured"
-               return
-       fi
-       splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-       # Handle keys
-       if [ -n "${key}" ] ; then
-               read_abort() {
-                       # some colors
-                       local ans savetty resettty
-                       [ -z "${NORMAL}" ] && eval $(eval_ecolors)
-                       einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-                       shift
-                       # This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-                       # we end up having to implement our own crap with stty/etc...
-                       savetty=$(stty -g)
-                       resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-                       trap 'eval "${resettty}"' EXIT HUP INT TERM
-                       stty -icanon
-                       [ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))"
-                       ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-                       eval "${resettty}"
-                       if [ -z "${ans}" ] ; then
-                               printf '\r'
-                       else
-                               echo
-                       fi
-                       case ${ans} in
-                               [yY]) return 0;;
-                               *) return 1;;
-                       esac
-               }
-
-               # Notes: sed not used to avoid case where /usr partition is encrypted.
-               mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-               key=${key/:*/}
-               case "${mode}" in
-               gpg|reg)
-                       # handle key on removable device
-                       if [ -n "${remdev}" ] ; then
-                               # temp directory to mount removable device
-                               local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-                               if [ ! -d "${mntrem}" ] ; then
-                                       if ! mkdir -p "${mntrem}" ; then
-                                               ewarn "${source} will not be decrypted ..."
-                                               einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-                                               return
-                                       fi
-                               fi
-                               i=0
-                               einfo "Please insert removable device for ${target}"
-                               while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-                                       foo=""
-                                       if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-                                               # keyfile exists?
-                                               if [ ! -e "${mntrem}${key}" ] ; then
-                                                       umount -n "${mntrem}"
-                                                       rmdir "${mntrem}"
-                                                       einfo "Cannot find ${key} on removable media."
-                                                       read_abort "Abort" ${read_timeout:--t 1} && return
-                                               else
-                                                       key="${mntrem}${key}"
-                                                       break
-                                               fi
-                                       else
-                                               [ -e "${remdev}" ] \
-                                                       && foo="mount failed" \
-                                                       || foo="mount source not found"
-                                       fi
-                                       : $((i += 1))
-                                       read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-                               done
-                       else    # keyfile ! on removable device
-                               if [ ! -e "${key}" ] ; then
-                                       ewarn "${source} will not be decrypted ..."
-                                       einfo "Reason: keyfile ${key} does not exist."
-                                       return
-                               fi
-                       fi
-                       ;;
-               *)
-                       ewarn "${source} will not be decrypted ..."
-                       einfo "Reason: mode ${mode} is invalid."
-                       return
-                       ;;
-               esac
-       else
-               mode=none
-       fi
-       ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-       if [ "${mode}" = "gpg" ] ; then
-               : ${gpg_options:='-q -d'}
-               # gpg available ?
-               if type -p gpg >/dev/null ; then
-                       for i in 0 1 2 ; do
-                               # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-                               # save stdin stdout stderr "values"
-                               gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-                               ret=$?
-                               [ ${ret} -eq 0 ] && break
-                       done
-                       eend ${ret} "failure running cryptsetup"
-               else
-                       ewarn "${source} will not be decrypted ..."
-                       einfo "Reason: cannot find gpg application."
-                       einfo "You have to install app-crypt/gnupg first."
-                       einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-               fi
-       else
-               if [ "${mode}" = "reg" ] ; then
-                       cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-                       ret=$?
-                       eend ${ret} "failure running cryptsetup"
-               else
-                       cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-                       ret=$?
-                       eend ${ret} "failure running cryptsetup"
-               fi
-       fi
-       if [ -d "${mntrem}" ] ; then
-               umount -n ${mntrem} 2>/dev/null >/dev/null
-               rmdir ${mntrem} 2>/dev/null >/dev/null
-       fi
-       splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-       if [ ${ret} -ne 0 ] ; then
-               cryptfs_status=1
-       else
-               if [ -n "${pre_mount}" ] ; then
-                       dev="/dev/mapper/${target}"
-                       ebegin "    pre_mount: ${pre_mount}"
-                       eval "${pre_mount}" > /dev/null
-                       ewend $? || cryptfs_status=1
-               fi
-       fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-       local mount_point
-
-       [ -z "${target}" ] && [ -z "${post_mount}" ] && return
-
-       if ! cryptsetup status ${target} | egrep -q '\<active:' ; then
-               ewarn "Skipping unmapped target ${target}"
-               cryptfs_status=1
-               return
-       fi
-
-       mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-       if [ -z "${mount_point}" ] ; then
-               ewarn "Failed to find mount point for ${target}, skipping"
-               cryptfs_status=1
-       fi
-
-       if [ -n "${post_mount}" ] ; then
-               ebegin "Running post_mount commands for target ${target}"
-               eval "${post_mount}" >/dev/null
-               eend $? || cryptfs_status=1
-       fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-       # We're given something like:
-       #    foo=bar=cow
-       # Return the "bar=cow" part.
-       case $1 in
-       *\=*)
-               local key=$(echo "$1" | cut -f1 -d=)
-               echo "$1" | cut -c $(( ${#key} + 2 ))
-               ;;
-       esac
-}
-
-start() {
-       local header=true cryptfs_status=0
-       local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-       local x
-       for x in $(cat /proc/cmdline) ; do
-               case "${x}" in
-               key_timeout\=*)
-                       local KEY_TIMEOUT=$(get_bootparam_val "${x}")
-                       if [ ${KEY_TIMEOUT} -gt 0 ] ; then
-                               read_timeout="-t ${KEY_TIMEOUT}"
-                       fi
-               ;;
-               esac
-       done
-
-       while read -u 3 targetline ; do
-               case ${targetline} in
-               # skip comments and blank lines
-               ""|"#"*) continue ;;
-               # skip service-specific openrc configs #377927
-               rc_*) continue ;;
-               esac
-
-               ${header} && ebegin "Setting up dm-crypt mappings"
-               header=false
-
-               # check for the start of a new target/swap
-               case ${targetline} in
-               target=*|swap=*)
-                       # If we have a target queued up, then execute it
-                       ${execute_hook}
-
-                       # Prepare for the next target/swap by resetting variables
-                       unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-                       ;;
-
-               gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-                       if [ -z "${target}${swap}" ] ; then
-                               ewarn "Ignoring setting outside target/swap section: ${targetline}"
-                               continue
-                       fi
-                       ;;
-
-               dmcrypt_max_timeout=*)
-                       # ignore global options
-                       continue
-                       ;;
-
-               *)
-                       ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-                       ;;
-               esac
-
-               # Queue this setting for the next call to dm_crypt_execute_xxx
-               eval "${targetline}"
-       done 3< ${conf_file}
-
-       # If we have a target queued up, then execute it
-       ${execute_hook}
-
-       ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-       local line header
-
-       # Break down all mappings
-       header=true
-       egrep "^(target|swap)=" ${conf_file} | \
-       while read line ; do
-               ${header} && einfo "Removing dm-crypt mappings"
-               header=false
-
-               target= swap=
-               eval ${line}
-
-               [ -n "${swap}" ] && target=${swap}
-               if [ -z "${target}" ] ; then
-                       ewarn "invalid line in ${conf_file}: ${line}"
-                       continue
-               fi
-
-               ebegin "  ${target}"
-               cryptsetup remove ${target}
-               eend $?
-       done
-
-       # Break down loop devices
-       header=true
-       grep '^source=./dev/loop' ${conf_file} | \
-       while read line ; do
-               ${header} && einfo "Detaching dm-crypt loop devices"
-               header=false
-
-               source=
-               eval ${line}
-
-               ebegin "  ${source}"
-               losetup -d "${source}"
-               eend $?
-       done
-
-       return 0
-}
index b8e8cd6a57141a2d1968f0108d1e4b899d426cf4..203f42b90e59a916336bc370e6e161c6abab3a1c 100755 (executable)
@@ -1,31 +1,34 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd,v 1.1 2007/12/19 17:38:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd,v 1.2 2013/03/18 17:49:55 polynomial-c Exp $
 
 # Init script for g15daemon
 
+pidfile="/var/run/g15daemon.pid"
+command="/usr/sbin/g15daemon"
+command_args=""
+start_stop_daemon_args="--background --pidfile ${pidfile}"
+
 depend() {
        after hotplug
        after usb
        after modules
 }
 
-start() {
-       ebegin "Starting g15daemon"
-
+start_pre() {
        # Does the input device already exist?
-       if [ -e /proc/modules -a ! -e /dev/input/uinput ]; then
-               # We can load modules, but uinput device does not exist
-               einfo "Loading uinput module"
-               /sbin/modprobe uinput > /dev/null 2> /dev/null
+       if [ -e "/proc/modules" ] ; then
+               if [ ! -e "/dev/input/uinput" ] && [ ! -e "/dev/uinput" ] ; then
+                       # We can load modules, but uinput device does not exist
+                       einfo "Loading uinput module"
+                       /sbin/modprobe uinput > /dev/null 2> /dev/null
+               fi
        fi
 
        local SWITCHKEY=""
-       [ "${CLIENT_SWITCH_L1}" = "yes" ] && SWITCHKEY="--switch"
-       start-stop-daemon --start --background --pidfile /var/run/g15daemon.pid \
-               --exec /usr/sbin/g15daemon -- ${SWITCHKEY}
-       eend $? "Failed to start g15daemon."
+       [ "${CLIENT_SWITCH_L1}" = "yes" ] && command_args="--switch"
+       return 0
 }
 
 stop() {
@@ -34,8 +37,6 @@ stop() {
        if [ $BACKLIGHT_OFF = "yes" ]; then
                KILLOPT="-K"
        fi
-       /usr/sbin/g15daemon ${KILLOPT} &>/dev/null
-       sleep 1
-       start-stop-daemon -R 5 --stop --quiet --pidfile /var/run/g15daemon.pid
+       start-stop-daemon -R 5 --exec ${command} -- ${KILLOPT}
        eend $?
 }
index a5e9a44061616ff590e0c629072af208c93b734b..d6b453e929f413c104a417404c52bec86a0d8e47 100755 (executable)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc6,v 1.7 2007/04/07 13:03:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc7,v 1.1 2013/07/13 12:01:10 pacho Exp $
 
 depend() {
        need net
@@ -16,6 +16,6 @@ start() {
 
 stop() {
        ebegin "Stopping saslauthd"
-       start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid
+       start-stop-daemon --stop --quiet --pidfile /run/saslauthd/saslauthd.pid
        eend $?
 }
index e41d874e35798950524d8e77ada35176bb7dc073..318b3a8807820e11c388b5995614e14edda9b6b7 100755 (executable)
@@ -1,61 +1,59 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3,v 1.5 2011/12/04 09:53:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.5 2013/05/08 20:12:59 mr_bones_ Exp $
 
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
 extra_commands="checkconfig"
 extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
 
 depend() {
-       # Make networking dependency conditional on configuration
-       case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
-               *source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
-                       need net
-                       use stunnel ;;
-       esac
-
-       config /etc/syslog-ng/syslog-ng.conf
        use clock
        need hostname localmount
+       after bootmisc
        provide logger
 }
 
 checkconfig() {
-       if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
-               eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
-               eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
-               return 1
-       fi
-       syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
-
-       # the start and reload functions have their own eends so
-       # avoid calling this twice when there are no problems
-       [ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
+       ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+       syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+       eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
 }
 
-start() {
-       checkconfig || return 1
-       ebegin "Starting syslog-ng"
-       [ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
-       start-stop-daemon --start --pidfile /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
-       eend $? "Failed to start syslog-ng"
+start_pre() {
+    checkconfig || return 1
+    checkpath \
+       -d \
+       --mode 0700 \
+       --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
+       "${SYSLOG_NG_STATEFILE_DIR}"
 }
 
-stop() {
-       ebegin "Stopping syslog-ng"
-       start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
-       eend $? "Failed to stop syslog-ng"
-       sleep 1 # needed for syslog-ng to stop in case we're restarting
+stop_pre() {
+    [ "$RC_CMD" = restart ] && sleep 1
+    return 0
 }
 
 reload() {
-       if [ ! -f /var/run/syslog-ng.pid ]; then
-               eerror "syslog-ng isn't running"
-               return 1
-       fi
        checkconfig || return 1
        ebegin "Reloading configuration and re-opening log files"
-       start-stop-daemon --signal HUP \
-           --pidfile /var/run/syslog-ng.pid
+       start-stop-daemon --signal HUP --pidfile "${pidfile}"
        eend $?
 }
index 9be3c9b0ea1f1b6477cf4cc71effd3d62071d73d..ea679837d56d69fb9aa381e50bb21abdefb03bea 100644 (file)
@@ -68,24 +68,24 @@ LINGUAS="de en en_GB en_US ru vi"
 USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards 
      amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo 
      calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl 
-     curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
+     curlwrappers cvs dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
      encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig
-     foomaticdb ftp gconf gd gd-external ggi gif gimp git glade glib gmp gnome gnome-keyring 
-     gnustep gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea
+     foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring 
+     gnustep gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea
      idn ieee1394 imagemagick imap imlib inifile ithreads java javascript
-     jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos
+     jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kde kdeenablefinal kdeprefix kerberos
      keyring kig-scripting kpathsea lame latex lcms ldap libcaca
      libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial
      midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp
      musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis
-     nptl nsplugin numpy odbc ogg openal openexr opengl opus pango par pch pcntl pcre pdf perl
+     nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl
      perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real
-     rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
+     rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp
      sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
      subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff
      tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack
      wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine
-     xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo
+     xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xslt xulrunner xvid yahoo
      yaz yv12 zeroconf zlib 
      -development"
 
@@ -124,5 +124,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \
 
 #CURL_SSL="nss"
 
+PHP_TARGETS="php5-3"
+
 source /var/lib/layman/make.conf
 
index e2fffc569d103076cde3eda907c1d899c4c6e425..687794a939110f120f79f16e0537c79dbae9cffd 100644 (file)
@@ -38,6 +38,7 @@ app-emulation/virtualbox-modules
 # ~dev-libs/folks-0.8.0
 # ~dev-libs/gjs-1.34.0
 # ~dev-libs/libzeitgeist-0.3.18
+~dev-libs/libgcrypt-1.5.0
 ~dev-libs/nspr-4.9.1
 ~dev-libs/nspr-4.9.6
 ~dev-libs/nspr-4.10
@@ -52,6 +53,7 @@ dev-python/fbrehm-libs
 # ~dev-python/isodate-0.4.9
 ~dev-python/logilab-common-0.59.1
 ~dev-python/pylint-0.27.0
+~dev-python/reportlab-2.6
 ~dev-python/stevedore-0.8
 ~dev-python/virtualenv-clone-0.2.4
 ~dev-python/virtualenvwrapper-3.6
@@ -94,6 +96,10 @@ mail-client/thunderbird
 # ~media-gfx/eog-3.6.2
 # ~media-gfx/gnome-font-viewer-3.6.2
 ~media-gfx/shotwell-0.13.1
+~media-gfx/shotwell-0.14.0
+~media-gfx/shotwell-0.14.1
+
+~media-libs/gexiv2-0.6.0
 
 # ~media-sound/sound-juicer-3.5.1_pre20121231
 
@@ -111,6 +117,8 @@ net-im/skype
 
 # ~net-misc/vinagre-3.6.2
 
+~net-print/hplip-3.13.7
+
 # ~perl-core/ExtUtils-CBuilder-0.280.205
 # ~perl-core/Module-Load-Conditional-0.500.0
 
index 5800507c3cb687646491454f0745d6631a5d3539..e6f54175ff08b653aa0e2a8622bbf13ab541c5db 100644 (file)
@@ -1,3 +1,6 @@
 # =gnome-extra/gucharmap-3.4.1.1
 ~dev-java/sun-jre-bin-1.6.0.39
 ~dev-java/sun-jdk-1.6.0.39
+
+~dev-libs/libgcrypt-1.5.2
+~dev-libs/libgcrypt-1.5.3
index aad13be30b228505b588fd2dd06f33846a57b4a6..0d44841e06d225f38b2418487db90ed567c690a2 100644 (file)
@@ -1,6 +1,7 @@
 
 app-accessibility/espeak               -portaudio pulseaudio
 
+app-admin/eselect-php                  fpm
 app-admin/gnome-system-tools           nfs
 app-admin/syslog-ng                    spoof-source sql
 app-admin/ulogd                                dbi nfacct pcap
@@ -68,6 +69,7 @@ dev-lang/python                               berkdb tk
 
 dev-libs/boost                         tools
 dev-libs/cyrus-sasl                    authdaemond openldap sample
+dev-libs/geoip                         city perl-geoipupdate
 dev-libs/libburn                       track-src-odirect
 dev-libs/libgcrypt                     idea static-libs
 dev-libs/libusb                                -doc
@@ -160,6 +162,7 @@ media-gfx/ufraw                     exif gnome contrast gimp hotpixels lensfun timezone
 
 media-libs/a52dec                      djbfft
 media-libs/alsa-lib                    alisp
+media-libs/gexiv2                      introspection
 media-libs/faad2                       digitalradio
 media-libs/fontconfig                  -doc
 media-libs/freetype                    infinality utils
@@ -223,6 +226,7 @@ net-fs/nfs-utils                    nfsdcld nfsidmap nfsv41
 net-fs/samba                           async automount quota smbsharemodes swat syslog smbtav2 winbind
 net-fs/samba-libs                      smbsharemodes
 
+net-ftp/lftp                           -gnutls
 net-ftp/proftpd                                authfile ifsession opensslcrypt rewrite shaper sitemisc softquota vroot
 
 =net-im/gaim-2.0.0_beta6               bonjour console -gadu groupwise meanwhile qq -silc
index 1232f4780278995ef5a64467effe1633c0dd2068..f7e2a6a642d487f0056449821e401d563983c0e5 100644 (file)
@@ -645,7 +645,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.0/html
+html_directory = /usr/share/doc/postfix-2.10.1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -658,7 +658,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.0/readme
+readme_directory = /usr/share/doc/postfix-2.10.1/readme
 home_mailbox = .maildir/
 
 smtpd_sasl_auth_enable = yes
index 717b496134e74e081bcb32560dee66a6afee0056..0d6e5c9fb84d4b238daa487c9045a571e145b487 100644 (file)
@@ -10,7 +10,7 @@ export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.0-r1/html'
 export GCC_SPECS=''
 export GSETTINGS_BACKEND='dconf'
 export HG='/usr/bin/hg'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/info'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/info'
 export JAVACC_HOME='/usr/share/javacc/'
 export LANG='de_DE.UTF-8'
 export LC_ADDRESS='de_DE.utf8'
@@ -28,7 +28,7 @@ export LC_TIME='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.23.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.3/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'
index 798c010b6dc8b70ce07d53a1c9239551f36605f3..9a19004eeb4283acd8151efac7b1bed74b6488ab 100644 (file)
@@ -1,6 +1,4 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# Generated by net-scripts for interface eth0
+domain brehm-online.com
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+nameserver 10.12.11.1
index c0eed0bfb3c3f553fab91927152cbfdad770d38c..6aa5facf7dc773ab4ad822e4a8760d3100d07934 100644 (file)
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.5"
+SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.6"
index 80214991e07e4e11f32a5de6361f28348861e3b5..8f20337b007a9ff471e269fe0d82719c7ef5fc67 100644 (file)
@@ -2,7 +2,7 @@
 
 # Home page is: http://smartmontools.sourceforge.net
 
-# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $
+# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $
 
 # smartd will re-read the configuration file if it receives a HUP
 # signal
 #/dev/twa0 -d 3ware,1 -a -s L/../../2/03
 
 # Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which
-# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays
+# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays
 # between 1-2 and 3-4 am.
+# On FreeBSD /dev/tws0 should be used instead
 #/dev/twl0 -d 3ware,0 -a -s L/../../2/01
-#/dev/twa0 -d 3ware,1 -a -s L/../../2/03
+#/dev/twl0 -d 3ware,1 -a -s L/../../2/03
 
 # Same as above for Windows. Option '-d 3ware,N' is not necessary,
 # disk (port) number is specified in device name.
diff --git a/smartd_warning.sh b/smartd_warning.sh
new file mode 100755 (executable)
index 0000000..91f4f89
--- /dev/null
@@ -0,0 +1,214 @@
+#! /bin/sh
+#
+# smartd warning script
+#
+# Copyright (C) 2012-13 Christian Franke <smartmontools-support@lists.sourceforge.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# You should have received a copy of the GNU General Public License
+# (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id: smartd_warning.sh.in 3784 2013-03-06 22:02:54Z chrfranke $
+#
+
+set -e
+
+# Set by config.status
+PACKAGE="smartmontools"
+VERSION="6.1"
+prefix="/usr"
+sysconfdir="/etc"
+
+# Default mailer
+os_mailer="mail"
+
+# Plugin directory
+plugindir="$sysconfdir/smartd_warning.d"
+
+# Parse options
+dryrun=
+case $1 in
+  --dryrun) dryrun=t; shift ;;
+esac
+
+if [ $# != 0 ]; then
+  cat <<EOF
+smartd $VERSION warning message script
+
+Usage:
+  export SMARTD_MAILER='Path to external script, empty for "$os_mailer"'
+  export SMARTD_ADDRESS='Space separated mail adresses, empty if none'
+  export SMARTD_MESSAGE='Error Message'
+  export SMARTD_FAILTYPE='Type of failure, "EMailTest" for tests'
+  export SMARTD_TFIRST='Date of first message sent, empty if none'
+  export SMARTD_TFIRSTEPOCH='time_t format of above'
+  export SMARTD_PREVCNT='Number of previous messages, 0 if none'
+  export SMARTD_NEXTDAYS='Number of days until next message, empty if none'
+  export SMARTD_DEVICEINFO='Device identify information'
+  #export SMARTD_DEVICE='Device name'
+  #export SMARTD_DEVICESTRING='Annotated device name'
+  #export SMARTD_DEVICETYPE='Device type from -d directive, "auto" if none'
+  $0 [--dryrun]
+EOF
+  exit 1
+fi
+
+if [ -z "${SMARTD_ADDRESS}${SMARTD_MAILER}" ]; then
+  echo "$0: SMARTD_ADDRESS or SMARTD_MAILER must be set" >&2
+  exit 1
+fi
+
+# Get host and domain names
+for cmd in 'hostname' 'uname -n' 'echo "${HOSTNAME?unset}"' 'echo "[Unknown]"'; do
+  hostname=`eval $cmd 2>/dev/null` || continue
+  test -n "$hostname" || continue
+  break
+done
+
+dnsdomain=${hostname#*.}
+if [ "$dnsdomain" != "$hostname" ]; then
+  # BSD 'hostname' prints FQDN
+  hostname=${hostname%%.*}
+else
+  #           Linux           Cygwin
+  for cmd in 'dnsdomainname' 'echo "${USERDNSDOMAIN?unset}"' 'echo'; do
+    dnsdomain=`eval $cmd 2>/dev/null` || continue
+    break
+  done
+fi
+
+for cmd in 'nisdomainname' 'ypdomainname' 'domainname' 'echo'; do
+  nisdomain=`eval $cmd 2>/dev/null` || continue
+  break
+done
+test "$nisdomain" != "(none)" || nisdomain=
+
+case $OS in
+  Windows*) windomain=$USERDOMAIN ;;
+  *)        windomain= ;;
+esac
+
+# Format subject
+export SMARTD_SUBJECT="SMART error (${SMARTD_FAILTYPE-[SMARTD_FAILTYPE]}) detected on host: $hostname"
+
+# Format message
+fullmessage=`
+  echo "This message was generated by the smartd daemon running on:"
+  echo
+  echo "   host name:  $hostname"
+  echo "   DNS domain: ${dnsdomain:-[Empty]}"
+  test -z "$nisdomain" ||
+    echo "   NIS domain: $nisdomain"
+  test -z "$windomain" ||
+    echo "   Win domain: $windomain"
+  echo
+  echo "The following warning/error was logged by the smartd daemon:"
+  echo
+  echo "${SMARTD_MESSAGE-[SMARTD_MESSAGE]}"
+  echo
+  echo "Device info:"
+  echo "${SMARTD_DEVICEINFO-[SMARTD_DEVICEINFO]}"
+  echo
+  echo "For details see host's SYSLOG."
+  if [ "$SMARTD_FAILTYPE" != "EmailTest" ]; then
+    echo
+    echo "You can also use the smartctl utility for further investigation."
+    test "$SMARTD_PREVCNT" = "0" ||
+      echo "The original message about this issue was sent at ${SMARTD_TFIRST-[SMARTD_TFIRST]}"
+    case $SMARTD_NEXTDAYS in
+      '') echo "No additional messages about this problem will be sent." ;;
+      1)  echo "Another message will be sent in 24 hours if the problem persists." ;;
+      *)  echo "Another message will be sent in $SMARTD_NEXTDAYS days if the problem persists." ;;
+    esac
+  fi
+`
+
+# Export message with trailing newline
+export SMARTD_FULLMESSAGE="$fullmessage
+"
+
+# Run plugin scripts if requested
+case " $SMARTD_ADDRESS" in
+  *\ @*)
+    if [ -n "$dryrun" ]; then
+      echo "export SMARTD_SUBJECT='$SMARTD_SUBJECT'"
+      echo "export SMARTD_FULLMESSAGE='$SMARTD_FULLMESSAGE'"
+    fi
+
+    # Run ALL scripts if requested
+    case " $SMARTD_ADDRESS " in
+      *\ @ALL\ *)
+        for cmd in "$plugindir"/*; do
+          if [ -f "$cmd" ] && [ -x "$cmd" ]; then
+            if [ -n "$dryrun" ]; then
+              echo "$cmd </dev/null"
+            else
+              "$cmd" </dev/null
+            fi
+          fi
+        done
+        ;;
+    esac
+
+    # Run selected scripts
+    addrs=$SMARTD_ADDRESS
+    SMARTD_ADDRESS=
+    for ad in $addrs; do
+      case $ad in
+        @ALL)
+          ;;
+        @?*)
+          cmd="$plugindir/${ad#@}"
+          if [ -f "$cmd" ] && [ -x "$cmd" ]; then
+            if [ -n "$dryrun" ]; then
+              echo "$cmd </dev/null"
+            else
+              "$cmd" </dev/null
+            fi
+          elif [ ! -e "$cmd" ]; then
+            echo "$cmd: Not found" >&2
+          fi
+          ;;
+        *)
+          SMARTD_ADDRESS="${SMARTD_ADDRESS:+ }$ad"
+          ;;
+      esac
+    done
+
+    # Send email to remaining addresses
+    test -n "$SMARTD_ADDRESS" || exit 0
+    ;;
+esac
+
+# Send mail or run command
+if [ -n "$SMARTD_ADDRESS" ]; then
+
+  # Send mail, use platform mailer by default
+  test -n "$SMARTD_MAILER" || SMARTD_MAILER=$os_mailer
+  if [ -n "$dryrun" ]; then
+    echo "exec '$SMARTD_MAILER' -s '$SMARTD_SUBJECT' $SMARTD_ADDRESS <<EOF
+$fullmessage
+EOF"
+  else
+    exec "$SMARTD_MAILER" -s "$SMARTD_SUBJECT" $SMARTD_ADDRESS <<EOF
+$fullmessage
+EOF
+  fi
+
+elif [ -n "$SMARTD_MAILER" ]; then
+
+  # Run command
+  if [ -n "$dryrun" ]; then
+    echo "export SMARTD_SUBJECT='$SMARTD_SUBJECT'"
+    echo "export SMARTD_FULLMESSAGE='$SMARTD_FULLMESSAGE'"
+    echo "exec '$SMARTD_MAILER' </dev/null"
+  else
+    unset SMARTD_ADDRESS
+    exec "$SMARTD_MAILER" </dev/null
+  fi
+
+fi
index a372408c9667bac2a5be50a1deeeeb7c563e0387..c454b669aef28c7ba6dbc10b27297832a240d097 100644 (file)
@@ -4,7 +4,7 @@
 # CiceroExecutable indicates path to the cicero executable (the file called
 # tts_brltty_es.py in the original distribution of the 0.7 version).  You can
 # create a symbolic link # ln -s your-path/tts_brltty_es.py /usr/bin/cicero or
-# probably better in /usr/local/bin/cicero and modify the bellow option
+# probably better in /usr/local/bin/cicero and modify the below option
 # accordingly.
 
 #CiceroExecutable "/usr/bin/cicero"
@@ -27,4 +27,4 @@
 # Debug turns debugging on or off
 # See speechd.conf for information where debugging information is stored
 
-#Debug 0
\ No newline at end of file
+#Debug 0
index 5379cc05b4c6ca61b4f5ec4f364e2f2214c8ca4b..ce9963aa1ecae80eb944437163a8937734a54214 100644 (file)
@@ -22,6 +22,21 @@ EspeakSoundIconVolume 0
 EspeakPunctuationList "@+_"
 EspeakCapitalPitchRise 0
 
+# -- Rate control --
+# The following options are in words per minute
+#the same as the -s parameter for the -s option in espeak command line tool.
+
+# Minimum rate (-100 in speech-dispatcher)
+EspeakMinRate 80
+
+# Normal rate (0 in speech-dispatcher)
+EspeakNormalRate 170
+
+# Maximum rate (100 in speech-dispatcher)
+EspeakMaxRate 390
+
+
+
 # -- Internal parameters --
 
 # Number of ms of audio returned by the espeak callback function.
index 9f3cb9a3cf8f2162ce1d85a7d9244b1df2712104..3576a11aecac59db62ed5f514489b65903797dbe 100644 (file)
@@ -8,7 +8,7 @@
 # its clients. Two basic methods are "unix_socket" and "inet_socket".
 #
 # unix_socket -- communication over Unix sockets represented by a file in the
-# filesystem (see SocketPath bellow). This method works only locally, but is
+# filesystem (see SocketPath below). This method works only locally, but is
 # prefered for standard session setup, where every user runs his own instance of Speech
 # Dispatcher to get voice feedback on his own computer.
 #
@@ -23,7 +23,8 @@
 # SocketPath is either "default" or a full path to the filesystem
 # where the driving Unix socket file should be created in case the
 # CommunicationMethod is set to "unix_socket". The default is
-# ~/.speech-dispatcher/speechd.sock where ~ is the given users home directory.
+# $XDG_RUNTIME_DIR/speech-dispatcher/speechd.sock where $XDG_RUNTIME_DIR
+# is the directory specified by the XDG Base Directory Specification.
 # Do not change this unless you have a reason and know what you are doing.
 
 # SocketPath "default"
@@ -65,7 +66,7 @@ LogDir  "default"
 # The CustomLogFile allows logging all messages of the given kind,
 # regardless their priority, to the given destination.
 
-#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
+#CustomLogFile "protocol" "/var/log/speech-dispatcher/speech-dispatcher-protocol.log"
 
 # ----- VOICE PARAMETERS -----
 
@@ -91,7 +92,7 @@ DefaultVolume 100
 # default.  Voice types are symbolic names which map to particular
 # voices provided by the synthesizer according to the output module
 # configuratuion.  Please see the synthesizer-specific configuration
-# in etc/speechd/modules/ to see which voices are assigned to
+# in etc/speech-dispatcher/modules/ to see which voices are assigned to
 # different symbolic names.  The following symbolic names are
 # currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
 # CHILD_MALE, CHILD_FEMALE
@@ -204,12 +205,13 @@ DefaultVolume 100
 #  - binary is the path to the binary executable of this module,
 #    either relative (to lib/speech-dispatcher-modules/) or absolute
 #  - configuration is the path to the config file of this module,
-#    either relative (to etc/speechd/modules/) or absolute
+#    either relative (to etc/speech-dispatcher/modules/) or absolute
 
-AddModule "espeak"       "sd_espeak"   "espeak.conf"
-AddModule "festival"     "sd_festival"  "festival.conf"
+#AddModule "espeak"       "sd_espeak"   "espeak.conf"
+#AddModule "festival"     "sd_festival"  "festival.conf"
 #AddModule "flite"        "sd_flite"     "flite.conf"
 #AddModule "ivona"      "sd_ivona"    "ivona.conf"
+#AddModule "pico"        "sd_pico"     "pico.conf"
 #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
 #AddModule "espeak-mbrola-generic" "sd_generic" "espeak-mbrola-generic.conf"
 #AddModule "swift-generic" "sd_generic" "swift-generic.conf"
@@ -221,7 +223,7 @@ AddModule "festival"     "sd_festival"  "festival.conf"
 # DO NOT REMOVE the following line unless you have
 # a specific reason -- this is the fallback output module
 # that is only used when no other modules are in use
-AddModule "dummy"         "sd_dummy"      ""
+#AddModule "dummy"         "sd_dummy"      ""
 
 # The output module testing doesn't actually connect to anything. It
 # outputs the requested commands to standard output and reads
diff --git a/syslog-ng/modules.conf b/syslog-ng/modules.conf
deleted file mode 100644 (file)
index 6128141..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#############################################################################
-#
-# Default modules.conf file for syslog-ng which lists all modules loaded on
-# startup by default.  This file is included by scl, but can be used by
-# including the file directly and avoiding scl.conf entirely.
-#
-# SCL plugins will not emit @module lines for modules listed here (but may
-# do so for other non-listed stuff).
-#
-
-# syslog-ng loads all compile-time configured modules by default, unless
-# autoload-compiled-modules is set to 0.
-#
-# The next line in this file sets this value to 0, and only loads a selected
-# set of modules as assumed by SCL. So if you don't really want control
-# over the modules loaded, simply don't include this file.
-
-@define autoload-compiled-modules 0
-@module syslogformat
-@module basicfuncs
-@module afsocket
-@module affile
-@module afprog
-@module afuser
-@module dbparser
-@module csvparser
-
-### afstreams is auto-loaded by the system() source if needed
-#@module afstreams
-
-### afsql is not loaded by default
-#@module afsql
index ac176bc015e87964469022ee51969d352baeccbd..6ed5c0d59dcab69ad044fa1f29714edb5f19998f 100644 (file)
@@ -1,14 +1,10 @@
 #############################################################################
-# Copyright (c) 2010 BalaBit IT Ltd, Budapest, Hungary
+# Copyright (c) 2010-2012 BalaBit IT Ltd, Budapest, Hungary
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
 # by the Free Software Foundation, or (at your option) any later version.
 #
-# As an additional exemption you are allowed to compile & link against the
-# OpenSSL libraries as published by the OpenSSL project. See the file
-# COPYING for details.
-#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# As an additional exemption you are allowed to compile & link against the
+# OpenSSL libraries as published by the OpenSSL project. See the file
+# COPYING for details.
+#
 #############################################################################
 #
 # This file is placed into /etc/syslog-ng in order to make it trivial to
@@ -28,7 +28,6 @@
 @define scl-root "`syslog-ng-data`/include/scl"
 @define include-path "`include-path`:`syslog-ng-data`/include"
 
-@include 'modules.conf'
 @include 'scl/system/plugin.conf'
 @include 'scl/pacct/plugin.conf'
 @include 'scl/syslogconf/plugin.conf'
index 20e93366f452332c62ab8a6da6287df2d5cdf0f3..7bdc55cd04091b715d28d66144b4ea233f7e52c8 100644 (file)
@@ -1,10 +1,13 @@
-@version: 3.2
-# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $
+@version: 3.4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
 #
 # Syslog-ng default configuration file for Gentoo Linux
 
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
 options { 
-       long_hostnames(off);
+       threaded(yes);
        chain_hostnames(no); 
        flush_lines(0); 
 
@@ -25,6 +28,7 @@ options {
 
 source src {
     unix-stream("/dev/log" max-connections(256));
+    system();
     internal();
     file("/proc/kmsg");
     #udp();
index 8eada182aa1011edb75024f2630c91cffb49b061..31b09b04039e9a8878d729750fe3a2bc2484b2e1 100644 (file)
@@ -4,6 +4,7 @@
 # the compiled in servers are not suitable.  Each entry is a single
 # text line and consists of a regular expression pattern to match and
 # the whois server to be used for it, separated by blank space. 
+# IDN domains must use the ACE format.
 #
 # Eg: 
 # \.nz$ nz.whois-servers.net
index fe1e4e49a9ea589398d94fdc95dfa8bede9c4119..019d52bba4bff54df0789334c597abef6404d190 100644 (file)
@@ -1,12 +1,10 @@
 [Desktop Entry]
-Version=0.6
 Type=Application
 Name=HP System Tray Service
 GenericName=Printer Status Applet
-Comment=HP System Tray Service
-Exec=hp-systray
+Exec=hp-systray -x
 Icon=/usr/share/hplip/data/images/128x128/hp_logo.png
 Terminal=false
-Categories=Application;Utility;
+Categories=Utility;
 X-KDE-StartupNotify=false
 StartupNotify=false