From fd0ee147250e09d3cd8f92e324fc8b3861f280bf Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 31 Aug 2015 11:40:24 +0200 Subject: [PATCH] Current state --- anacrontab | 16 - config-archive/etc/dispatch-conf.conf | 1 + config-archive/etc/dispatch-conf.conf.1 | 64 +++ config-archive/etc/dispatch-conf.conf.dist | 2 +- config-archive/etc/ntp.conf | 54 +++ config-archive/etc/ntp.conf.dist | 54 +++ .../language.texlive-langgerman.dat.lua | 37 ++ .../language.texlive-langgerman.dat.lua.dist | 37 ++ cron.hourly/0anacron | 17 - dispatch-conf.conf | 2 +- eselect/postgresql/slots/9.4/base | 2 +- grub.d/10_linux | 14 +- grub.d/20_linux_xen | 14 +- grub.d/30_os-prober | 3 +- hosts | 1 - hotplug/usb/libsane.usermap | 2 +- hp/hplip.conf | 2 +- layman/layman.cfg | 3 +- logrotate.d/rsyslog | 3 + ntp.conf | 8 +- portage/make.conf | 2 +- portage/package.mask | 2 + portage/package.use | 4 +- rsyslog.conf | 2 +- rsyslog.d/50-default.conf | 12 +- security/limits.conf | 2 +- security/namespace.init | 2 +- texmf/{dvipdfmx => dvipdfmx.d}/dvipdfmx.cfg | 69 ++- texmf/dvips/omega.d/omega.cfg | 1 + texmf/fmtutil.d/format.texlive-basic.cnf | 3 +- texmf/fmtutil.d/format.texlive-context.cnf | 15 +- .../fmtutil.d/format.texlive-formatsextra.cnf | 9 +- .../fmtutil.d/format.texlive-langcyrillic.cnf | 2 +- texmf/fmtutil.d/format.texlive-latex.cnf | 3 +- texmf/fmtutil.d/format.texlive-mathextra.cnf | 2 +- texmf/fmtutil.d/format.texlive-omega.cnf | 2 +- texmf/fmtutil.d/format.texlive-xetex.cnf | 2 +- .../language.texlive-langcyrillic.dat | 4 + .../language.texlive-langgerman.dat | 4 +- .../language.texlive-langcyrillic.dat.lua | 30 ++ .../language.texlive-langgerman.dat.lua | 8 +- .../language.texlive-langcyrillic.def | 4 + .../language.texlive-langgerman.def | 8 +- texmf/ls-R | 22 +- texmf/psutils.d/paper.cfg | 3 + texmf/texmf.d/00header.cnf | 7 +- texmf/texmf.d/05searchpaths.cnf | 38 +- texmf/texmf.d/10standardpaths.cnf | 47 +- texmf/texmf.d/15options.cnf | 3 +- texmf/texmf.d/20sizes.cnf | 15 +- texmf/updmap.d/00updmap.cfg | 352 ++++++++++++++- texmf/updmap.d/texlive-basic.cfg | 1 + texmf/updmap.d/texlive-fontsextra.cfg | 48 +- texmf/updmap.d/texlive-fontsrecommended.cfg | 10 + texmf/updmap.d/texlive-langcyrillic.cfg | 1 + texmf/updmap.d/texlive-omega.cfg | 1 + texmf/web2c.d/fmtutil-hdr.cnf | 6 +- texmf/web2c.d/updmap-hdr.cfg | 88 +++- texmf/web2c/fmtutil.cnf | 38 +- texmf/web2c/texmf.cnf | 110 +++-- texmf/web2c/updmap.cfg | 413 +++++++++++++++++- xdg/autostart/xfsettingsd.desktop | 2 +- .../xfce4-keyboard-shortcuts.xml | 67 +-- .../xfconf/xfce-perchannel-xml/xsettings.xml | 3 +- xdg/xfce4/xinitrc | 12 +- 65 files changed, 1468 insertions(+), 347 deletions(-) delete mode 100644 anacrontab create mode 100644 config-archive/etc/dispatch-conf.conf.1 create mode 100644 config-archive/etc/ntp.conf create mode 100644 config-archive/etc/ntp.conf.dist create mode 100644 config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua create mode 100644 config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist delete mode 100755 cron.hourly/0anacron rename texmf/{dvipdfmx => dvipdfmx.d}/dvipdfmx.cfg (75%) create mode 100644 texmf/dvips/omega.d/omega.cfg create mode 100644 texmf/psutils.d/paper.cfg diff --git a/anacrontab b/anacrontab deleted file mode 100644 index 78c6f8c..0000000 --- a/anacrontab +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/anacrontab: configuration file for anacron - -# See anacron(8) and anacrontab(5) for details. - -SHELL=/bin/sh -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root -# the maximal random delay added to the base delay of the jobs -RANDOM_DELAY=45 -# the jobs will be started during the following hours only -START_HOURS_RANGE=3-22 - -#period in days delay in minutes job-identifier command -1 5 cron.daily nice run-parts /etc/cron.daily -7 25 cron.weekly nice run-parts /etc/cron.weekly -@monthly 45 cron.monthly nice run-parts /etc/cron.monthly diff --git a/config-archive/etc/dispatch-conf.conf b/config-archive/etc/dispatch-conf.conf index c82992c..11e0940 100644 --- a/config-archive/etc/dispatch-conf.conf +++ b/config-archive/etc/dispatch-conf.conf @@ -6,6 +6,7 @@ archive-dir=${EPREFIX}/etc/config-archive # Use rcs for storing files in the archive directory? +# NOTE: You should install dev-vcs/rcs before enabling this option. # WARNING: When configured to use rcs, read and execute permissions of # archived files may be inherited from the first check in of a working # file, as documented in the ci(1) man page. This means that even if diff --git a/config-archive/etc/dispatch-conf.conf.1 b/config-archive/etc/dispatch-conf.conf.1 new file mode 100644 index 0000000..c82992c --- /dev/null +++ b/config-archive/etc/dispatch-conf.conf.1 @@ -0,0 +1,64 @@ +# +# dispatch-conf.conf +# + +# Directory to archive replaced configs +archive-dir=${EPREFIX}/etc/config-archive + +# Use rcs for storing files in the archive directory? +# WARNING: When configured to use rcs, read and execute permissions of +# archived files may be inherited from the first check in of a working +# file, as documented in the ci(1) man page. This means that even if +# the permissions of the working file have since changed, the older +# permissions of the first check in may be inherited. As mentioned in +# the ci(1) man page, users can control access to RCS files by setting +# the permissions of the directory containing the files (see +# archive-dir above). +# (yes or no) +use-rcs=no + +# Diff for display +# %s old file +# %s new file +# If using colordiff instead of diff, the less -R option may be required +# for correct display. +diff="diff -Nu '%s' '%s' | colordiff" + +# Set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored). +# Setting pager="cat" will disable pager usage. +pager="" + +# Default options used if less is the pager +less-opts="--no-init --QUIT-AT-EOF" + +# Diff for interactive merges. +# %s output file +# %s old file +# %s new file +merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'" + +# Automerge files comprising only CVS interpolations (e.g. Header or Id) +# (yes or no) +replace-cvs=yes + +# Automerge files comprising only whitespace and/or comments +# (yes or no) +replace-wscomments=yes + +# Automerge files that the user hasn't modified +# (yes or no) +replace-unmodified=yes + +# Ignore a version that is identical to the previously merged version, +# even though it is different from the current user modified version +# Note that emerge already has a similar feature enabled by default, +# which can be disabled by the emerge --noconfmem option. +# (yes or no) +ignore-previously-merged=no + +# Per-session log file of changes made to configuration files +#log-file=/var/log/dispatch-conf.log + +# List of frozen files for which dispatch-conf will automatically zap updates +#frozen-files="" diff --git a/config-archive/etc/dispatch-conf.conf.dist b/config-archive/etc/dispatch-conf.conf.dist index 125b7cc..7efce8a 100644 --- a/config-archive/etc/dispatch-conf.conf.dist +++ b/config-archive/etc/dispatch-conf.conf.dist @@ -31,7 +31,7 @@ diff="diff -Nu '%s' '%s'" pager="" # Default options used if less is the pager -less-opts="--no-init --QUIT-AT-EOF" +less-opts="--no-init --quit-if-one-screen" # Diff for interactive merges. # %s output file diff --git a/config-archive/etc/ntp.conf b/config-archive/etc/ntp.conf new file mode 100644 index 0000000..b7ef1b3 --- /dev/null +++ b/config-archive/etc/ntp.conf @@ -0,0 +1,54 @@ +# NOTES: +# DHCP clients can append or replace NTP configuration files. +# You should consult your DHCP client documentation about its +# default behaviour and how to change it. + +# Name of the servers ntpd should sync with +# Please respect the access policy as stated by the responsible person. +#server ntp.example.tld iburst + +# Common pool for random people +#server pool.ntp.org + +# Pools for Gentoo users +server 0.debian.pool.ntp.org +server 1.debian.pool.ntp.org +server 2.debian.pool.ntp.org +server 3.debian.pool.ntp.org + +## +# A list of available servers can be found here: +# http://www.pool.ntp.org/ +# http://www.pool.ntp.org/#use +# A good way to get servers for your machine is: +# netselect -s 3 pool.ntp.org +## + +# you should not need to modify the following paths +driftfile /var/lib/ntp/ntp.drift + +#server ntplocal.example.com prefer +#server timeserver.example.org + +# Warning: Using default NTP settings will leave your NTP +# server accessible to all hosts on the Internet. + +# If you want to deny all machines (including your own) +# from accessing the NTP server, uncomment: +#restrict default ignore + + +# Default configuration: +# - Allow only time queries, at a limited rate, sending KoD when in excess. +# - Allow all local queries (IPv4, IPv6) +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] + + +# To allow machines within your network to synchronize +# their clocks with your server, but ensure they are +# not allowed to configure the server or used as peers +# to synchronize against, uncomment this line. +# +#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/config-archive/etc/ntp.conf.dist b/config-archive/etc/ntp.conf.dist new file mode 100644 index 0000000..97bed8d --- /dev/null +++ b/config-archive/etc/ntp.conf.dist @@ -0,0 +1,54 @@ +# NOTES: +# DHCP clients can append or replace NTP configuration files. +# You should consult your DHCP client documentation about its +# default behaviour and how to change it. + +# Name of the servers ntpd should sync with +# Please respect the access policy as stated by the responsible person. +#server ntp.example.tld iburst + +# Common pool for random people +#server pool.ntp.org + +# Pools for Gentoo users +server 0.gentoo.pool.ntp.org +server 1.gentoo.pool.ntp.org +server 2.gentoo.pool.ntp.org +server 3.gentoo.pool.ntp.org + +## +# A list of available servers can be found here: +# http://www.pool.ntp.org/ +# http://www.pool.ntp.org/#use +# A good way to get servers for your machine is: +# netselect -s 3 pool.ntp.org +## + +# you should not need to modify the following paths +driftfile /var/lib/ntp/ntp.drift + +#server ntplocal.example.com prefer +#server timeserver.example.org + +# Warning: Using default NTP settings will leave your NTP +# server accessible to all hosts on the Internet. + +# If you want to deny all machines (including your own) +# from accessing the NTP server, uncomment: +#restrict default ignore + + +# Default configuration: +# - Allow only time queries, at a limited rate, sending KoD when in excess. +# - Allow all local queries (IPv4, IPv6) +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] + + +# To allow machines within your network to synchronize +# their clocks with your server, but ensure they are +# not allowed to configure the server or used as peers +# to synchronize against, uncomment this line. +# +#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua new file mode 100644 index 0000000..9fbb615 --- /dev/null +++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua @@ -0,0 +1,37 @@ + ['german-x-2012-05-30'] = { + loader = 'dehypht-x-2012-05-30.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { 'german-x-latest' }, + patterns = 'hyph-de-1901.pat.txt', + hyphenation = 'hyph-de-1901.hyp.txt', + }, + ['ngerman-x-2012-05-30'] = { + loader = 'dehyphn-x-2012-05-30.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { 'ngerman-x-latest' }, + patterns = 'hyph-de-1996.pat.txt', + hyphenation = 'hyph-de-1996.hyp.txt', + }, + ['german'] = { + loader = 'loadhyph-de-1901.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-1901.pat.txt', + }, + ['ngerman'] = { + loader = 'loadhyph-de-1996.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-1996.pat.txt', + }, + ['swissgerman'] = { + loader = 'loadhyph-de-ch-1901.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-ch-1901.pat.txt', + }, diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist new file mode 100644 index 0000000..cb41cf0 --- /dev/null +++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist @@ -0,0 +1,37 @@ + ['german-x-2014-05-21'] = { + loader = 'dehypht-x-2014-05-21.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { 'german-x-latest' }, + patterns = 'hyph-de-1901.pat.txt', + hyphenation = 'hyph-de-1901.hyp.txt', + }, + ['ngerman-x-2014-05-21'] = { + loader = 'dehyphn-x-2014-05-21.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { 'ngerman-x-latest' }, + patterns = 'hyph-de-1996.pat.txt', + hyphenation = 'hyph-de-1996.hyp.txt', + }, + ['german'] = { + loader = 'loadhyph-de-1901.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-1901.pat.txt', + }, + ['ngerman'] = { + loader = 'loadhyph-de-1996.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-1996.pat.txt', + }, + ['swissgerman'] = { + loader = 'loadhyph-de-ch-1901.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-de-ch-1901.pat.txt', + }, diff --git a/cron.hourly/0anacron b/cron.hourly/0anacron deleted file mode 100755 index 7bcb684..0000000 --- a/cron.hourly/0anacron +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Check whether 0anacron was run today already -if test -r /var/spool/anacron/cron.daily; then - day=`cat /var/spool/anacron/cron.daily` -fi -if [ `date +%Y%m%d` = "$day" ]; then - exit 0; -fi - -# Do not run jobs when on battery power -if test -x /usr/bin/on_ac_power; then - /usr/bin/on_ac_power >/dev/null 2>&1 - if test $? -eq 1; then - exit 0 - fi -fi -/usr/sbin/anacron -s diff --git a/dispatch-conf.conf b/dispatch-conf.conf index 11e0940..8cf60a4 100644 --- a/dispatch-conf.conf +++ b/dispatch-conf.conf @@ -31,7 +31,7 @@ diff="diff -Nu '%s' '%s' | colordiff" pager="" # Default options used if less is the pager -less-opts="--no-init --QUIT-AT-EOF" +less-opts="--no-init --quit-if-one-screen" # Diff for interactive merges. # %s output file diff --git a/eselect/postgresql/slots/9.4/base b/eselect/postgresql/slots/9.4/base index a02c00d..380fd5b 100644 --- a/eselect/postgresql/slots/9.4/base +++ b/eselect/postgresql/slots/9.4/base @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-9.4.3" +postgres_ebuilds="${postgres_ebuilds} postgresql-9.4.4" diff --git a/grub.d/10_linux b/grub.d/10_linux index d03b3eb..94fe619 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -149,13 +149,15 @@ EOF machine=`uname -m` case "x$machine" in xi?86 | xx86_64) - list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; *) - list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; esac case "$machine" in diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index bf48f2b..efc2725 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -137,7 +137,8 @@ EOF EOF } -linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do +linux_list= +for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do if grub_file_is_not_garbage "$i"; then basename=$(basename $i) version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") @@ -149,9 +150,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do break fi done - if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi + if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi fi - done` +done if [ "x${linux_list}" = "x" ] ; then exit 0 fi @@ -165,9 +166,10 @@ file_is_not_sym () { esac } -xen_list=`for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi - done` +xen_list= +for i in /boot/xen*; do + if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi +done prepare_boot_cache= boot_device_id= diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober index 4c1b457..d7e7923 100755 --- a/grub.d/30_os-prober +++ b/grub.d/30_os-prober @@ -319,9 +319,8 @@ EOF EOF ;; *) - echo -n " " # TRANSLATORS: %s is replaced by OS name. - gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 + gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2 ;; esac done diff --git a/hosts b/hosts index 656e448..5806b5a 100644 --- a/hosts +++ b/hosts @@ -16,7 +16,6 @@ 172.21.2.87 petra-local 172.21.2.89 jericho-local - # # Imaginary network. #10.0.0.2 myname diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap index 657719d..e45a8e1 100644 --- a/hotplug/usb/libsane.usermap +++ b/hotplug/usb/libsane.usermap @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24 on Mon Apr 27 19:46:44 2015 +# by sane-desc 3.5 from sane-backends 1.0.24 on Wed Jul 15 23:47:49 2015 # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. diff --git a/hp/hplip.conf b/hp/hplip.conf index 126e7d8..0cd9ce9 100644 --- a/hp/hplip.conf +++ b/hp/hplip.conf @@ -18,7 +18,7 @@ bin=/usr/bin # Following values are determined at configure time and cannot be changed. [configure] -network-build=no +network-build=yes libusb01-build=no pp-build=yes gui-build=yes diff --git a/layman/layman.cfg b/layman/layman.cfg index 466c25b..32e2569 100644 --- a/layman/layman.cfg +++ b/layman/layman.cfg @@ -38,7 +38,8 @@ make_conf : %(storage)s/make.conf # file:///var/lib/layman/my-list.xml overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml - http://10.1.1.1/gentoo/overlay-repos.xml + http://www.brehm-online.com/gentoo/overlay-repos.xml + http://www.brehm-online.com/gentoo/pb-overlay-repos.xml #----------------------------------------------------------- # The directory to scan for xml overlay definition files to include diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog index 79f0924..fec0bd2 100644 --- a/logrotate.d/rsyslog +++ b/logrotate.d/rsyslog @@ -42,6 +42,7 @@ endscript /var/log/messages /var/log/syslog { daily + missingok olddir /var/log/.old/%Y-%m size 1024K postrotate syslog-reload @@ -49,6 +50,7 @@ endscript /var/log/syslog.d/*.log { daily + missingok olddir /var/log/syslog.d/.old/%Y-%m size 1024K postrotate syslog-reload @@ -57,6 +59,7 @@ endscript /var/log/debug.log /var/log/debug /var/log/all /var/log/all.log { daily + missingok olddir /var/log/.old/%Y-%m size 4M postrotate syslog-reload diff --git a/ntp.conf b/ntp.conf index b7ef1b3..97bed8d 100644 --- a/ntp.conf +++ b/ntp.conf @@ -11,10 +11,10 @@ #server pool.ntp.org # Pools for Gentoo users -server 0.debian.pool.ntp.org -server 1.debian.pool.ntp.org -server 2.debian.pool.ntp.org -server 3.debian.pool.ntp.org +server 0.gentoo.pool.ntp.org +server 1.gentoo.pool.ntp.org +server 2.gentoo.pool.ntp.org +server 3.gentoo.pool.ntp.org ## # A list of available servers can be found here: diff --git a/portage/make.conf b/portage/make.conf index 06908ea..5caf7b0 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -25,7 +25,7 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ plotutils posix postgres postscript projectm python quicktime rdesktop \ rle sasl semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \ - soap sockets sox speex sqlite sqlite3 srtp \ + snmp soap sockets sox speex sqlite sqlite3 srtp \ sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \ timidity tools twolame v4l v4l2 vcd video vim-syntax wav wavpack \ wddx webdav webkit wma wmf xattr xcomposite xface xft xine xmlrpc \ diff --git a/portage/package.mask b/portage/package.mask index d2f33b1..0367af1 100644 --- a/portage/package.mask +++ b/portage/package.mask @@ -1,3 +1,5 @@ +=app-emulation/virtualbox-5* + ~dev-java/sun-jre-bin-1.6.0.39 ~dev-java/sun-jdk-1.6.0.39 diff --git a/portage/package.use b/portage/package.use index 342b3f4..2ae7d14 100644 --- a/portage/package.use +++ b/portage/package.use @@ -40,7 +40,7 @@ app-portage/eix optimization strong-optimization app-shells/bash plugins app-shells/tcsh catalogs -app-text/asciidoc python_single_target_python2_7 +#app-text/asciidoc python_single_target_python2_7 app-text/djvu doc threads app-text/docbook-sgml-utils jadetex app-text/enchant aspell -zemberek @@ -368,7 +368,7 @@ sys-libs/zlib minizip sys-power/acpid logrotate -sys-process/cronie anacron +#sys-process/cronie anacron sys-process/daemontools-scripts withsamplescripts virtual/ffmpeg vaapi diff --git a/rsyslog.conf b/rsyslog.conf index cdad042..df010df 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -58,7 +58,7 @@ $Umask 0022 module( load="builtin:omfile" - Template="RSYSLOG_TraditionalFileFormat" + Template="RSYSLOG_FileFormat" FileCreateMode="0644" DirCreateMode="0755" fileOwnerNum="0" diff --git a/rsyslog.d/50-default.conf b/rsyslog.d/50-default.conf index de5767c..8526133 100644 --- a/rsyslog.d/50-default.conf +++ b/rsyslog.d/50-default.conf @@ -77,12 +77,12 @@ # Uncomment the following directive to re-enable the # deprecated "/var/log/syslog" log file (don't forget to re-enable log # rotation in "/etc/logrotate.d/rsyslog" if you do that!) -*.*;auth,authpriv.none,mail.none action( - type="omfile" - File="/var/log/syslog" - FileOwner="root" - FileGroup="adm" -) +#*.*;auth,authpriv.none,mail.none action( +# type="omfile" +# File="/var/log/syslog" +# FileOwner="root" +# FileGroup="adm" +#) *.emerg action( type="omusrmsg" diff --git a/security/limits.conf b/security/limits.conf index fd66ab7..be621a7 100644 --- a/security/limits.conf +++ b/security/limits.conf @@ -21,7 +21,7 @@ # - data - max data size (KB) # - fsize - maximum filesize (KB) # - memlock - max locked-in-memory address space (KB) -# - nofile - max number of open files +# - nofile - max number of open file descriptors # - rss - max resident set size (KB) # - stack - max stack size (KB) # - cpu - max CPU time (MIN) diff --git a/security/namespace.init b/security/namespace.init index 9ab5806..67d4aa2 100755 --- a/security/namespace.init +++ b/security/namespace.init @@ -1,4 +1,4 @@ -#!/bin/sh -p +#!/bin/sh # It receives polydir path as $1, the instance path as $2, # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3, # and user name in $4. diff --git a/texmf/dvipdfmx/dvipdfmx.cfg b/texmf/dvipdfmx.d/dvipdfmx.cfg similarity index 75% rename from texmf/dvipdfmx/dvipdfmx.cfg rename to texmf/dvipdfmx.d/dvipdfmx.cfg index 893d0ad..1832f5a 100644 --- a/texmf/dvipdfmx/dvipdfmx.cfg +++ b/texmf/dvipdfmx.d/dvipdfmx.cfg @@ -1,4 +1,4 @@ -%% dvipdfmx.cfg for dvipdfmx. (Public domain.) +%% dvipdfmx.cfg for dvipdfmx and xdvipdfmx. (Public domain.) %% %% PDF Version Setting %% @@ -129,32 +129,47 @@ P 0x003C %% encoded images (which is possible in PS level 2), then these images %% will also be re-encoded using Flate. To turn the conversion off, %% simply remove the options mentioned above. -%% -%% Also note that PAPERSIZE=a0 is specified below. This converts PS -%% files (including EPS) to A0 papersize PDF. This is necessary to -%% prevent gs from clipping PS figure at some papersize. (A0 above -%% simply means large size paper.) If you have figures even larger -%% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of -%% "-sPAPERSIZE=a0" -%% -D "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode '%i' '%o'" - +%% +%% The -dEPSCROP below converts PS files. Before TL 2013, +%% -sPAPERSIZE=a0 was used for this. In 2013, changes were made to +%% xetex.def, dvipdfmx.def, etc., to handle non-zero llx/lly. +%% +%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we +%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks +%% to work with xetex, +%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for +%% example) needs to be accessed. (Also, it is better to use our +%% supplied gs on Windows.) You can also add -dNOSAFER to the ps2pdf +%% command line. +%% +%% Incidentally, especially in TL, more than one dvipdfmx.cfg may be +%% extant. You can find the one that is active by running: +%% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg +%% and control which one is found by setting DVIPDFMXINPUTS. +%% +D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" + +% pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes: +%D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" + +% other random ps converters people have experimented with. +%D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'" +%D "/usr/texbin/epstopdf '%i' -o '%o'" +%D "/usr/bin/pstopdf '%i' -o '%o'" +% %% Frank Siegert's PStill: %D "/usr/local/bin/pstill -c -o '%o' '%i'" - -%% Adobe Acrobat Distiller: -%D "/usr/local/bin/distill -quiet -pairs '%i' '%o'" - +% %% Batik + Fop (SVG-to-PDF): %% If you want both PS and SVG, you need to write a script or program %% that selectively invokes converters. %D "java -classpath classpaths -jar /path/to/batik-rasterizer.jar -m application/pdf -d '%o' '%i'" - +% %% There are no way to directly know suggested size of (raster) images. %% You may want to use %b here, since you can try reading the ebb file %% to see what is natural (physical) size of images. %D "ras2pdf -r 300x300 -b '%b.bb' -o '%o' '%i'" - +% %% ImageMagick: %% Easiest way to support various file formats. %D "convert '%i' 'epdf:%o'" @@ -175,6 +190,12 @@ D "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false - %d 5 +%% Image cache life in hours +%% 0 means erase all old images and leave new images +%% -1 means erase all old images and also erase new images +%% -2 means ignore image cache +%I -2 + %% Font Map Files %% %% teTeX 2.x and TeX Live using updmap (pdfTeX format) @@ -187,5 +208,15 @@ f pdftex.map %% MiKTeX 2.2 and 2.3 %f psfonts.map -%% Put additonal fontmap files here (usually for Type0 fonts) -f cid-x.map +%% Put additional fontmap files here (usually for Type0 fonts) +%f cid-x.map + +% the following file is generated by updmap(-sys) from the +% KanjiMap entries in the updmap.cfg file. +f kanjix.map +% minimal example for Chinese and Korean users +% improvements please to tex-live@tug.org +f ckx.map + +%% Include other config files +%i diff --git a/texmf/dvips/omega.d/omega.cfg b/texmf/dvips/omega.d/omega.cfg new file mode 100644 index 0000000..d9034cf --- /dev/null +++ b/texmf/dvips/omega.d/omega.cfg @@ -0,0 +1 @@ +p +omega.map diff --git a/texmf/fmtutil.d/format.texlive-basic.cnf b/texmf/fmtutil.d/format.texlive-basic.cnf index f8c4e47..66b8983 100644 --- a/texmf/fmtutil.d/format.texlive-basic.cnf +++ b/texmf/fmtutil.d/format.texlive-basic.cnf @@ -1,5 +1,6 @@ -# Generated for texlive-basic by texlive-module.eclass +# Generated for texlive-basic by texlive-module.eclass dviluatex luatex language.def,language.dat.lua dviluatex.ini +luajittex luajittex language.def,language.dat.lua luatex.ini luatex luatex language.def,language.dat.lua luatex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini diff --git a/texmf/fmtutil.d/format.texlive-context.cnf b/texmf/fmtutil.d/format.texlive-context.cnf index 340573a..e09cd2a 100644 --- a/texmf/fmtutil.d/format.texlive-context.cnf +++ b/texmf/fmtutil.d/format.texlive-context.cnf @@ -1,8 +1,7 @@ -# Generated for texlive-context by texlive-module.eclass -#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini -cont-en pdftex cont-usr.tex -8bit *cont-en.ini -cont-en xetex cont-usr.tex -8bit *cont-en.ini -#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini -#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini -#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini -#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini +# Generated for texlive-context by texlive-module.eclass +cont-en pdftex cont-usr.tex -8bit *cont-en.mkii +cont-en xetex cont-usr.tex -8bit *cont-en.mkii +#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii +#! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii +#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii +#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii diff --git a/texmf/fmtutil.d/format.texlive-formatsextra.cnf b/texmf/fmtutil.d/format.texlive-formatsextra.cnf index aafdb0c..e252971 100644 --- a/texmf/fmtutil.d/format.texlive-formatsextra.cnf +++ b/texmf/fmtutil.d/format.texlive-formatsextra.cnf @@ -1,5 +1,10 @@ -# Generated for texlive-formatsextra by texlive-module.eclass +# Generated for texlive-formatsextra by texlive-module.eclass eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini +#! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +#! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini +lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +lualollipop luatex - lualollipop.ini +xelollipop xetex - -etex xelollipop.ini +mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini texsis pdftex - -translate-file=cp227.tcx texsis.ini diff --git a/texmf/fmtutil.d/format.texlive-langcyrillic.cnf b/texmf/fmtutil.d/format.texlive-langcyrillic.cnf index bd05d91..3db54df 100644 --- a/texmf/fmtutil.d/format.texlive-langcyrillic.cnf +++ b/texmf/fmtutil.d/format.texlive-langcyrillic.cnf @@ -1,4 +1,4 @@ -# Generated for texlive-langcyrillic by texlive-module.eclass +# Generated for texlive-langcyrillic by texlive-module.eclass #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini #! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini diff --git a/texmf/fmtutil.d/format.texlive-latex.cnf b/texmf/fmtutil.d/format.texlive-latex.cnf index 6ab164c..8722fc0 100644 --- a/texmf/fmtutil.d/format.texlive-latex.cnf +++ b/texmf/fmtutil.d/format.texlive-latex.cnf @@ -1,6 +1,7 @@ -# Generated for texlive-latex by texlive-module.eclass +# Generated for texlive-latex by texlive-module.eclass dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini lualatex luatex language.dat,language.dat.lua lualatex.ini pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex diff --git a/texmf/fmtutil.d/format.texlive-mathextra.cnf b/texmf/fmtutil.d/format.texlive-mathextra.cnf index 4d2046a..10e3467 100644 --- a/texmf/fmtutil.d/format.texlive-mathextra.cnf +++ b/texmf/fmtutil.d/format.texlive-mathextra.cnf @@ -1,2 +1,2 @@ -# Generated for texlive-mathextra by texlive-module.eclass +# Generated for texlive-mathextra by texlive-module.eclass amstex pdftex - -translate-file=cp227.tcx *amstex.ini diff --git a/texmf/fmtutil.d/format.texlive-omega.cnf b/texmf/fmtutil.d/format.texlive-omega.cnf index 94c2189..7640c83 100644 --- a/texmf/fmtutil.d/format.texlive-omega.cnf +++ b/texmf/fmtutil.d/format.texlive-omega.cnf @@ -1,3 +1,3 @@ -# Generated for texlive-omega by texlive-module.eclass +# Generated for texlive-omega by texlive-module.eclass aleph aleph - *aleph.ini lamed aleph language.dat *lambda.ini diff --git a/texmf/fmtutil.d/format.texlive-xetex.cnf b/texmf/fmtutil.d/format.texlive-xetex.cnf index 93e0d29..f588c41 100644 --- a/texmf/fmtutil.d/format.texlive-xetex.cnf +++ b/texmf/fmtutil.d/format.texlive-xetex.cnf @@ -1,3 +1,3 @@ -# Generated for texlive-xetex by texlive-module.eclass +# Generated for texlive-xetex by texlive-module.eclass xelatex xetex language.dat -etex xelatex.ini xetex xetex language.def -etex xetex.ini diff --git a/texmf/language.dat.d/language.texlive-langcyrillic.dat b/texmf/language.dat.d/language.texlive-langcyrillic.dat index d012b51..c1b331a 100644 --- a/texmf/language.dat.d/language.texlive-langcyrillic.dat +++ b/texmf/language.dat.d/language.texlive-langcyrillic.dat @@ -1,3 +1,7 @@ bulgarian loadhyph-bg.tex +mongolian loadhyph-mn-cyrl.tex +mongolianlmc loadhyph-mn-cyrl-x-lmc.tex russian loadhyph-ru.tex +serbianc loadhyph-sr-cyrl.tex +serbian loadhyph-sr-latn.tex ukrainian loadhyph-uk.tex diff --git a/texmf/language.dat.d/language.texlive-langgerman.dat b/texmf/language.dat.d/language.texlive-langgerman.dat index 8866fd3..b500d55 100644 --- a/texmf/language.dat.d/language.texlive-langgerman.dat +++ b/texmf/language.dat.d/language.texlive-langgerman.dat @@ -1,6 +1,6 @@ -german-x-2012-05-30 dehypht-x-2012-05-30.tex +german-x-2014-05-21 dehypht-x-2014-05-21.tex =german-x-latest -ngerman-x-2012-05-30 dehyphn-x-2012-05-30.tex +ngerman-x-2014-05-21 dehyphn-x-2014-05-21.tex =ngerman-x-latest german loadhyph-de-1901.tex ngerman loadhyph-de-1996.tex diff --git a/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua b/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua index ecabb3e..c2d1415 100644 --- a/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua +++ b/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua @@ -5,6 +5,20 @@ synonyms = { }, patterns = 'hyph-bg.pat.txt', }, + ['mongolian'] = { + loader = 'loadhyph-mn-cyrl.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-mn-cyrl.pat.txt', + }, + ['mongolianlmc'] = { + loader = 'loadhyph-mn-cyrl-x-lmc.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + special = 'disabled:only for 8bit montex with lmc encoding', + }, ['russian'] = { loader = 'loadhyph-ru.tex', lefthyphenmin = 2, @@ -13,6 +27,22 @@ patterns = 'hyph-ru.pat.txt', hyphenation = 'hyph-ru.hyp.txt', }, + ['serbianc'] = { + loader = 'loadhyph-sr-cyrl.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt', + hyphenation = 'hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt', + }, + ['serbian'] = { + loader = 'loadhyph-sr-latn.tex', + lefthyphenmin = 2, + righthyphenmin = 2, + synonyms = { }, + patterns = 'hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt', + hyphenation = 'hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt', + }, ['ukrainian'] = { loader = 'loadhyph-uk.tex', lefthyphenmin = 2, diff --git a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua index 9fbb615..cb41cf0 100644 --- a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua +++ b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua @@ -1,13 +1,13 @@ - ['german-x-2012-05-30'] = { - loader = 'dehypht-x-2012-05-30.tex', + ['german-x-2014-05-21'] = { + loader = 'dehypht-x-2014-05-21.tex', lefthyphenmin = 2, righthyphenmin = 2, synonyms = { 'german-x-latest' }, patterns = 'hyph-de-1901.pat.txt', hyphenation = 'hyph-de-1901.hyp.txt', }, - ['ngerman-x-2012-05-30'] = { - loader = 'dehyphn-x-2012-05-30.tex', + ['ngerman-x-2014-05-21'] = { + loader = 'dehyphn-x-2014-05-21.tex', lefthyphenmin = 2, righthyphenmin = 2, synonyms = { 'ngerman-x-latest' }, diff --git a/texmf/language.def.d/language.texlive-langcyrillic.def b/texmf/language.def.d/language.texlive-langcyrillic.def index 5443aa0..2eb2667 100644 --- a/texmf/language.def.d/language.texlive-langcyrillic.def +++ b/texmf/language.def.d/language.texlive-langcyrillic.def @@ -1,3 +1,7 @@ \addlanguage{bulgarian}{loadhyph-bg.tex}{}{2}{2} +\addlanguage{mongolian}{loadhyph-mn-cyrl.tex}{}{2}{2} +\addlanguage{mongolianlmc}{loadhyph-mn-cyrl-x-lmc.tex}{}{2}{2} \addlanguage{russian}{loadhyph-ru.tex}{}{2}{2} +\addlanguage{serbianc}{loadhyph-sr-cyrl.tex}{}{2}{2} +\addlanguage{serbian}{loadhyph-sr-latn.tex}{}{2}{2} \addlanguage{ukrainian}{loadhyph-uk.tex}{}{2}{2} diff --git a/texmf/language.def.d/language.texlive-langgerman.def b/texmf/language.def.d/language.texlive-langgerman.def index 26e4e2c..c50fc51 100644 --- a/texmf/language.def.d/language.texlive-langgerman.def +++ b/texmf/language.def.d/language.texlive-langgerman.def @@ -1,7 +1,7 @@ -\addlanguage{german-x-2012-05-30}{dehypht-x-2012-05-30.tex}{}{2}{2} -\addlanguage{german-x-latest}{dehypht-x-2012-05-30.tex}{}{2}{2} -\addlanguage{ngerman-x-2012-05-30}{dehyphn-x-2012-05-30.tex}{}{2}{2} -\addlanguage{ngerman-x-latest}{dehyphn-x-2012-05-30.tex}{}{2}{2} +\addlanguage{german-x-2014-05-21}{dehypht-x-2014-05-21.tex}{}{2}{2} +\addlanguage{german-x-latest}{dehypht-x-2014-05-21.tex}{}{2}{2} +\addlanguage{ngerman-x-2014-05-21}{dehyphn-x-2014-05-21.tex}{}{2}{2} +\addlanguage{ngerman-x-latest}{dehyphn-x-2014-05-21.tex}{}{2}{2} \addlanguage{german}{loadhyph-de-1901.tex}{}{2}{2} \addlanguage{ngerman}{loadhyph-de-1996.tex}{}{2}{2} \addlanguage{swissgerman}{loadhyph-de-ch-1901.tex}{}{2}{2} diff --git a/texmf/ls-R b/texmf/ls-R index 5882c9c..66c9b4c 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -1,29 +1,28 @@ % ls-R -- filename database for kpathsea; do not change this line. ./: .: -dvipdfm -dvipdfmx -dvips.d +dvipdfmx.d +dvips fmtutil.d language.dat.d language.dat.lua.d language.def.d ls-R +psutils.d texmf.d updmap.d web2c web2c.d xdvi -./dvipdfm: -config - -./dvipdfm/config: - -./dvipdfmx: +./dvipdfmx.d: dvipdfmx.cfg -./dvips.d: +./dvips: +omega.d + +./dvips/omega.d: +omega.cfg ./fmtutil.d: format.jadetex.cnf @@ -56,6 +55,9 @@ language.texlive-langenglish.def language.texlive-langgerman.def +./psutils.d: +paper.cfg + ./texmf.d: 00header.cnf 05searchpaths.cnf diff --git a/texmf/psutils.d/paper.cfg b/texmf/psutils.d/paper.cfg new file mode 100644 index 0000000..49a6aeb --- /dev/null +++ b/texmf/psutils.d/paper.cfg @@ -0,0 +1,3 @@ +# default papersize +p a4 +# more comment diff --git a/texmf/texmf.d/00header.cnf b/texmf/texmf.d/00header.cnf index e0d38fd..7d713dc 100644 --- a/texmf/texmf.d/00header.cnf +++ b/texmf/texmf.d/00header.cnf @@ -3,9 +3,9 @@ % % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2014/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,4 +40,3 @@ % use of this. - diff --git a/texmf/texmf.d/05searchpaths.cnf b/texmf/texmf.d/05searchpaths.cnf index 03eaeae..27db0f9 100644 --- a/texmf/texmf.d/05searchpaths.cnf +++ b/texmf/texmf.d/05searchpaths.cnf @@ -11,13 +11,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: +% The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + % The Gentoo site tree TEXMFSITE = $TEXMFROOT/texmf-site @@ -42,20 +42,17 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config -% List all the texmf trees. +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -63,13 +60,19 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR % We use GLOBALVARTEXFONTS in order to always be able to search in the global % font cache even if VARTEXFONTS is overridden. @@ -91,3 +94,4 @@ VARTEXFONTS = $GLOBALVARTEXFONTS % one of the TEXMF directories (avoids overlapping ls-R files). + diff --git a/texmf/texmf.d/10standardpaths.cnf b/texmf/texmf.d/10standardpaths.cnf index d046a95..4dbc623 100644 --- a/texmf/texmf.d/10standardpaths.cnf +++ b/texmf/texmf.d/10standardpaths.cnf @@ -58,15 +58,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// % XeTeX. @@ -79,7 +75,7 @@ TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. @@ -253,8 +249,8 @@ MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc % Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. % FONTCONFIG_FILE = fonts.conf FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf @@ -301,7 +297,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx % the /tex/ will not be found. % % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. +% The default LUAINPUTS suffices for luatex and dviluatex. % LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -329,20 +325,22 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % The idea behind this lengthy definition: for each of -% SELFAUTO{LOC,DIR,AUTO}, look in the directory, -% then the subdirectories share/texmf-local and share/texmf, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- we want to include one more directory: the % great-grandparent's texmf-local, because that is how TL is installed % by default. That is, given a binary % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find @@ -350,20 +348,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % As a result, we cannot use actual brace expansion in the definition, % since we don't want to scatter ../'s throughout the value. Hence we -% explicitly list every directory. Arguably more understandable this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ -$SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ -$SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ -$SELFAUTOPARENT/../texmf-local/web2c,\ -$SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/local/share/texmf/web2c,\ +$SELFAUTOPARENT/etc/texmf/web2c\ } % % For reference, here is the old brace-using definition: diff --git a/texmf/texmf.d/15options.cnf b/texmf/texmf.d/15options.cnf index e947780..285e9b9 100644 --- a/texmf/texmf.d/15options.cnf +++ b/texmf/texmf.d/15options.cnf @@ -62,7 +62,7 @@ shell_escape.initex = f % for the purportedly safe shell_escape_commands above to system % directories. TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? @@ -147,3 +147,4 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + diff --git a/texmf/texmf.d/20sizes.cnf b/texmf/texmf.d/20sizes.cnf index 24a6289..98fd8ae 100644 --- a/texmf/texmf.d/20sizes.cnf +++ b/texmf/texmf.d/20sizes.cnf @@ -1,4 +1,4 @@ -% Part 3: Array and other sizes for TeX (and Metafont). +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -20,7 +20,7 @@ % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp extra_mem_top = 0 % extra high memory for chars, tokens, etc. extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. @@ -30,17 +30,17 @@ extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). % Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 +font_mem_size = 8000000 % Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). font_max = 9000 % Extra space for the hash table of control sequences. -hash_extra = 200000 +hash_extra = 600000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 +pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. string_vacancies = 90000 @@ -68,7 +68,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group +save_size = 100000 % for saving values outside current group stack_size = 5000 % simultaneous input sources % These are Omega-specific. @@ -107,4 +107,7 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1 diff --git a/texmf/updmap.d/00updmap.cfg b/texmf/updmap.d/00updmap.cfg index 7128c79..53e4c56 100644 --- a/texmf/updmap.d/00updmap.cfg +++ b/texmf/updmap.d/00updmap.cfg @@ -1,12 +1,36 @@ -# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ -# updmap.cfg for TEXMFMAIN - updmap options. +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Sep 30 03:19:47 2014 +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ +# +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. +# +# To make local customizations to the map files, using one of the +# following methods is simplest: +# 1) run +# updmap-sys --enable Map=foo.map +# for each map file. (Or MixedMap instead of Map, if your font has +# both Metafont and outline definitions.) See the updmap --help +# documentation. This will add lines to the updmap.cfg file in +# TEXMFSYSCONFIG (creating it if necessary). +# +# 2) put all your additional fonts into TEXMFLOCAL, edit +# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. +# +# See the output of updmap --help and/or +# http://tug.org/fonts/fontinstall.html for more. +# +# In any case, manual edits to TL's updmap.cfg files, psfonts.map, +# pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. +# +# Options for updmap. -################################################################ -# OPTIONS -################################################################ -# # dvipsPreferOutline # # Should dvips (by default) prefer bitmap fonts or outline fonts @@ -17,10 +41,9 @@ # We provide such config files which can be enabled via # dvips -Poutline ... resp. dvips -Ppk ... # -# Valid settings for dvipsPreferOutline are true / false: dvipsPreferOutline true -# + # LW35 # # Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and @@ -29,9 +52,10 @@ dvipsPreferOutline true # URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) # ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) # ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) +# LW35 URWkb -# + # dvipsDownloadBase35 # # Should dvips (by default) download the standard 35 LaserWriter fonts @@ -41,36 +65,322 @@ LW35 URWkb # dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download # the LW35 fonts resp. use the built-in fonts. # -# Valid settings are true / false: dvipsDownloadBase35 true -# + # pdftexDownloadBase14 # # Should pdftex download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). Adobe recommends embedding all fonts. +# the fonts. The PDF files will get bigger, though. +# pdftexDownloadBase14 true -# + # dvipdfmDownloadBase14 # # Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download # the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). +# dvipdfmDownloadBase14 true -# + # kanjiEmbed # # updmap generates a file kanjix.map for usage with dvipdfmx. With this # option one can switch between not embedding any kanji font, or # any of the several available. -# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring -# in a map file name will be replaced with this value, and the respective -# map file used. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. +# kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) +#! Map accanthis.map +#! Map OrnementsADF.map +#! Map ArrowsADF.map +#! Map BulletsADF.map +#! Map Alegreya.map +#! MixedMap allrunes.map +#! Map euler.map +#! MixedMap cm.map +#! MixedMap cmextra.map +#! MixedMap cyrillic.map +#! MixedMap latxfont.map +#! MixedMap symbols.map +#! Map AnonymousPro.map +#! Map uaq.map +#! Map antt.map +#! Map arabi.map +#! MixedMap arabtex.map +#! Map syriac.map +#! Map archaicprw.map +#! Map arev.map +#! MixedMap arss.map +#! MixedMap artm.map +#! Map bkaiu.map +#! Map bsmiu.map +#! Map gbsnu.map +#! Map gkaiu.map +#! Map ascii.map +#! Map aspectratio.map +#! Map augie.map +#! Map auncial.map +#! Map aurical.map +#! Map uag.map +#! Map ybv.map +#! Map Baskervaldx.map +#! MixedMap bbold.map +#! Map belleek.map +#! Map bera.map +#! Map ybd.map +#! Map bguq.map +#! Map sqrcaps.map +#! Map ubk.map +#! Map boondox.map +#! Map pbsi.map +#! Map burmese.map +#! Map cabin.map +#! Map caladea.map +#! Map calligra.map +#! Map cantarell.map +#! Map carlito.map +#! Map cmin.map +#! MixedMap cbgreek-full.map +#! MixedMap ccpl.map +#! Map ccicons.map +#! Map clm.map +#! Map chemarrow.map +#! Map cinzel.map +#! Map cjhebrew.map +#! Map ClearSans.map +#! MixedMap cmtext-bsr-interpolated.map +#! Map cm-lgc.map +#! MixedMap cm-super-t1.map +#! MixedMap cm-super-t2a.map +#! MixedMap cm-super-t2b.map +#! MixedMap cm-super-t2c.map +#! MixedMap cm-super-ts1.map +#! MixedMap cm-super-x2.map +#! Map cmcyr.map +#! MixedMap cmll.map +#! Map comfortaa.map +#! Map original-context-symbol.map +#! Map CountriesOfEurope.map +#! Map ucr.map +#! Map cs-charter.map +#! Map csfonts.map +#! Map cyklop.map +#! Map dad.map +#! Map dante.map +#! Map dejavu-type1.map +#! Map dictsym.map +#! Map dstroke.map +#! Map droid.map +#! Map dutchcal.map +#! Map EBGaramond.map +#! Map EBGaramond-Maths.map +#! Map yes.map +#! Map epigrafica.map +#! Map epiolmec.map +#! Map erewhon.map +#! MixedMap esint.map +#! Map ESSTIX.map +#! Map esvect.map +#! MixedMap ethiop.map +#! MixedMap eurosym.map +#! Map fbb.map +#! Map fdsymbol.map +#! Map fetamont.map +#! Map fge.map +#! Map fira.map +#! Map foekfont.map +#! Map fonetika.map +#! Map nectec.map +#! Map nf.map +#! Map sipa.map +#! Map tlwg.map +#! Map fourier-utopia-expert.map +#! Map fourier.map +#! Map frcursive.map +#! Map garuda-c90.map +#! Map gentium-type1.map +#! Map gfsartemisia.map +#! Map gfsbaskerville.map +#! Map gfsbodoni.map +#! Map gfscomplutum.map +#! Map gfsdidot.map +#! Map gfsneohellenic.map +#! Map gfsporson.map +#! Map gfssolomos.map +#! Map gillius.map +#! Map yfrak.map +#! Map ugq.map +#! Map hacm.map +#! Map uhv.map +#! Map Heuristica.map +#! MixedMap hfbright.map +#! MixedMap iby.map +#! Map zi4.map +#! Map Acorn.map +#! Map AnnSton.map +#! Map ArtNouv.map +#! Map ArtNouvc.map +#! Map Carrickc.map +#! Map Eichenla.map +#! Map Eileen.map +#! Map EileenBl.map +#! Map Elzevier.map +#! Map GotIn.map +#! Map GoudyIn.map +#! Map Kinigcap.map +#! Map Konanur.map +#! Map Kramer.map +#! Map MorrisIn.map +#! Map Nouveaud.map +#! Map Romantik.map +#! Map Rothdn.map +#! Map RoyalIn.map +#! Map Sanremo.map +#! Map Starburst.map +#! Map Typocaps.map +#! Map Zallman.map +#! Map ipaex-type1.map +#! Map iwona.map +#! KanjiMap otf-@kanjiEmbed@.map +#! KanjiMap otf-cktx.map +#! KanjiMap otf-up-@kanjiEmbed@.map +#! Map kerkis.map +#! Map knitfont.map +#! Map kpfonts.map +#! Map kurier.map +#! Map lato.map +#! Map libertine.map +#! Map LibreBaskerville.map +#! Map LibreCaslon.map +#! Map yly.map +#! Map linearA.map +#! Map l7x-urwvn.map +#! Map lm.map +#! Map LobsterTwo.map +#! MixedMap lxfonts.map +#! MixedMap manfnt.map +#! Map marvosym.map +#! Map mathabx.map +#! Map mdbch.map +#! Map mdgreek.map +#! Map mdici.map +#! Map mdpgd.map +#! Map mdpus.map +#! Map mdput.map +#! Map mdugm.map +#! Map mdsymbol.map +#! Map merriweather.map +#! Map troff-updmap.map +#! MixedMap mflogo.map +#! Map mintspirit.map +#! Map MnSymbol.map +#! MixedMap mongolian.map +#! MixedMap musix.map +#! Map mxedruli.map +#! Map nanumfonts.map +#! Map unc.map +#! Map newpx.map +#! Map newtx.map +#! Map newtxtt.map +#! Map norasi-c90.map +#! Map cherokee.map +#! Map ocrb.map +#! Map oinuit.map +#! Map omega.map +#! Map opensans.map +#! Map overlock.map +#! Map upl.map +#! Map paratype-type1.map +#! Map dummy-space.map +#! Map phaistos.map +#! MixedMap pigpen.map +#! MixedMap plother.map +#! MixedMap pltext.map +#! Map PlayfairDisplay.map +#! Map ap.map +#! Map prodint.map +#! Map charter.map +#! Map fpls.map +#! Map pazo.map +#! Map utopia.map +#! KanjiMap morisawa.map +#! KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map +#! Map pxfonts.map +#! Map pxtx.map +#! Map quattrocento.map +#! Map Raleway.map +#! Map recycle.map +#! Map roboto.map +#! Map yrd.map +#! MixedMap rsfs.map +#! Map rsfso.map +#! Map skt.map +#! Map sansmathaccent.map +#! Map sansmathfonts.map +#! MixedMap semaf.map +#! Map SkakNew.map +#! Map SourceCodePro.map +#! Map SourceSansPro.map +#! Map starfont.map +#! Map icelandic.map +#! Map stix.map +#! MixedMap stmaryrd.map +#! Map superiors.map +#! Map usy.map +#! Map tabvar.map +Map mathpple.map +#! Map qag.map +#! Map qbk.map +#! Map qcr.map +#! Map qcs.map +#! Map qhv.map +#! Map qpl.map +#! Map qtm.map +#! Map qzc.map +#! Map tfrupee.map +#! Map utm.map +#! MixedMap tipa.map +#! MixedMap trajan.map +#! Map txfonts.map +#! Map gptimes.map +#! Map umj.map +#! Map universalis.map +#! KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map +#! MixedMap dvng.map +#! Map yv1.map +#! Map yv2.map +#! Map yv3.map +#! Map yvo.map +#! Map yvt.map +#! Map arevvn.map +#! Map chartervn.map +#! Map cmbrightvn.map +#! Map concretevn.map +#! Map grotesqvn.map +#! Map txttvn.map +#! Map urwvn.map +#! MixedMap vnrother.map +#! MixedMap vnrtext.map +#! Map vntopia.map +#! Map dgj.map +#! Map dmj.map +#! Map mc2j.map +#! Map mcj.map +#! Map mr2j.map +#! Map mrj.map +#! MixedMap wasy.map +#! Map XCharter.map +#! MixedMap xypic.map +#! MixedMap yhmath.map +#! Map uzc.map +#! Map uzd.map diff --git a/texmf/updmap.d/texlive-basic.cfg b/texmf/updmap.d/texlive-basic.cfg index 10f7eb0..e91058d 100644 --- a/texmf/updmap.d/texlive-basic.cfg +++ b/texmf/updmap.d/texlive-basic.cfg @@ -6,3 +6,4 @@ MixedMap latxfont.map MixedMap symbols.map MixedMap cmtext-bsr-interpolated.map MixedMap mflogo.map +Map dummy-space.map diff --git a/texmf/updmap.d/texlive-fontsextra.cfg b/texmf/updmap.d/texlive-fontsextra.cfg index 61f3a10..1e7a3f8 100644 --- a/texmf/updmap.d/texlive-fontsextra.cfg +++ b/texmf/updmap.d/texlive-fontsextra.cfg @@ -1,7 +1,10 @@ +Map accanthis.map Map OrnementsADF.map Map ArrowsADF.map Map BulletsADF.map +Map Alegreya.map MixedMap allrunes.map +Map AnonymousPro.map Map uaq.map Map antt.map Map archaicprw.map @@ -12,6 +15,7 @@ Map augie.map Map auncial.map Map aurical.map Map ybv.map +Map Baskervaldx.map MixedMap bbold.map Map belleek.map Map bera.map @@ -20,42 +24,58 @@ Map bguq.map Map sqrcaps.map Map boondox.map Map pbsi.map +Map cabin.map +Map caladea.map Map calligra.map Map cantarell.map +Map carlito.map Map cmin.map Map ccicons.map Map clm.map +Map cinzel.map +Map ClearSans.map Map cm-lgc.map MixedMap cmll.map Map comfortaa.map Map CountriesOfEurope.map Map cyklop.map +Map dante.map Map dejavu-type1.map Map dictsym.map Map dstroke.map Map droid.map Map dutchcal.map +Map EBGaramond-Maths.map +Map EBGaramond.map Map yes.map Map epigrafica.map +Map erewhon.map Map ESSTIX.map Map esvect.map +Map fbb.map Map fdsymbol.map +Map fetamont.map Map fge.map +Map fira.map Map foekfont.map Map fonetika.map Map fourier.map Map fourier-utopia-expert.map Map frcursive.map +Map gentium-type1.map Map gfsartemisia.map Map gfsbodoni.map Map gfscomplutum.map Map gfsdidot.map Map gfsneohellenic.map Map gfssolomos.map +Map gillius.map Map yfrak.map Map ugq.map +Map hacm.map +Map Heuristica.map MixedMap hfbright.map -Map fi4.map +Map zi4.map Map Acorn.map Map AnnSton.map Map ArtNouvc.map @@ -79,43 +99,67 @@ Map Sanremo.map Map Starburst.map Map Typocaps.map Map Zallman.map +Map ipaex-type1.map Map iwona.map Map kpfonts.map Map kurier.map Map lato.map Map libertine.map +Map LibreBaskerville.map +Map LibreCaslon.map Map yly.map Map linearA.map +Map LobsterTwo.map MixedMap lxfonts.map Map mathabx.map Map mdbch.map +Map mdgreek.map +Map mdici.map +Map mdpgd.map +Map mdpus.map Map mdput.map Map mdugm.map Map mdsymbol.map +Map merriweather.map +Map mintspirit.map Map MnSymbol.map -Map ntx.map +Map newpx.map +Map newtx.map +Map newtxtt.map Map cherokee.map Map ocrb.map Map oinuit.map Map opensans.map +Map overlock.map Map paratype-type1.map Map phaistos.map MixedMap pigpen.map +Map PlayfairDisplay.map Map ap.map Map prodint.map Map pxtx.map +Map quattrocento.map +Map Raleway.map Map recycle.map +Map roboto.map Map yrd.map Map rsfso.map Map sansmathaccent.map +Map sansmathfonts.map MixedMap semaf.map +Map SourceCodePro.map +Map SourceSansPro.map Map starfont.map Map icelandic.map +Map stix.map +Map superiors.map Map tfrupee.map MixedMap trajan.map Map gptimes.map +Map universalis.map Map yv1.map Map yv2.map Map yv3.map Map yvo.map Map yvt.map +Map XCharter.map diff --git a/texmf/updmap.d/texlive-fontsrecommended.cfg b/texmf/updmap.d/texlive-fontsrecommended.cfg index 5584bf7..ecbeac1 100644 --- a/texmf/updmap.d/texlive-fontsrecommended.cfg +++ b/texmf/updmap.d/texlive-fontsrecommended.cfg @@ -1,14 +1,21 @@ +Map uag.map +Map ubk.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map MixedMap cm-super-t2c.map MixedMap cm-super-ts1.map MixedMap cm-super-x2.map +Map ucr.map MixedMap eurosym.map +Map uhv.map Map lm.map Map marvosym.map +Map unc.map +Map upl.map Map pxfonts.map MixedMap rsfs.map +Map usy.map Map qag.map Map qbk.map Map qcr.map @@ -17,6 +24,9 @@ Map qhv.map Map qpl.map Map qtm.map Map qzc.map +Map utm.map MixedMap tipa.map Map txfonts.map MixedMap wasy.map +Map uzc.map +Map uzd.map diff --git a/texmf/updmap.d/texlive-langcyrillic.cfg b/texmf/updmap.d/texlive-langcyrillic.cfg index 14aa1fd..db62620 100644 --- a/texmf/updmap.d/texlive-langcyrillic.cfg +++ b/texmf/updmap.d/texlive-langcyrillic.cfg @@ -1 +1,2 @@ Map cmcyr.map +MixedMap mongolian.map diff --git a/texmf/updmap.d/texlive-omega.cfg b/texmf/updmap.d/texlive-omega.cfg index 9d3a483..1ea7d7a 100644 --- a/texmf/updmap.d/texlive-omega.cfg +++ b/texmf/updmap.d/texlive-omega.cfg @@ -1 +1,2 @@ +Map mxedruli.map Map omega.map diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf index 1d93173..b753274 100644 --- a/texmf/web2c.d/fmtutil-hdr.cnf +++ b/texmf/web2c.d/fmtutil-hdr.cnf @@ -1,4 +1,4 @@ -# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $ +# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $ # Originally written by Thomas Esser, 1998. Public domain. # # As of TeX Live 2008, the final fmtutil.cnf is generated by @@ -13,7 +13,7 @@ # The last "argument" must be the name of the file on which to run # the ini-engine (such as initex). If the ini-engine is e-TeX, and the # e-TeX extensions should be enabled, the filename must be prefixed with -# a * character. +# a * character; this is essentially equivalent to the -etex option. # # fmtutil always passes the -ini option to the engine. # If no pattern-file is desired, use -. @@ -23,7 +23,7 @@ # 1) tex and amstex just load hyphen.tex. No customization. # You can have your own customized (via babel's hyphen.cfg) # formats on top of plain by using "bplain.tex" instead of -# plain.tex (see e.g. bplain.ini file for bplain format). +# plain.tex (e.g., bplain.ini file for bplain format). # # 2) etex-based formats load language.def, not language.dat. # diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg index 5eda450..db3560c 100644 --- a/texmf/web2c.d/updmap-hdr.cfg +++ b/texmf/web2c.d/updmap-hdr.cfg @@ -1,11 +1,10 @@ -# $Id: updmap-hdr.cfg 26891 2012-06-10 22:41:49Z karl $ +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ # -# The updmap.cfg in this tree (TEXMFDIST) is generated by tlmgr by -# concatenating updmap-hdr.cfg with all updmap.cfg files found. +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. # # To make local customizations to the map files, using one of the # following methods is simplest: -# # 1) run # updmap-sys --enable Map=foo.map # for each map file. (Or MixedMap instead of Map, if your font has @@ -21,7 +20,82 @@ # # In any case, manual edits to TL's updmap.cfg files, psfonts.map, # pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. + +# +# Options for updmap. + + +# dvipsPreferOutline +# +# Should dvips (by default) prefer bitmap fonts or outline fonts +# if both are available? Independent of this setting, outlines +# can be forced by putting "p psfonts_t1.map" into a config file +# that dvips reads. Bitmaps (for the fonts in question) can +# be forced by putting "p psfonts_pk.map" into a config file. +# We provide such config files which can be enabled via +# dvips -Poutline ... resp. dvips -Ppk ... +# +dvipsPreferOutline true + + +# LW35 +# +# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and +# how are the filenames chosen? Valid settings: +# URW: URW fonts with "vendor" filenames (e.g. n019064l.pfb) +# URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) +# ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) +# ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) +# +LW35 URWkb + + +# dvipsDownloadBase35 +# +# Should dvips (by default) download the standard 35 LaserWriter fonts +# with the document (then set dvipsDownloadBase35 true) or should these +# fonts be used from the ps interpreter / printer? +# Whatever the default is, the user can override it by specifying +# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download +# the LW35 fonts resp. use the built-in fonts. +# +dvipsDownloadBase35 true + + +# pdftexDownloadBase14 +# +# Should pdftex download the base 14 pdf fonts? Since some configurations +# (ps / pdf tools / printers) use bad default fonts, it is safer to download +# the fonts. The PDF files will get bigger, though. +# +pdftexDownloadBase14 true + + +# dvipdfmDownloadBase14 +# +# Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations +# (ps / pdf tools / printers) use bad default fonts, it is safer to download +# the fonts. The pdf files will get bigger, though. +# +dvipdfmDownloadBase14 true + + +# kanjiEmbed +# +# updmap generates a file kanjix.map for usage with dvipdfmx. With this +# option one can switch between not embedding any kanji font, or +# any of the several available. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. # -# The default settings of the updmap options (not maps) are specified in -# TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in -# any other tree. +kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) diff --git a/texmf/web2c/fmtutil.cnf b/texmf/web2c/fmtutil.cnf index 0eb80c2..651b92d 100644 --- a/texmf/web2c/fmtutil.cnf +++ b/texmf/web2c/fmtutil.cnf @@ -1,43 +1,49 @@ # JadeTeX jadetex pdftex language.dat -translate-file=cp227.tcx &latex jadetex.ini pdfjadetex pdftex language.dat -translate-file=cp227.tcx &pdflatex pdfjadetex.ini -# Generated for texlive-basic by texlive-module.eclass +# Generated for texlive-basic by texlive-module.eclass dviluatex luatex language.def,language.dat.lua dviluatex.ini +luajittex luajittex language.def,language.dat.lua luatex.ini luatex luatex language.def,language.dat.lua luatex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini tex tex - tex.ini -# Generated for texlive-context by texlive-module.eclass -#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini -cont-en pdftex cont-usr.tex -8bit *cont-en.ini -cont-en xetex cont-usr.tex -8bit *cont-en.ini -#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini -#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini -#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini -#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini -# Generated for texlive-formatsextra by texlive-module.eclass +# Generated for texlive-context by texlive-module.eclass +cont-en pdftex cont-usr.tex -8bit *cont-en.mkii +cont-en xetex cont-usr.tex -8bit *cont-en.mkii +#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii +#! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii +#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii +#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii +# Generated for texlive-formatsextra by texlive-module.eclass eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini +#! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +#! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini +lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +lualollipop luatex - lualollipop.ini +xelollipop xetex - -etex xelollipop.ini +mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini texsis pdftex - -translate-file=cp227.tcx texsis.ini -# Generated for texlive-langcyrillic by texlive-module.eclass +# Generated for texlive-langcyrillic by texlive-module.eclass #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini #! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini -# Generated for texlive-latex by texlive-module.eclass +# Generated for texlive-latex by texlive-module.eclass dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini lualatex luatex language.dat,language.dat.lua lualatex.ini pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex -# Generated for texlive-mathextra by texlive-module.eclass +# Generated for texlive-mathextra by texlive-module.eclass amstex pdftex - -translate-file=cp227.tcx *amstex.ini -# Generated for texlive-omega by texlive-module.eclass +# Generated for texlive-omega by texlive-module.eclass aleph aleph - *aleph.ini lamed aleph language.dat *lambda.ini -# Generated for texlive-xetex by texlive-module.eclass +# Generated for texlive-xetex by texlive-module.eclass xelatex xetex language.dat -etex xelatex.ini xetex xetex language.def -etex xetex.ini xmltex pdftex language.dat &latex xmltex.ini diff --git a/texmf/web2c/texmf.cnf b/texmf/web2c/texmf.cnf index b36dbed..38d3385 100644 --- a/texmf/web2c/texmf.cnf +++ b/texmf/web2c/texmf.cnf @@ -3,9 +3,9 @@ % % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2014/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,7 +40,6 @@ % use of this. - % Part 1: Search paths and directories. % This is the parent directory of our several trees, i.e., @@ -54,13 +53,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: +% The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + % The Gentoo site tree TEXMFSITE = $TEXMFROOT/texmf-site @@ -85,20 +84,17 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config -% List all the texmf trees. +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -106,13 +102,19 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR % We use GLOBALVARTEXFONTS in order to always be able to search in the global % font cache even if VARTEXFONTS is overridden. @@ -134,6 +136,7 @@ VARTEXFONTS = $GLOBALVARTEXFONTS % one of the TEXMF directories (avoids overlapping ls-R files). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -194,15 +197,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// % XeTeX. @@ -215,7 +214,7 @@ TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. @@ -389,8 +388,8 @@ MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc % Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. % FONTCONFIG_FILE = fonts.conf FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf @@ -437,7 +436,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx % the /tex/ will not be found. % % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. +% The default LUAINPUTS suffices for luatex and dviluatex. % LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -465,20 +464,22 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % The idea behind this lengthy definition: for each of -% SELFAUTO{LOC,DIR,AUTO}, look in the directory, -% then the subdirectories share/texmf-local and share/texmf, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- we want to include one more directory: the % great-grandparent's texmf-local, because that is how TL is installed % by default. That is, given a binary % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find @@ -486,20 +487,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % As a result, we cannot use actual brace expansion in the definition, % since we don't want to scatter ../'s throughout the value. Hence we -% explicitly list every directory. Arguably more understandable this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ -$SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ -$SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ -$SELFAUTOPARENT/../texmf-local/web2c,\ -$SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/local/share/texmf/web2c,\ +$SELFAUTOPARENT/etc/texmf/web2c\ } % % For reference, here is the old brace-using definition: @@ -577,7 +571,7 @@ shell_escape.initex = f % for the purportedly safe shell_escape_commands above to system % directories. TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? @@ -662,7 +656,8 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 -% Part 3: Array and other sizes for TeX (and Metafont). + +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -684,7 +679,7 @@ BIBTEX_CSFILE = 88591lat.csf % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp extra_mem_top = 0 % extra high memory for chars, tokens, etc. extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. @@ -694,17 +689,17 @@ extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). % Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 +font_mem_size = 8000000 % Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). font_max = 9000 % Extra space for the hash table of control sequences. -hash_extra = 200000 +hash_extra = 600000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 +pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. string_vacancies = 90000 @@ -732,7 +727,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group +save_size = 100000 % for saving values outside current group stack_size = 5000 % simultaneous input sources % These are Omega-specific. @@ -771,6 +766,9 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1 % -- tex4ht configuration params added by texmf-update -- TEX4HTINPUTS=.;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts// diff --git a/texmf/web2c/updmap.cfg b/texmf/web2c/updmap.cfg index 48c8410..341cb81 100644 --- a/texmf/web2c/updmap.cfg +++ b/texmf/web2c/updmap.cfg @@ -1,12 +1,36 @@ -# $Id: updmap.cfg 26891 2012-06-10 22:41:49Z karl $ -# updmap.cfg for TEXMFMAIN - updmap options. +# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Sep 30 03:19:47 2014 +# $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $ +# +# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by +# concatenating updmap-hdr.cfg with the updmap.cfg files in this tree. +# +# To make local customizations to the map files, using one of the +# following methods is simplest: +# 1) run +# updmap-sys --enable Map=foo.map +# for each map file. (Or MixedMap instead of Map, if your font has +# both Metafont and outline definitions.) See the updmap --help +# documentation. This will add lines to the updmap.cfg file in +# TEXMFSYSCONFIG (creating it if necessary). +# +# 2) put all your additional fonts into TEXMFLOCAL, edit +# TEXMFLOCAL/web2c/updmap.cfg, and run updmap-sys. +# +# See the output of updmap --help and/or +# http://tug.org/fonts/fontinstall.html for more. +# +# In any case, manual edits to TL's updmap.cfg files, psfonts.map, +# pdftex.map, etc., will be lost on update. So don't do that. +# +# The default settings of the updmap options (not maps) are also +# specified in TEXMFDIST/web2c/updmap.cfg (also coming originally from +# updmap-hdr.cfg) and can be overridden by an updmap.cfg in any other +# tree. +# +# Options for updmap. -################################################################ -# OPTIONS -################################################################ -# # dvipsPreferOutline # # Should dvips (by default) prefer bitmap fonts or outline fonts @@ -17,10 +41,9 @@ # We provide such config files which can be enabled via # dvips -Poutline ... resp. dvips -Ppk ... # -# Valid settings for dvipsPreferOutline are true / false: dvipsPreferOutline true -# + # LW35 # # Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and @@ -29,9 +52,10 @@ dvipsPreferOutline true # URWkb: URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb) # ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb) # ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb) +# LW35 URWkb -# + # dvipsDownloadBase35 # # Should dvips (by default) download the standard 35 LaserWriter fonts @@ -41,39 +65,325 @@ LW35 URWkb # dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download # the LW35 fonts resp. use the built-in fonts. # -# Valid settings are true / false: dvipsDownloadBase35 true -# + # pdftexDownloadBase14 # # Should pdftex download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download -# the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). Adobe recommends embedding all fonts. +# the fonts. The PDF files will get bigger, though. +# pdftexDownloadBase14 true -# + # dvipdfmDownloadBase14 # # Should dvipdfm(x) download the base 14 pdf fonts? Since some configurations # (ps / pdf tools / printers) use bad default fonts, it is safer to download # the fonts. The pdf files will get bigger, though. -# Valid settings are true (download the fonts) or false (don't download -# the fonts). +# dvipdfmDownloadBase14 true -# + # kanjiEmbed # # updmap generates a file kanjix.map for usage with dvipdfmx. With this # option one can switch between not embedding any kanji font, or # any of the several available. -# Valid setting is any string. At updmap run time the @kanjiEmbed@ substring -# in a map file name will be replaced with this value, and the respective -# map file used. +# +# The value can be any string. When updmap is run, the substring +# @kanjiEmbed@ in a map file name will be replaced with this value, and +# the respective map file used. +# kanjiEmbed noEmbed + + +# (end of updmap-hdr.cfg) +#! Map accanthis.map +#! Map OrnementsADF.map +#! Map ArrowsADF.map +#! Map BulletsADF.map +#! Map Alegreya.map +#! MixedMap allrunes.map +#! Map euler.map +#! MixedMap cm.map +#! MixedMap cmextra.map +#! MixedMap cyrillic.map +#! MixedMap latxfont.map +#! MixedMap symbols.map +#! Map AnonymousPro.map +#! Map uaq.map +#! Map antt.map +#! Map arabi.map +#! MixedMap arabtex.map +#! Map syriac.map +#! Map archaicprw.map +#! Map arev.map +#! MixedMap arss.map +#! MixedMap artm.map +#! Map bkaiu.map +#! Map bsmiu.map +#! Map gbsnu.map +#! Map gkaiu.map +#! Map ascii.map +#! Map aspectratio.map +#! Map augie.map +#! Map auncial.map +#! Map aurical.map +#! Map uag.map +#! Map ybv.map +#! Map Baskervaldx.map +#! MixedMap bbold.map +#! Map belleek.map +#! Map bera.map +#! Map ybd.map +#! Map bguq.map +#! Map sqrcaps.map +#! Map ubk.map +#! Map boondox.map +#! Map pbsi.map +#! Map burmese.map +#! Map cabin.map +#! Map caladea.map +#! Map calligra.map +#! Map cantarell.map +#! Map carlito.map +#! Map cmin.map +#! MixedMap cbgreek-full.map +#! MixedMap ccpl.map +#! Map ccicons.map +#! Map clm.map +#! Map chemarrow.map +#! Map cinzel.map +#! Map cjhebrew.map +#! Map ClearSans.map +#! MixedMap cmtext-bsr-interpolated.map +#! Map cm-lgc.map +#! MixedMap cm-super-t1.map +#! MixedMap cm-super-t2a.map +#! MixedMap cm-super-t2b.map +#! MixedMap cm-super-t2c.map +#! MixedMap cm-super-ts1.map +#! MixedMap cm-super-x2.map +#! Map cmcyr.map +#! MixedMap cmll.map +#! Map comfortaa.map +#! Map original-context-symbol.map +#! Map CountriesOfEurope.map +#! Map ucr.map +#! Map cs-charter.map +#! Map csfonts.map +#! Map cyklop.map +#! Map dad.map +#! Map dante.map +#! Map dejavu-type1.map +#! Map dictsym.map +#! Map dstroke.map +#! Map droid.map +#! Map dutchcal.map +#! Map EBGaramond.map +#! Map EBGaramond-Maths.map +#! Map yes.map +#! Map epigrafica.map +#! Map epiolmec.map +#! Map erewhon.map +#! MixedMap esint.map +#! Map ESSTIX.map +#! Map esvect.map +#! MixedMap ethiop.map +#! MixedMap eurosym.map +#! Map fbb.map +#! Map fdsymbol.map +#! Map fetamont.map +#! Map fge.map +#! Map fira.map +#! Map foekfont.map +#! Map fonetika.map +#! Map nectec.map +#! Map nf.map +#! Map sipa.map +#! Map tlwg.map +#! Map fourier-utopia-expert.map +#! Map fourier.map +#! Map frcursive.map +#! Map garuda-c90.map +#! Map gentium-type1.map +#! Map gfsartemisia.map +#! Map gfsbaskerville.map +#! Map gfsbodoni.map +#! Map gfscomplutum.map +#! Map gfsdidot.map +#! Map gfsneohellenic.map +#! Map gfsporson.map +#! Map gfssolomos.map +#! Map gillius.map +#! Map yfrak.map +#! Map ugq.map +#! Map hacm.map +#! Map uhv.map +#! Map Heuristica.map +#! MixedMap hfbright.map +#! MixedMap iby.map +#! Map zi4.map +#! Map Acorn.map +#! Map AnnSton.map +#! Map ArtNouv.map +#! Map ArtNouvc.map +#! Map Carrickc.map +#! Map Eichenla.map +#! Map Eileen.map +#! Map EileenBl.map +#! Map Elzevier.map +#! Map GotIn.map +#! Map GoudyIn.map +#! Map Kinigcap.map +#! Map Konanur.map +#! Map Kramer.map +#! Map MorrisIn.map +#! Map Nouveaud.map +#! Map Romantik.map +#! Map Rothdn.map +#! Map RoyalIn.map +#! Map Sanremo.map +#! Map Starburst.map +#! Map Typocaps.map +#! Map Zallman.map +#! Map ipaex-type1.map +#! Map iwona.map +#! KanjiMap otf-@kanjiEmbed@.map +#! KanjiMap otf-cktx.map +#! KanjiMap otf-up-@kanjiEmbed@.map +#! Map kerkis.map +#! Map knitfont.map +#! Map kpfonts.map +#! Map kurier.map +#! Map lato.map +#! Map libertine.map +#! Map LibreBaskerville.map +#! Map LibreCaslon.map +#! Map yly.map +#! Map linearA.map +#! Map l7x-urwvn.map +#! Map lm.map +#! Map LobsterTwo.map +#! MixedMap lxfonts.map +#! MixedMap manfnt.map +#! Map marvosym.map +#! Map mathabx.map +#! Map mdbch.map +#! Map mdgreek.map +#! Map mdici.map +#! Map mdpgd.map +#! Map mdpus.map +#! Map mdput.map +#! Map mdugm.map +#! Map mdsymbol.map +#! Map merriweather.map +#! Map troff-updmap.map +#! MixedMap mflogo.map +#! Map mintspirit.map +#! Map MnSymbol.map +#! MixedMap mongolian.map +#! MixedMap musix.map +#! Map mxedruli.map +#! Map nanumfonts.map +#! Map unc.map +#! Map newpx.map +#! Map newtx.map +#! Map newtxtt.map +#! Map norasi-c90.map +#! Map cherokee.map +#! Map ocrb.map +#! Map oinuit.map +#! Map omega.map +#! Map opensans.map +#! Map overlock.map +#! Map upl.map +#! Map paratype-type1.map +#! Map dummy-space.map +#! Map phaistos.map +#! MixedMap pigpen.map +#! MixedMap plother.map +#! MixedMap pltext.map +#! Map PlayfairDisplay.map +#! Map ap.map +#! Map prodint.map +#! Map charter.map +#! Map fpls.map +#! Map pazo.map +#! Map utopia.map +#! KanjiMap morisawa.map +#! KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map +#! Map pxfonts.map +#! Map pxtx.map +#! Map quattrocento.map +#! Map Raleway.map +#! Map recycle.map +#! Map roboto.map +#! Map yrd.map +#! MixedMap rsfs.map +#! Map rsfso.map +#! Map skt.map +#! Map sansmathaccent.map +#! Map sansmathfonts.map +#! MixedMap semaf.map +#! Map SkakNew.map +#! Map SourceCodePro.map +#! Map SourceSansPro.map +#! Map starfont.map +#! Map icelandic.map +#! Map stix.map +#! MixedMap stmaryrd.map +#! Map superiors.map +#! Map usy.map +#! Map tabvar.map +Map mathpple.map +#! Map qag.map +#! Map qbk.map +#! Map qcr.map +#! Map qcs.map +#! Map qhv.map +#! Map qpl.map +#! Map qtm.map +#! Map qzc.map +#! Map tfrupee.map +#! Map utm.map +#! MixedMap tipa.map +#! MixedMap trajan.map +#! Map txfonts.map +#! Map gptimes.map +#! Map umj.map +#! Map universalis.map +#! KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map +#! MixedMap dvng.map +#! Map yv1.map +#! Map yv2.map +#! Map yv3.map +#! Map yvo.map +#! Map yvt.map +#! Map arevvn.map +#! Map chartervn.map +#! Map cmbrightvn.map +#! Map concretevn.map +#! Map grotesqvn.map +#! Map txttvn.map +#! Map urwvn.map +#! MixedMap vnrother.map +#! MixedMap vnrtext.map +#! Map vntopia.map +#! Map dgj.map +#! Map dmj.map +#! Map mc2j.map +#! Map mcj.map +#! Map mr2j.map +#! Map mrj.map +#! MixedMap wasy.map +#! Map XCharter.map +#! MixedMap xypic.map +#! MixedMap yhmath.map +#! Map uzc.map +#! Map uzd.map Map euler.map MixedMap cmextra.map MixedMap cm.map @@ -82,11 +392,15 @@ MixedMap latxfont.map MixedMap symbols.map MixedMap cmtext-bsr-interpolated.map MixedMap mflogo.map +Map dummy-space.map Map original-context-symbol.map +Map accanthis.map Map OrnementsADF.map Map ArrowsADF.map Map BulletsADF.map +Map Alegreya.map MixedMap allrunes.map +Map AnonymousPro.map Map uaq.map Map antt.map Map archaicprw.map @@ -97,6 +411,7 @@ Map augie.map Map auncial.map Map aurical.map Map ybv.map +Map Baskervaldx.map MixedMap bbold.map Map belleek.map Map bera.map @@ -105,42 +420,58 @@ Map bguq.map Map sqrcaps.map Map boondox.map Map pbsi.map +Map cabin.map +Map caladea.map Map calligra.map Map cantarell.map +Map carlito.map Map cmin.map Map ccicons.map Map clm.map +Map cinzel.map +Map ClearSans.map Map cm-lgc.map MixedMap cmll.map Map comfortaa.map Map CountriesOfEurope.map Map cyklop.map +Map dante.map Map dejavu-type1.map Map dictsym.map Map dstroke.map Map droid.map Map dutchcal.map +Map EBGaramond-Maths.map +Map EBGaramond.map Map yes.map Map epigrafica.map +Map erewhon.map Map ESSTIX.map Map esvect.map +Map fbb.map Map fdsymbol.map +Map fetamont.map Map fge.map +Map fira.map Map foekfont.map Map fonetika.map Map fourier.map Map fourier-utopia-expert.map Map frcursive.map +Map gentium-type1.map Map gfsartemisia.map Map gfsbodoni.map Map gfscomplutum.map Map gfsdidot.map Map gfsneohellenic.map Map gfssolomos.map +Map gillius.map Map yfrak.map Map ugq.map +Map hacm.map +Map Heuristica.map MixedMap hfbright.map -Map fi4.map +Map zi4.map Map Acorn.map Map AnnSton.map Map ArtNouvc.map @@ -164,57 +495,88 @@ Map Sanremo.map Map Starburst.map Map Typocaps.map Map Zallman.map +Map ipaex-type1.map Map iwona.map Map kpfonts.map Map kurier.map Map lato.map Map libertine.map +Map LibreBaskerville.map +Map LibreCaslon.map Map yly.map Map linearA.map +Map LobsterTwo.map MixedMap lxfonts.map Map mathabx.map Map mdbch.map +Map mdgreek.map +Map mdici.map +Map mdpgd.map +Map mdpus.map Map mdput.map Map mdugm.map Map mdsymbol.map +Map merriweather.map +Map mintspirit.map Map MnSymbol.map -Map ntx.map +Map newpx.map +Map newtx.map +Map newtxtt.map Map cherokee.map Map ocrb.map Map oinuit.map Map opensans.map +Map overlock.map Map paratype-type1.map Map phaistos.map MixedMap pigpen.map +Map PlayfairDisplay.map Map ap.map Map prodint.map Map pxtx.map +Map quattrocento.map +Map Raleway.map Map recycle.map +Map roboto.map Map yrd.map Map rsfso.map Map sansmathaccent.map +Map sansmathfonts.map MixedMap semaf.map +Map SourceCodePro.map +Map SourceSansPro.map Map starfont.map Map icelandic.map +Map stix.map +Map superiors.map Map tfrupee.map MixedMap trajan.map Map gptimes.map +Map universalis.map Map yv1.map Map yv2.map Map yv3.map Map yvo.map Map yvt.map +Map XCharter.map +Map uag.map +Map ubk.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map MixedMap cm-super-t2c.map MixedMap cm-super-ts1.map MixedMap cm-super-x2.map +Map ucr.map MixedMap eurosym.map +Map uhv.map Map lm.map Map marvosym.map +Map unc.map +Map upl.map Map pxfonts.map MixedMap rsfs.map +Map usy.map Map qag.map Map qbk.map Map qcr.map @@ -223,11 +585,15 @@ Map qhv.map Map qpl.map Map qtm.map Map qzc.map +Map utm.map MixedMap tipa.map Map txfonts.map MixedMap wasy.map +Map uzc.map +Map uzd.map Map SkakNew.map Map cmcyr.map +MixedMap mongolian.map Map charter.map Map fpls.map Map pazo.map @@ -239,6 +605,7 @@ MixedMap stmaryrd.map MixedMap yhmath.map Map troff-updmap.map MixedMap musix.map +Map mxedruli.map Map omega.map Map knitfont.map MixedMap xypic.map diff --git a/xdg/autostart/xfsettingsd.desktop b/xdg/autostart/xfsettingsd.desktop index 3db7299..8b0b062 100644 --- a/xdg/autostart/xfsettingsd.desktop +++ b/xdg/autostart/xfsettingsd.desktop @@ -2,7 +2,7 @@ Version=1.0 Name=Xfsettingsd Comment=The Xfce Settings Daemon -Comment[de]=Der Einstellungs-Daemon für Xfce +Comment[de]=Der Xfce-Einstellungsdienst Comment[en_GB]=The Xfce Settings Daemon Comment[ru]=Служба диспетчера настроек Xfce Exec=xfsettingsd diff --git a/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml index cf1978d..35a6625 100644 --- a/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ b/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -10,10 +10,11 @@ - + + - + @@ -29,8 +30,8 @@ - - + + @@ -40,38 +41,38 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml index 0a579d6..8f6ef3b 100644 --- a/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ b/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -8,7 +8,7 @@ - + @@ -41,5 +41,6 @@ + diff --git a/xdg/xfce4/xinitrc b/xdg/xfce4/xinitrc index 9d20e8c..443fd85 100644 --- a/xdg/xfce4/xinitrc +++ b/xdg/xfce4/xinitrc @@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then export DESKTOP_SESSION fi +# set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme +if test "x$XDG_CURRENT_DESKTOP" = "x"; then + XDG_CURRENT_DESKTOP="XFCE" + export XDG_CURRENT_DESKTOP +fi + # $XDG_CONFIG_HOME defines the base directory relative to which user specific # configuration files should be stored. If $XDG_CONFIG_HOME is either not set # or empty, a default equal to $HOME/.config should be used. @@ -46,9 +52,9 @@ fi # Modify libglade and glade environment variables so that # it will find the files installed by Xfce -GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:/usr/lib64/glade3/modules" -GLADE_MODULE_PATH="$GLADE_MODULE_PATH:/usr/share/glade3/pixmaps" +GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" +GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:" +GLADE_MODULE_PATH="$GLADE_MODULE_PATH:" export GLADE_CATALOG_PATH export GLADE_PIXMAP_PATH export GLADE_MODULE_PATH -- 2.39.5