daily autocommit

saving uncommitted changes in /etc prior to apt run
daily autocommit
2024-05-02 09:26:51 +02:00 · 2024-05-02 08:39:33 +02:00 · 2024-05-02 06:25:03 +02:00 · 2024-05-01 09:26:47 +02:00 · 2024-05-01 06:25:03 +02:00 · 2024-04-30 09:26:42 +02:00
4917 changed files with 15757 additions and 205708 deletions
@@ -0,0 +1,3 @@
+proc            /proc           proc    defaults          0       0
+PARTUUID=61111533-01  /boot           vfat    defaults,flush    0       2
+PARTUUID=61111533-02  /               ext4    defaults,noatime  0       1
@@ -52,7 +52,4 @@ check_mk/logwatch.state
 DEADJOE

 # end section managed by etckeeper
-
 shadow*
-
-nginx/sites-available/*
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE codermap [
 <!ELEMENT codermap (coder)*>
-<!ELEMENT coder (#PCDATA)>
-<!ATTLIST coder magick CDATA #REQUIRED>
-<!ATTLIST coder name CDATA #REQUIRED>
+  <!ATTLIST codermap xmlns CDATA #FIXED ''>
+  <!ELEMENT coder EMPTY>
+  <!ATTLIST coder xmlns CDATA #FIXED '' magick NMTOKEN #REQUIRED
+    name NMTOKEN #REQUIRED>
 ]>
 <!--
  Associate an image format with the specified coder module.
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE colormap [
-<!ELEMENT colormap (color)+>
+<!ELEMENT colormap (color)*>
 <!ELEMENT color (#PCDATA)>
 <!ATTLIST color name CDATA "0">
 <!ATTLIST color color CDATA "rgb(0,0,0)">
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE delegatemap [
-<!ELEMENT delegatemap (delegate)+>
-<!ELEMENT delegate (#PCDATA)>
-<!ATTLIST delegate decode CDATA #IMPLIED>
-<!ATTLIST delegate encode CDATA #IMPLIED>
-<!ATTLIST delegate mode CDATA #IMPLIED>
-<!ATTLIST delegate spawn CDATA #IMPLIED>
-<!ATTLIST delegate stealth CDATA #IMPLIED>
-<!ATTLIST delegate thread-support CDATA #IMPLIED>
-<!ATTLIST delegate command CDATA #REQUIRED>
+  <!ELEMENT delegatemap (delegate)+>
+  <!ATTLIST delegatemap xmlns CDATA #FIXED ''>
+  <!ELEMENT delegate EMPTY>
+  <!ATTLIST delegate xmlns CDATA #FIXED '' command CDATA #REQUIRED
+    decode NMTOKEN #IMPLIED encode NMTOKEN #IMPLIED mode NMTOKEN #IMPLIED
+    spawn NMTOKEN #IMPLIED stealth NMTOKEN #IMPLIED>
 ]>
 <!--
  Delegate command file.
@@ -61,15 +59,15 @@
 -->
 <delegatemap>
  <delegate decode="bpg" command="&quot;bpgdec&quot; -b 16 -o &quot;%o.png&quot; &quot;%i&quot;; /bin/mv &quot;%o.png&quot; &quot;%o&quot;"/>
-  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -sstdout=%%stderr &quot;%Q&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -q &quot;%~&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
  <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
-  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/; /bin/rm &quot;%i&quot;"/>
+  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; https://imagemagick.org/; /bin/rm &quot;%i&quot;"/>
  <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
  <delegate decode="cgm" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
-  <delegate decode="https" command="&quot;curl&quot; -s -k -L -o &quot;%o&quot; &quot;https:%M&quot;"/>
-  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
-  <delegate decode="doc" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="docx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="https:decode" command="&quot;curl&quot; -s -k -L -o &quot;%u.dat&quot; &quot;https:%M&quot;"/>
+  <delegate decode="doc" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="docx" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 --output=&quot;%u.png&quot; &quot;%i&quot;"/>
  <delegate decode="dot" command='&quot;dot&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
  <delegate decode="dvi" command="&quot;dvips&quot; -sstdout=%%stderr -o &quot;%o&quot; &quot;%i&quot;"/>
  <delegate decode="dxf" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
@@ -83,26 +81,27 @@
  <delegate decode="html" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
  <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
  <delegate decode="jpg" encode="lep" mode="encode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
-  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot; -c 0; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
+  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.pnm&quot;; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.pnm&quot; &quot;%o&quot;"/>
  <delegate decode="lep" mode="decode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
  <delegate decode="miff" encode="show" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
  <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
-  <delegate decode="mpeg:decode" command="&quot;ffmpeg&quot; -nostdin -v -1 -i &quot;%i&quot; -vframes %S -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%u&quot;"/>
-  <delegate decode="odt" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="odt" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
  <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=eps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
-  <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=eps2write&quot; &quot;-sPDFPassword=%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ps2write&quot; &quot;-sPDFPassword=%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pnm" encode="trace" command="&quot;potrace&quot; --svg --output &quot;%o&quot; &quot;%i&quot;"/>
  <delegate decode="png" encode="webp" command="&quot;cwebp&quot; -quiet %Q &quot;%i&quot; -o &quot;%o&quot;"/>
  <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
  <delegate decode="bmp" encode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.bmp&quot;; &quot;JxrEncApp&quot; -i &quot;%i.bmp&quot; -o &quot;%o.jxr&quot;; /bin/mv &quot;%i.bmp&quot; &quot;%i&quot;; /bin/mv &quot;%o.jxr&quot; &quot;%o&quot;"/>
  <delegate decode="bmp" encode="wdp" command="/bin/mv &quot;%i&quot; &quot;%i.bmp&quot;; &quot;JxrEncApp&quot; -i &quot;%i.bmp&quot; -o &quot;%o.jxr&quot;; /bin/mv &quot;%i.bmp&quot; &quot;%i&quot;; /bin/mv &quot;%o.jxr&quot; &quot;%o&quot;"/>
-  <delegate decode="ppt" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="pptx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="ppt" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="pptx" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="ps" encode="prt" command='&quot; lpr&quot; &quot;%i&quot;'/>
  <delegate decode="ps:alpha" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pngalpha&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
  <delegate decode="ps:cmyk" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
-  <delegate decode="ps:color" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pnmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
+  <delegate decode="ps:color" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=png16m&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
  <delegate decode="ps" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=eps2write&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
  <delegate decode="ps" encode="pdf" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
  <delegate decode="ps" encode="print" mode="encode" command="lpr &quot;%i&quot;"/>
@@ -110,14 +109,17 @@
  <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
  <delegate decode="sid" command="&quot;mrsidgeodecode&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
  <delegate decode="svg" command="&quot;rsvg-convert&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="svg:decode" stealth="True" command="&quot;inkscape&quot; &quot;%s&quot; --export-png=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
+  <!-- Change export-filename to export-png for inkscape < 1.0 -->
+  <delegate decode="svg:decode" stealth="True" command="&quot;inkscape&quot; &quot;%s&quot; --export-filename=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
+  <delegate decode="tiff" encode="text" command="&quot;tesseract&quot; &quot;%i&quot; &quot;%u&quot;; /bin/mv &quot;%u.txt&quot; &quot;%o&quot;"/>
  <delegate decode="tiff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
  <delegate decode="wdp" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot;; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
  <delegate decode="webp" command="&quot;dwebp&quot; -pam &quot;%i&quot; -o &quot;%o&quot;"/>
-  <delegate decode="xls" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="xlsx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
-  <delegate decode="xps:cmyk" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="xls" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="xlsx" command="&quot;libreoffice&quot; --headless --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="xps:cmyk" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
  <delegate decode="xps:color" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="xps:mono" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -nostdin -v -1 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%u&quot;"/>
+  <delegate decode="xps:mono" stealth="True" command="&quot;gxps&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+  <delegate decode="video:decode" command="&quot;ffmpeg&quot; -nostdin -v -1 -i &quot;%i&quot; -vframes %S -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%u&quot;"/>
+  <delegate encode="video:encode" stealth="True" command="&quot;ffmpeg&quot; -nostdin -v -1 -i &quot;%M%%d.pam&quot; -plays %I &quot;%u.%m&quot; 2&gt; &quot;%u&quot;"/>
 </delegatemap>
@@ -10,6 +10,45 @@
 <!ATTLIST log format CDATA #IMPLIED>
 ]>
 <!--
+  Configure ImageMagick logger.
+
+  Choose from one or more these events separated by a comma:
+    all
+    accelerate
+    annotate
+    blob
+    cache
+    coder
+    command
+    configure
+    deprecate
+    draw
+    exception
+    locale
+    module
+    none
+    pixel
+    policy
+    resource
+    trace
+    transform
+    user
+    wand
+    x11
+
+  Choose one output handler:
+    console
+    debug
+    event
+    file
+    none
+    stderr
+    stdout
+
+  When output is to a file, specify the filename.  Embed %g in the filename to
+  support log generations.  Generations is the number of log files to retain.
+  Limit is the number of logging events before generating a new log generation.
+
  The format of the log is defined by embedding special format characters:

    %c   client
@@ -29,6 +68,7 @@
    %%   percent sign
    \n   newline
    \r   carriage return
+    xml
 -->
 <logmap>
  <log events="None"/>
@@ -13,6 +13,9 @@
  <!ATTLIST mime mask CDATA #IMPLIED>
  <!ATTLIST mime priority CDATA #IMPLIED>
 ]>
+<!--
+  Configure ImageMagick mime types.
+-->
 <mimemap>
  <mime type="application/andrew-inset" acronym="ATK" description="Andrew Toolkit" priority="100" pattern="*.ez" />
  <mime type="application/illustrator" description="Adobe Illustrator document" priority="100" pattern="*.ai" />
@@ -824,6 +827,7 @@
  <mime type="image/x-gzeps" description="EPS image (gzip-compressed)" priority="100" pattern="*.epsi.gz" />
  <mime type="image/x-gzeps" description="EPS image (gzip-compressed)" priority="100" pattern="*.epsf.gz" />
  <mime type="image/x-ico" acronym="ICO" description="Windows Icon" priority="100" pattern="*.ico" />
+  <mime type="image/x-icon" acronym="ICO" description="Windows Icon" priority="100" pattern="*.ico" />
  <mime type="image/x-icns" description="MacOS X icon" data-type="string" offset="0" magic="icns" priority="50" />
  <mime type="image/x-icns" description="MacOS X icon" priority="100" pattern="*.icns" />
  <mime type="image/x-iff" description="IFF image" priority="100" pattern="*.iff" />
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policymap [
-<!ELEMENT policymap (policy)+>
-<!ELEMENT policy (#PCDATA)>
-<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
-<!ATTLIST policy name CDATA #IMPLIED>
-<!ATTLIST policy rights CDATA #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+  <!ELEMENT policymap (policy)*>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
 ]>
 <!--
  Configure ImageMagick policies.

  Domains include system, delegate, coder, filter, path, or resource.

-  Rights include none, read, write, and execute.  Use | to combine them,
+  Rights include none, read, write, execute and all.  Use | to combine them,
  for example: "read | write" to permit read from, or write to, a path.

  Use a glob expression as a pattern.
@@ -26,27 +25,35 @@

    <policy domain="coder" rights="none" pattern="HTTP" />

+  The /repository file system is restricted to read only.  We use a glob
+  expression to match all paths that start with /repository:
+
+    <policy domain="path" rights="read" pattern="/repository/*" />
+
  Lets prevent users from executing any image filters:

    <policy domain="filter" rights="none" pattern="*" />

-  The /repository file system is restricted to read only.  We use a glob
-  expression to match all paths that start with /repository:
-  
-    <policy domain="path" rights="read" pattern="/repository/*" />
-
-  Let's prevent possible exploits by removing the right to use indirect reads.
-
-    <policy domain="path" rights="none" pattern="@*" />
-
  Any large image is cached to disk rather than memory:

-    <policy domain="resource" name="area" value="1GB"/>
+    <policy domain="resource" name="area" value="1GP"/>

-  Define arguments for the memory, map, area, width, height, and disk resources
+  Use the default system font unless overwridden by the application:
+
+    <policy domain="system" name="font" value="/usr/share/fonts/favorite.ttf"/>
+
+  Define arguments for the memory, map, area, width, height and disk resources
  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
  exceeds policy maximum so memory limit is 1GB).
+
+  Rules are processed in order.  Here we want to restrict ImageMagick to only
+  read or write a small subset of proven web-safe image types:
+
+    <policy domain="delegate" rights="none" pattern="*" />
+    <policy domain="filter" rights="none" pattern="*" />
+    <policy domain="coder" rights="none" pattern="*" />
+    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
 -->
 <policymap>
  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
@@ -54,12 +61,25 @@
  <policy domain="resource" name="map" value="512MiB"/>
  <policy domain="resource" name="width" value="16KP"/>
  <policy domain="resource" name="height" value="16KP"/>
-  <policy domain="resource" name="area" value="128MB"/>
+  <!-- <policy domain="resource" name="list-length" value="128"/> -->
+  <policy domain="resource" name="area" value="128MP"/>
  <policy domain="resource" name="disk" value="1GiB"/>
  <!-- <policy domain="resource" name="file" value="768"/> -->
  <!-- <policy domain="resource" name="thread" value="4"/> -->
  <!-- <policy domain="resource" name="throttle" value="0"/> -->
  <!-- <policy domain="resource" name="time" value="3600"/> -->
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+  <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
  <!-- <policy domain="system" name="precision" value="6"/> -->
  <!-- not needed due to the need to use explicitly by mvg: -->
  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
@@ -69,5 +89,11 @@
  <policy domain="delegate" rights="none" pattern="HTTP" />
  <!-- in order to avoid to get image with password text -->
  <policy domain="path" rights="none" pattern="@*"/>
-  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
+  <!-- disable ghostscript format types -->
+  <policy domain="coder" rights="none" pattern="PS" />
+  <policy domain="coder" rights="none" pattern="PS2" />
+  <policy domain="coder" rights="none" pattern="PS3" />
+  <policy domain="coder" rights="none" pattern="EPS" />
+  <policy domain="coder" rights="none" pattern="PDF" />
+  <policy domain="coder" rights="none" pattern="XPS" />
 </policymap>
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policymap [
-<!ELEMENT policymap (policy)+>
-<!ELEMENT policy (#PCDATA)>
-<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
-<!ATTLIST policy name CDATA #IMPLIED>
-<!ATTLIST policy rights CDATA #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
-]>
-<!--
-  Configure ImageMagick policies.
-
-  Domains include system, delegate, coder, filter, path, or resource.
-
-  Rights include none, read, write, and execute.  Use | to combine them,
-  for example: "read | write" to permit read from, or write to, a path.
-
-  Use a glob expression as a pattern.
-
-  Suppose we do not want users to process MPEG video images:
-
-    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
-
-  Here we do not want users reading images from HTTP:
-
-    <policy domain="coder" rights="none" pattern="HTTP" />
-
-  Lets prevent users from executing any image filters:
-
-    <policy domain="filter" rights="none" pattern="*" />
-
-  The /repository file system is restricted to read only.  We use a glob
-  expression to match all paths that start with /repository:
-  
-    <policy domain="path" rights="read" pattern="/repository/*" />
-
-  Let's prevent possible exploits by removing the right to use indirect reads.
-
-    <policy domain="path" rights="none" pattern="@*" />
-
-  Any large image is cached to disk rather than memory:
-
-    <policy domain="resource" name="area" value="1GB"/>
-
-  Define arguments for the memory, map, area, width, height, and disk resources
-  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
-  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
-  exceeds policy maximum so memory limit is 1GB).
-->
-<policymap>
-  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
-  <policy domain="resource" name="memory" value="256MiB"/>
-  <policy domain="resource" name="map" value="512MiB"/>
-  <policy domain="resource" name="width" value="16KP"/>
-  <policy domain="resource" name="height" value="16KP"/>
-  <policy domain="resource" name="area" value="128MB"/>
-  <policy domain="resource" name="disk" value="1GiB"/>
-  <!-- <policy domain="resource" name="file" value="768"/> -->
-  <!-- <policy domain="resource" name="thread" value="4"/> -->
-  <!-- <policy domain="resource" name="throttle" value="0"/> -->
-  <!-- <policy domain="resource" name="time" value="3600"/> -->
-  <!-- <policy domain="system" name="precision" value="6"/> -->
-  <!-- not needed due to the need to use explicitly by mvg: -->
-  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
-  <!-- use curl -->
-  <policy domain="delegate" rights="none" pattern="URL" />
-  <policy domain="delegate" rights="none" pattern="HTTPS" />
-  <policy domain="delegate" rights="none" pattern="HTTP" />
-  <!-- in order to avoid to get image with password text -->
-  <policy domain="path" rights="none" pattern="@*"/>
-  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
-</policymap>
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE quantization-tables [
-<!ELEMENT quantization-tables (table)+>
-<!ELEMENT table (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST table slot ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT quantization-tables (table)>
+  <!ATTLIST quantization-tables xmlns CDATA #FIXED "">
+  <!ELEMENT table (description , levels)>
+  <!ATTLIST table xmlns CDATA #FIXED "">
+  <!ATTLIST table alias NMTOKEN #REQUIRED>
+  <!ATTLIST table slot CDATA #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED "">
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED "">
+  <!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ATTLIST levels height CDATA #REQUIRED>
+  <!ATTLIST levels width CDATA #REQUIRED>
 ]>
 <!--
  JPEG quantization table created by Dr. Nicolas Robidoux, Senior Research
@@ -47,16 +52,17 @@
      85,  75,  135, 156, 189, 238, 311, 418
    </levels>
  </table>
-<!--
-  If you want to use a different quantization table for Chroma (say), just add 
+  <!--
+    If you want to use a different quantization table for Chroma, for example,
+    just add:

-  <table slot="1" alias="chroma">
-    <description>Chroma Quantization Table</description>
-    INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
-    </levels>
-  </table>
+    <table slot="1" alias="chroma">
+      <description>Chroma Quantization Table</description>
+      INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
+      </levels>
+    </table>

-  here (but outside of these comments).
-->
+    here (but outside of these comments).
+  -->
 </quantization-tables>

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE thresholds [
-<!ELEMENT thresholds (threshold)+>
-<!ELEMENT threshold (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST threshold map ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT thresholds (threshold)+>
+  <!ATTLIST thresholds xmlns CDATA #FIXED ''>
+  <!ELEMENT threshold (description,levels)>
+  <!ATTLIST threshold xmlns CDATA #FIXED '' alias NMTOKEN #IMPLIED
+    map NMTOKEN #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED ''>
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED '' divisor CDATA #REQUIRED
+    height CDATA #REQUIRED width CDATA #REQUIRED>
 ]>
 <!--
  Threshold Maps for Ordered Posterized Dither
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type fullname="" family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick DejaVU font configuration.
+-->
 <typemap>
  <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="DejaVuLGCSans-Bold.ttf"/>
  <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="DejaVuLGCSans-BoldOblique.ttf"/>
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick Ghostscript font configuration.
+-->
 <typemap>
  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/gsfonts/a010013l.afm" glyphs="/usr/share/fonts/type1/gsfonts/a010013l.pfb"/>
  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/gsfonts/a010033l.afm" glyphs="/usr/share/fonts/type1/gsfonts/a010033l.pfb"/>
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE typemap [
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
+]>
+<!--
+  ImageMagick URW-base35 font configuration.
+-->
+<typemap>
+  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWGothic-Book.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWGothic-Book.t1"/>
+  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWGothic-BookOblique.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWGothic-BookOblique.t1"/>
+  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWGothic-Demi.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWGothic-Demi.t1"/>
+  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWGothic-DemiOblique.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWGothic-DemiOblique.t1"/>
+  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWBookman-Demi.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWBookman-Demi.t1"/>
+  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWBookman-DemiItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWBookman-DemiItalic.t1"/>
+  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWBookman-Light.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWBookman-Light.t1"/>
+  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/URWBookman-LightItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/URWBookman-LightItalic.t1"/>
+  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Refular.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Regular.t1"/>
+  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Bold.t1"/>
+  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Italic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-Italic.t1"/>
+  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-BoldItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusMonoPS-BoldItalic.t1"/>
+  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSans-Regular.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSans-Regular.t1"/>
+  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSans-Regular.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSans-Regular.t1"/>
+  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSans-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSans-Bold.t1"/>
+  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSans-Italic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSans-Italic.t1"/>
+  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSans-BoldItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSans-BoldItalic.t1"/>
+  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Regular.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Regular.t1"/>
+  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Oblique.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Oblique.t1"/>
+  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-Bold.t1"/>
+  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="/usr/share/fonts/type1/urw-base35/nNimbusSansNarrow-BdOblique.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusSansNarrow-BdOblique.t1"/>
+  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/C059-Roman.afm" glyphs="/usr/share/fonts/type1/urw-base35/C059-Roman.t1"/>
+  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/C059-Italic.afm" glyphs="/usr/share/fonts/type1/urw-base35/C059-Italic.t1"/>
+  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/C059-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/C059-Bold.t1"/>
+  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/C059-BdIta.afm" glyphs="/usr/share/fonts/type1/urw-base35/C059-BdIta.t1"/>
+  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/P052-Roman.afm" glyphs="/usr/share/fonts/type1/urw-base35/P052-Roman.t1"/>
+  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/P052-Italic.afm" glyphs="/usr/share/fonts/type1/urw-base35/P052-Italic.t1"/>
+  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/P052-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/P052-Bold.t1"/>
+  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/P052-BoldItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/P052-BoldItalic.t1"/>
+  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusRoman-Regular.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusRoman-Regular.t1"/>
+  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusRoman-Bold.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusRoman-Bold.t1"/>
+  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusRoman-Italic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusRoman-Italic.t1"/>
+  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/NimbusRoman-BoldItalic.afm" glyphs="/usr/share/fonts/type1/urw-base35/NimbusRoman-BoldItalic.t1"/>
+  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/urw-base35/StandardSymbolsPS.afm" glyphs="/usr/share/fonts/type1/urw-base35/StandardSymbolsPS.t1" version="2.0" encoding="AdobeCustom"/>
+</typemap>
@@ -16,6 +16,9 @@
 <!ATTLIST type version CDATA #IMPLIED>
 <!ATTLIST include file CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick Windows font configuration.
+-->
 <typemap>
  <type name="Arial" fullname="Arial" family="Arial" weight="400" style="normal" stretch="normal" glyphs="arial.ttf"/>
  <type name="Arial-Black" fullname="Arial Black" family="Arial" weight="900" style="normal" stretch="normal" glyphs="ariblk.ttf"/>
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick font configuration.
+-->
 <typemap>
-   <include file="type-ghostscript.xml" />
+   <include file="type-ghostscript.xml" /> <include file="type-urw-base35.xml" />
 </typemap>
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-old_ntp_servers="unknown and invalid"
-new_ntp_servers=$DHCP4_NTP_SERVERS
-case "$2" in
-	up|vpn-up) reason=BOUND; ;;
-	down|vpn-down) reason=RELEASE; ;;
-	*) exit 0; ;;
-esac
-
-test -f /etc/dhcp/dhclient-exit-hooks.d/ntp || exit 0
-. /etc/dhcp/dhclient-exit-hooks.d/ntp
@@ -1,21 +0,0 @@
-# Only the system administrator should modify this file, ordinary users
-# should not have to change anything.
-
-[Daemon]
-
-# Default backends, as chosen in the configure script. This will be used
-# where no --backend="foo" option is given to the daemon.
-#
-# The order they are specified is the order they are tried, so for the
-# value "foo,bar" first "foo" will be attempted and then "bar" if the
-# libpk_backend_foo.so module load failed.
-#DefaultBackend=auto
-
-# Unlock the backend after this many seconds idle.
-#BackendShutdownTimeout=5
-
-# Shut down the daemon after this many seconds idle. 0 means don't shutdown.
-#ShutdownTimeout=300
-
-# Keep the packages after they have been downloaded
-#KeepCache=false
@@ -1,48 +0,0 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
-[PackagesNotFound]
-
-# This is a link to a vendor URL which is shown when a suitable package
-# could not be found in any remote software source.
-# The page set here should explain how to add new software sources if required.
-#
-# If the value is set to 'none' then no link is shown.
-#
-# default=http://www.packagekit.org/pk-package-not-found.html
-DefaultUrl=https://wiki.debian.org/PackageKit/ItemNotFound#Missing_Package
-
-# The URL which is shown to the user when a codec could not be found.
-# It should explain why certain codecs cannot be used, and perhaps show
-# links to web stores where the codec can be legally purchased.
-#
-# If the value is set to 'none' then the value of DefaultUrl is used.
-#
-# default=none
-CodecUrl=https://wiki.debian.org/PackageKit/ItemNotFound#Missing_Codec
-
-# The URL which is shown to the user when hardware drivers could not be found.
-# It should explain why some hardware is not supported, and links to futher
-# information.
-#
-# If the value is set to 'none' then the value of DefaultUrl is used.
-#
-# default=none
-HardwareUrl=https://wiki.debian.org/PackageKit/ItemNotFound#Missing_Driver
-
-# The URL which is shown to the user when fonts could not be found.
-# Alternatives should probably be suggested where possible.
-#
-# If the value is set to 'none' then the value of DefaultUrl is used.
-#
-# default=none
-FontUrl=https://wiki.debian.org/PackageKit/ItemNotFound#Missing_Font
-
-# The URL which is shown to the user when programs handing a mime tpye could not
-# be found. It should probably explain how to use wine if the program is a
-# Windows program, or suggest alternatives.
-#
-# If the value is set to 'none' then the value of DefaultUrl is used.
-#
-# default=none
-MimeUrl=https://wiki.debian.org/PackageKit/ItemNotFound#Missing_MIME_Support
@@ -60,6 +60,24 @@ USERXSESSIONRC=$HOME/.xsessionrc
 ALTUSERXSESSION=$HOME/.Xsession
 ERRFILE=$HOME/.xsession-errors

+OPTIONS="$(
+  if [ -r "$OPTIONFILE" ]; then
+    cat "$OPTIONFILE"
+  fi
+  if [ -d /etc/X11/Xsession.options.d ]; then
+    run-parts --list --regex '\.conf$' /etc/X11/Xsession.options.d | xargs -d '\n' cat
+  fi
+)"
+
+has_option() {
+  # Ensure that a later no-foo overrides an earlier foo
+  if [ "$(echo "$OPTIONS" | grep -Eo "^(no-)?$1\>" | tail -n 1)" = "$1" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 # attempt to create an error file; abort if we cannot
 if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
  [ ! -L "$ERRFILE" ]; then
@@ -0,0 +1,24 @@
+# vim:set ft=sh sw=2 sts=2 et:
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -n "$XDG_RUNTIME_DIR" ] && \
+    [ "$XDG_RUNTIME_DIR" = "/run/user/`id -u`" ] && \
+    [ -S "$XDG_RUNTIME_DIR/bus" ]; then
+  # We are under systemd-logind or something remarkably similar, and
+  # a user-session socket has already been set up.
+  #
+  # Be nice to non-libdbus, non-sd-bus implementations by using
+  # that as the session bus address in the environment. The check for
+  # XDG_RUNTIME_DIR = "/run/user/`id -u`" is because we know that
+  # form of the address, from systemd-logind, doesn't need escaping,
+  # whereas arbitrary addresses might.
+  DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+  export DBUS_SESSION_BUS_ADDRESS
+fi
+
+if [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+  # tell dbus-daemon --session (and systemd --user, if running)
+  # to put a minimal subset of the Xsession's environment in activated
+  # services' environments
+  dbus-update-activation-environment --verbose --systemd \
+    DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
+fi
@@ -0,0 +1,6 @@
+# To enable the use of libvdpau-va-gl as the default VDPAU driver,
+# uncommont the following lines. See
+# `/usr/share/doc/libvdpau-va-gl1/README.Debian` for more details.
+
+# [ ! -f /usr/lib/$(arch)-$(uname -s | tr '[A-Z]' '[a-z]')-gnu/vdpau/libvdpau_va_gl.so.1 ] || \
+#   export VDPAU_DRIVER=va_gl
@@ -2,18 +2,6 @@

 # This file is sourced by Xsession(5), not executed.

-# read OPTIONFILE
-OPTIONS=$(cat "$OPTIONFILE") || true
-
-has_option() {
-  if [ "${OPTIONS#*
-$1}" != "$OPTIONS" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
 # Determine how many arguments were provided.
 case $# in
  0)
@@ -45,7 +33,7 @@ case $# in
        ;;
      *)
        # Specific program was requested.
-        STARTUP_FULL_PATH=$(/usr/bin/which "$1" || true)
+        STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
        if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
          if [ -x "$STARTUP_FULL_PATH" ]; then
            STARTUP="$1"
@@ -0,0 +1,12 @@
+# -*- sh -*-
+# Xsession.d script to set the env variables to enable accessibility for Qt
+#
+# This file is sourced by Xsession(5), not executed.
+
+QT_ACCESSIBILITY=1
+
+export QT_ACCESSIBILITY
+
+if [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+        dbus-update-activation-environment --verbose --systemd QT_ACCESSIBILITY
+fi
@@ -1,14 +0,0 @@
-# Xwrapper.config (Debian X Window System server wrapper configuration file)
-#
-# This file was generated by the post-installation script of the x11-common
-# package using values from the debconf database.
-#
-# See the Xwrapper.config(5) manual page for more information.
-#
-# This file is automatically updated on upgrades of the x11-common package
-# *only* if it has not been modified since the last upgrade of that package.
-#
-# If you have edited this file but would like it to be automatically updated
-# again, run the following command as root:
-#   dpkg-reconfigure x11-common
-allowed_users=console
@@ -1,285 +0,0 @@
-! The App-defaults file for Editres.
-
-Editres.Geometry:			500x568
-
-*ShapeStyle:				Oval
-*Tree*ShapeStyle:			Rectangle
-
-! The rest of this file are either button names, or important for
-! functionality, modifying these values may cause strange program
-! behavior.
-
-*flash.BorderWidth:			0
-
-! Menu Button Names
-
-*Box.commands.Label:			Commands
-*Box.treeCommands.Label:		Tree
-
-*porthole.tree.width:			500
-*porthole.tree.height:			480
-
-! Universal Menu Entry Names
-*xt.sendTree.Label:		Get Tree
-*xt.quit.Label:			Quit
-
-*xt.selectAll.Label:		Select All
-*xt.unselectAll.Label:		Unselect All
-*xt.invertAll.Label:		Invert All
-*xt.selectChildren.Label:		Select Children
-*xt.selectParent.Label:		Select Parent
-*xt.selectDescendants.Label:	Select Descendants
-*xt.selectAncestors.Label:		Select Ancestors
-
-! Xt Menu Entry Names
-
-*xt.refreshTree.Label:		Refresh Current Widget Tree
-*xt.dumpTreeToFile.Label:	Dump Widget Tree to a File
-*xt.getResourceList.Label:	Show Resource Box
-*xt.setValues.Label:		Set Resource
-
-*xt.showClientWidget.Label:	Select Widget in Client
-*xt.showWidgetNames.Label:	Show Widget Names
-*xt.showClassNames.Label:	Show Class Names
-*xt.showWidgetIDs.Label:	Show Widget IDs
-*xt.showWidgetWindows.Label:	Show Widget Windows
-*xt.flashActiveWidgets.Label:	Flash Active Widgets
-
-! InterViews Menu Entry Names
-
-*iv*refreshTree.Label:		Refresh Current Style Tree
-*iv*dumpTreeToFile.Label:	Dump Style Tree to a File
-*iv*getResourceList.Label:	Show Attribute Box
-*iv*setValues.Label:		Set Attribute
-
-*iv*showClientWidget.Label:	Select Style in Client
-*iv*showWidgetNames.Label:	Show Style Names
-*iv*showClassNames.Label:	Show Class Names
-*iv*showWidgetIDs.Label:	Show Style IDs
-*iv*showWidgetWindows.Label:	Show Style Windows
-*iv*flashActiveWidgets.Label:	Flash Active Styles
-
-! Universal Toolkit Messages
-
-*label0: Action `%s' must have the Editres Protocol.
-*label1: Action %s's argument must be either `cancel' or `okay'.
-*label2: Action `%s' must have exactly one argument.
-*label3: Unknown parameter to action `%s' must be one of:\n
-*label4: It appears that this client does not understand\nthe Editres Protocol.
-*label5: Can't grab the mouse.\n
-*label6: Click the mouse pointer on any toolkit client.
-*label8: Message sent to client%s.
-*label9: Incorrectly formatted message from client.
-*label10: Unable to own the Resource Editor Command Selection
-*label11: Unknown Error code %d
-*label13: Welcome to the X Resource Editor version 1.1
-*label15: That window does not appear to be\nin the currently displayed client.
-*label16: Editres Internal Error: Unable to FindNode.\n
-*label18: There are no active nodes.
-*label20: ApplyResource: found no matches.
-*label21: Error: SVActiveEntry Action must have exactly one argument.
-*label22: Error: SVActiveEntry Action's first Argument must be either 'Resource' or 'Value'.
-*label24: Unable to open the file `%s' for writing.
-*label25: Error while trying to save Context\nAborting file dialog popup.
-*label26: Error while trying to find Context\nAborting...
-*label28: Loop in tree: node %s's parent (%s) has not been created yet\n
-*label30: There are no active nodes.
-*label31: Internal Error: Unknown select type.
-*label32: Internal Error: Unknown label type.
-*label33: Internal Error: Unknown activate type.
-*label34: Only one Resource Box can be active at a time.
-*label35: Unable to unpack protocol request.
-*label36: This version of editres uses protocol version %s,\nbut the client speaks version %s.
-
-! Xt Messages
-
-*xt*label7: Unable to own the Resource Selection
-*xt*label12: Widget Tree for client %s(%s).
-*xt*label14: Click on any widget in the client.\nEditres will select that widget in the tree display.
-*xt*label17: No widget Tree is avaliable.
-*xt*label19: This function requires exactly one (1) widget to be selected.
-*xt*label23: There are no currently active widgets.
-*xt*label27: There is no widget tree to display.
-*xt*label29: XSaveContext failed on widget %s.
-
-! InterViews Messages
-
-*iv*label7: Unable to own the Attribute Selection
-*iv*label12: Style Tree for client %s(%s).
-*iv*label14: Click on any style in the client.\nEditres will select that style in the tree display.
-*iv*label17: No style Tree is avaliable.
-*iv*label19: This function requires exactly one (1) style to be selected.
-*iv*label23: There are no currently active styles.
-*iv*label27: There is no style tree to display.
-*iv*label29: XSaveContext failed on style %s.
-
-*MenuButton.leftBitmap:			menu10
-
-! For the Top Area
-
-*hPane.orientation:			horizontal
-*hPane.preferredPaneSize:		100
-*hPane.Panner.width:			100
-*hPane.Panner.height:			100
-*hPane.Panner.preferredPaneSize:	100
-*Paned.Panner.showGrip:			False
-*Paned.box.showGrip:			False
-*Paned.hPane.showGrip:			True
-
-! For the Filename popup dialog.
-
-*fileDialog*value:		
-*fileDialog*allowShellResize:		True
-*fileDialog*Text.baseTranslations:	#override \n\
-	<Key>Return:		PopdownFileDialog(okay)
-
-
-! Universal Resources for the Resource Box.
-
-*mainViewport*resourceLabel.font:		\
-*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*allowShellResize:				True
-*resourceLabel.allowResize:			True
-*List.verticalList:				True
-*namesAndClasses*BorderWidth:		0
-*star.Label:				*
-*dot.Label:					.
-*namesLabel.font:				\
-*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*constraintLabel.font:			\
-*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*valueLabel.BorderWidth:			0
-*valueForm*preferredPaneSize:		40
-*valueForm*min:				28
-*valueText*editType:			edit
-*valueText.Scroll:				WhenNeeded
-*valueText.width:			297
-*setValuesPopup*resourceText.width:	297
-*setFile.Label:				Set Save File
-*save.Label:				Save
-*apply.Label:				Apply
-*saveAndApply.Label:			Save and Apply
-*commandBox.show.Label:		        Show
-*commandBox.min:			28
-
-! InterViews Resources for the Resource Box.
-
-*iv*single.Label:				Any Style
-*iv*any.Label:					Any Style Chain
-*iv*namesLabel.Label:				Normal Attributes: mb2 gets a value
-*iv*constraintLabel.Label:			Constraint Attributes
-*iv*valueLabel.Label:				Enter Attribute Value:
-*iv*commandBox.cancel.Label:			Popdown Attribute Box
-
-! Xt Resources for the Resource Box.
-
-*xt*single.Label:                              ?
-*xt*any.Label:                                 *
-*xt*namesLabel.Label:                          Normal Resources: mb2 gets a value
-*xt*constraintLabel.Label:                     Constraint Resources
-*xt*valueLabel.Label:                          Enter Resource Value:
-*xt*commandBox.cancel.Label:                   Popdown Resource Box
-
-! This gives us an exactly one of many toggle, if toggle is
-! not set in each group the application will probabally core dump.
-
-*namesAndClasses*Toggle.baseTranslations: #override \n\
-	<Btn1Down>,<Btn1Up>:   set() notify()
-    
-
-*commandBox.skipAdjust:				True
-
-! Get resource values action binding.
-
-*List.baseTranslations: #override \n\
-	<Btn2Down>,<Btn2Up>:		Set() EnableGetVal() Notify()
-
-! Keyboard Actions for Tree and children of the Tree.
-
-*Tree.baseTranslations:	#override \n\
-	:<Key>space:		Select(nothing) \n\
-	:<Key>w:		Select(widget) \n\
-	:<Key>s:		Select(all) \n\
-	:<Key>i:		Select(invert) \n\
-	:<Key>c:		Select(children) \n\
-	:<Key>d:		Select(descendants) \n\
-	:<Key>p:		Select(parent) \n\
-	:<Key>a:		Select(ancestors) \n\
-	:<Key>N:		Relabel(name) \n\
-	:<Key>C:		Relabel(class) \n\
-	:<Key>I:		Relabel(id) \n\
-	:<Key>W:		Relabel(window) 
-
-*Tree.Toggle.baseTranslations:	#override \n\
-	:<Key>space:		Select(nothing) \n\
-	:<Key>w:		Select(widget) \n\
-	:<Key>s:		Select(all) \n\
-	:<Key>i:		Select(invert) \n\
-	:<Key>c:		Select(children) \n\
-	:<Key>d:		Select(descendants) \n\
-	:<Key>p:		Select(parent) \n\
-	:<Key>a:		Select(ancestors) \n\
-	:<Key>N:		Relabel(name) \n\
-	:<Key>C:		Relabel(class) \n\
-	:<Key>I:		Relabel(id) \n\
-	:<Key>W:		Relabel(window) \n\
-	<Btn2Down>,<Btn2Up>:	Select(nothing) toggle() notify() \n\
-	<Btn3Down>,<Btn3Up>:	Relabel(toggle)
-
-! For the SetValues popup
-
-*setValuesPopup.form.?.resizable:		True
-*setValuesPopup.form.?.left:			ChainLeft
-*setValuesPopup.form.?.right:			ChainLeft
-
-*setValuesPopup.form.label.Label:		Use <Tab> to Change Fields.
-*setValuesPopup.form.Label.BorderWidth:	0
-
-*xt*setValuesPopup.form.resourceLabel.Label:	Resource Name:
-*xt*setValuesPopup.form.resourceLabel.width:	114
-*xt*setValuesPopup.form.resourceLabel.justify:	right
-*xt*setValuesPopup.form.valueLabel.Label:	Resource Value:
-*xt*setValuesPopup.form.valueLabel.width:	114
-*xt*setValuesPopup.form.setValues.Label:	Apply
-*xt*setValuesPopup.form.cancel.Label:		Cancel
-
-*setValuesPopup.form.Text.?.EditType:		Edit
-*setValuesPopup.form.Text.resize:		Width
-
-*setValuesPopup.form.resourceText.baseTranslations: #override \
-  <Key>Return:     	   no-op(RingBell) \n\
-   Ctrl<Key>q,<Key>Tab:    insert-char()    \n\
-   <Btn1Down>:             select-start() SVActiveEntry(Resource) \n\
-   <Key>Tab:               SVActiveEntry(Value)
-
-*setValuesPopup.form.valueText.baseTranslations: #override \
-   <Key>Return:     	   no-op(RingBell) \n\
-   Ctrl<Key>q,<Key>Tab:    insert-char()     \n\
-   <Btn1Down>:             select-start() SVActiveEntry(Value)\n\
-   <Key>Tab:               SVActiveEntry(Resource)
-
-*Text.translations: #override \
-   m<Key>I:		no-op(r)\n\
-   c<Key>S:		no-op(r)\n\
-   c<Key>R:		no-op(r)\n\
-   <Key>Escape:		no-op()
-
-*fileDialog.?.Text.width:	280
-
-! New resource settings
-*normalViewport.min:					19
-*normalViewport.allowVert:				True
-*constraintViewport.min:				19
-*constraintViewport.allowVert:				True
-*mainViewport.allowHoriz:				True
-*mainViewport.pane.namesAndClasses.defaultDistance:	0
-*mainViewport.useBottom:				True
-*mainViewport.pane.Label.min:				22
-*mainViewport.pane.Label.max:				22
-*mainViewport.pane.Form.showGrip:			False
-*mainViewport.pane.Label.showGrip:			False
-*mainViewport.pane.Form.min:				66
-*mainViewport.pane.Form.max:				66
-*tree*TransientShell.translations: #override \
-<Map>:	get-values(1, $w, width) \
-	set-values(1, maxWidth, $w)
@@ -1,89 +0,0 @@
-! Here are some suggested resources if you are using a color workstation.
-! They look pretty good on my display, your mileage may vary.
-
-#include "Editres"
-
-*flashColor:			Yellow
-
-*Background:			RoyalBlue4
-!*Foreground:			Azure
-!*BorderColor:			LightCyan1
-*cursorColor:			Azure
-
-*Tree.Background: 		Grey
-*Tree.Foreground: 		White
-
-*Tree.Toggle.Foreground: 	Gold
-*Tree.Toggle.BorderWidth: 	0
-
-*MenuButton.Foreground:		Gold
-*MenuButton.BorderWidth: 	0
-
-*SmeBSB.Foreground: 		Gold
-
-*Porthole.Background:			Grey
-*porthole.panner*Foreground:		red
-*porthole.panner*Background:		Grey
-*porthole.panner*BorderColor:		Grey
-*porthole.panner*ShadowColor:		Black
-*porthole.panner*BackgroundStipple:	None
-
-*resourceBox*namesAndClasses.Background: Grey
-*resourceBox*namesAndClasses*Toggle.Background: RoyalBlue4
-*resourceBox*namesAndClasses*Toggle.Foreground: White
-*resourceBox*valueForm.Background: Grey
-*resourceBox*valueLabel.Background: Grey
-*resourceBox*valueLabel.Foreground: White
-*resourceBox*Command.Foreground: Gold
-
-
-
-*displayList:			foreground rgb:20/35/73;lines 1,-1,-1,-1,-1,1;foreground rgb:30/4e/ab;lines -1,0,0,0,0,-1
-*Foreground:			Azure3
-*borderColor:			rgb:1d/30/69
-*internalBorderColor:		rgb:1d/30/69
-
-*SmeLine.lineWidth:		1
-*SmeLine.foreground:		rgb:1d/30/69
-*SimpleMenu.VerticalMargins:	2
-*SimpleMenu.HorizontalMargins:	2
-*SimpleMenu.?.HorizontalMargins:8
-
-*MenuButton.displayList:
-*MenuButton.borderWidth:	1
-*MenuButton.borderColor:	RoyalBlue4
-*MenuButton.shapeStyle:		rectangle
-*MenuButton.leftBitmap:		None
-*MenuButton.translations:	\
-<Enter>:	set-values(1, background, "rgb:29/44/94", borderColor, "rgb:1d/30/69", displayList, "foreground rgb:20/35/73;lines 1,-1,-1,-1,-1,1;foreground rgb:30/4e/ab;lines -1,0,0,0,0,-1")\n\
-<Leave>:	set-values(1, background, RoyalBlue4, borderColor, RoyalBlue4, displayList, "")\n\
-Any<BtnDown>:	set-values(1, background, "rgb:23/3a/7d", displayList, "foreground rgb:30/4e/ab;lines 1,-1,-1,-1,-1,1;foreground rgb:20/35/73;lines -1,0,0,0,0,-1") PopupMenu()
-
-*List.displayList:
-*List.background:		rgb:23/3a/7d
-
-*Tree.displayList:
-
-*Label.displayList:
-*Paned.?.displayList:		foreground rgb:20/35/73;lines 1,-1,-1,-1,-1,1;foreground rgb:30/4e/ab;lines -1,0,0,0,0,-1
-
-*Grip.foreground:		rgb:30/4e/ab
-
-*Toggle.displayList:\
-foreground rgb:30/4e/ab;\
-lines 1,-1,-1,-1,-1,1;\
-lines -2,1,1,1,1,-2;\
-foreground rgb:20/35/73;\
-lines -1,0,0,0,0,-1;\
-lines 2,-2,-2,-2,-2,2
-
-*Text.background:		rgb:29/44/94
-*Text.?.background:		rgb:29/44/94
-*Text.displayList:		foreground rgb:30/4e/ab;lines 1,-1,-1,-1,-1,1;foreground rgb:20/35/73;lines -1,0,0,0,0,-1
-
-*Scrollbar.foreground:		rgb:2e/4c/a5
-*Scrollbar.background:		rgb:23/3a/7d
-*Scrollbar.thumb:		black
-
-*Command.shapeStyle:		rectangle
-*Command.background:		rgb:29/44/94
@@ -1,50 +0,0 @@
-! $XTermId: KOI8RXTerm.ad,v 1.4 2010/03/04 01:17:49 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 2007,2010 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-! This is based on the UXTerm app-defaults file.
-! -----------------------------------------------------------------------------
-! Use
-!	xterm -class KOI8RXTerm
-! to set resources for KOI8-R mode with corresponding fonts.
-
-#include "XTerm"
-
-*fontMenu.Label:  KOI8-R Fonts
-*VT100*allowC1Printable:	true
-
-! Use Cyrillic instead of Latin fonts.
-*VT100.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
-*VT100.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
-*VT100.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
-*VT100.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
-*VT100.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
-*VT100.font6:	-misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
@@ -1,175 +0,0 @@
-! $KOI8RXTermId: XTerm-col.ad,v 1.22 2009/08/15 15:56:29 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 2002-2006,2009 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-
-#include "KOI8RXTerm"
-
-*VT100*colorMode: on
-*VT100*boldColors: on
-*VT100*dynamicColors: on
-
-! Set the default text foreground and background colors.
-*VT100*foreground: gray90
-*VT100*background: black
-
-! - OR -
-! Uncomment this for black text on a "white" background.
-!*VT100*foreground: black
-!*VT100*background: gray90
-
-! - OR -
-! leave the foreground/background colors alone (at the mercy of your desktop
-! designer).
-
-! Color the popup/pulldown menu border to match the text widget foreground.
-!*SimpleMenu*borderColor: gray15
-
-! Uncomment this to use color for underline attribute
-!*VT100*colorULMode: on
-*VT100*colorUL: yellow
-
-!*VT100*italicULMode: on
-
-! Uncomment this to disable underlining, e.g., if colorULMode is set.
-!*VT100*underLine: off
-
-! Uncomment this to use color for the bold attribute
-!*VT100*colorBDMode: on
-*VT100*colorBD: white
-
-! Uncomment this to use the bold/underline colors in preference to other colors
-!*VT100*colorAttrMode: on
-
-! These are the 8 ANSI colors and their bright equivalents.  Depending on
-! other resource settings, xterm may use the bright colors when displaying
-! bold text (see the boldColors resource).
-*VT100*color0: black
-*VT100*color1: red3
-*VT100*color2: green3
-*VT100*color3: yellow3
-*VT100*color4: blue2
-*VT100*color5: magenta3
-*VT100*color6: cyan3
-*VT100*color7: gray90
-*VT100*color8: gray50
-*VT100*color9: red
-*VT100*color10: green
-*VT100*color11: yellow
-*VT100*color12: rgb:5c/5c/ff
-*VT100*color13: magenta
-*VT100*color14: cyan
-*VT100*color15: white
-
-! Disclaimer: there are no standard colors used in terminal emulation.
-!
-! The choice for color4 and color12 is a tradeoff between contrast, depending
-! on whether they are used for text or backgrounds.  Note that either color4 or
-! color12 would be used for text, while only color4 would be used for a
-! background.  These are treated specially, since the luminosity of blue is
-! only about half that of red/green, and is typically not accounted for in the
-! RGB scheme.
-!
-! Blue text on a black background should be readable.
-! Blue backgrounds should not be "too" bright.
-!
-! Originally color4/color12 were set to the names blue3/blue
-!*VT100*color4: blue3
-!*VT100*color12: blue
-!
-! They are from rgb.txt respectively:
-!  0   0 205		blue3
-!  0   0 255		blue
-! However, blue3 is not readable on a black background.
-!
-! Another choice was from the Debian settings:
-!*VT100*color4: DodgerBlue1
-!*VT100*color12: SteelBlue1
-!
-! From rgb.txt:
-! 30 144 255		DodgerBlue1
-! 99 184 255		SteelBlue1
-!
-! Some users object to this choice because the background (color4) is brighter
-! than they are accustomed.  Others point out that the different weights for
-! the red/green components make it appear to be not really blue.  Finally, it
-! provides poor contrast against color13 and color14.
-!
-! The current choice uses equal weights for red/green (effectively adding a
-! gray to the result).  It is brighter than the original choice, and provides
-! more contrast between color12 and color13, color14 than SteelBlue1 did.
-! Contrast of color4 against black is slightly improved over the original.
-!
-! Some refinement is certainly possible (you are welcome to try) -TD
-
-
-#if PLANES > 8
-! Color the popup menus and the menubar to match:
-*SimpleMenu*background: AntiqueWhite
-*SimpleMenu*foreground: gray15
-
-! Color the menubar to match:
-*Form.menubar.background: AntiqueWhite
-*Form.menubar*background: AntiqueWhite
-*Form.menubar.foreground: gray15
-*Form.menubar*foreground: gray15
-*Form.background: AntiqueWhite
-*form.background: AntiqueWhite
-
-*mainMenu*background: AntiqueWhite
-*mainMenu*foreground: gray15
-*vtMenu*background: AntiqueWhite
-*vtMenu*foreground: gray15
-*fontMenu*background: AntiqueWhite
-*fontMenu*foreground: gray15
-*tekMenu*background: AntiqueWhite
-*tekMenu*foreground: gray15
-
-! The following two sections take advantage of new features in version 7
-! of the Athena widget library; see Xaw(7x).
-
-! This section is commented out because Xaw has no way to dynamically size
-! the gradient.  The dimension parameter may need to be adjusted depending
-! on the font used in the menu.
-!*SimpleMenu*backgroundPixmap:   gradient:vertical?dimension=350&start=gray90&end=gray60
-!*SimpleMenu*foreground:         gray15
-
-*VT100.scrollbar.thumb:         vlines2
-*VT100.scrollbar.width:         14
-*VT100.scrollbar.background:    gray60
-*VT100.scrollbar.foreground:    rgb:a/5/5
-*VT100.scrollbar.borderWidth:   0
-*VT100.scrollbar.displayList:\
-foreground      gray90;\
-lines           1,-1,-1,-1,-1,1;\
-foreground      gray60;\
-lines           -1,0,0,0,0,-1
-#endif
@@ -1,76 +0,0 @@
-! $XTermId: UXTerm.ad,v 1.13 2010/03/04 01:17:07 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 2000-2006,2010 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-! Use
-!	xterm -class UXTerm
-! to set resources for UTF-8 mode with corresponding fonts.
-! See the uxterm script for an example.
-
-#include "XTerm"
-
-*fontMenu.Label:  Unicode Fonts
-*VT100.utf8:	1
-
-! This includes "XTerm-color" which includes "XTerm", which defines fonts.
-! Why set them here?
-!
-! Here is a simple description.  A technically precise one would be very long.
-! When xterm starts up, it uses the
-!
-!	*VT100.font
-!
-! resource, and if it is told to switch to wide-character (UTF-8) mode, it
-! checks if the given font is "wide", and if not looks for the
-!
-!	*VT100.utf8Fonts.font
-!
-! to obtain a wide font.  A "wide" font has more than 256 glyphs.  Typical
-! wide fonts have 10,000 glyphs.  If the original "*VT100.font" is not wide,
-! and xterm can load the *VT100.utf8Fonts.font, it will use that.
-!
-! Making the wide fonts associated with *VT100.font in this file allows uxterm
-! to skip that step.  It will use the fonts that the XTerm file gives for the
-! *VT100.uft8Fonts.font pattern.
-*VT100.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-*VT100.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-*VT100.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.font6:	-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
-
-! Here is an alternate set of fonts with better support for bold:
-!*VT100.font2:	-efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
-!*VT100.font:	-efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
-!*VT100.font3:	-efont-biwidth-medium-r-normal--12-120-75-75-p-60-iso10646-1
-!*VT100.font4:	-efont-biwidth-medium-r-normal--14-140-75-75-p-70-iso10646-1
-!*VT100.font5:	-efont-biwidth-medium-r-normal--16-160-75-75-p-80-iso10646-1
-!*VT100.font6:	-efont-biwidth-medium-r-normal--24-240-75-75-p-120-iso10646-1
@@ -1,175 +0,0 @@
-! $UXTermId: XTerm-col.ad,v 1.22 2009/08/15 15:56:29 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 2002-2006,2009 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-
-#include "UXTerm"
-
-*VT100*colorMode: on
-*VT100*boldColors: on
-*VT100*dynamicColors: on
-
-! Set the default text foreground and background colors.
-*VT100*foreground: gray90
-*VT100*background: black
-
-! - OR -
-! Uncomment this for black text on a "white" background.
-!*VT100*foreground: black
-!*VT100*background: gray90
-
-! - OR -
-! leave the foreground/background colors alone (at the mercy of your desktop
-! designer).
-
-! Color the popup/pulldown menu border to match the text widget foreground.
-!*SimpleMenu*borderColor: gray15
-
-! Uncomment this to use color for underline attribute
-!*VT100*colorULMode: on
-*VT100*colorUL: yellow
-
-!*VT100*italicULMode: on
-
-! Uncomment this to disable underlining, e.g., if colorULMode is set.
-!*VT100*underLine: off
-
-! Uncomment this to use color for the bold attribute
-!*VT100*colorBDMode: on
-*VT100*colorBD: white
-
-! Uncomment this to use the bold/underline colors in preference to other colors
-!*VT100*colorAttrMode: on
-
-! These are the 8 ANSI colors and their bright equivalents.  Depending on
-! other resource settings, xterm may use the bright colors when displaying
-! bold text (see the boldColors resource).
-*VT100*color0: black
-*VT100*color1: red3
-*VT100*color2: green3
-*VT100*color3: yellow3
-*VT100*color4: blue2
-*VT100*color5: magenta3
-*VT100*color6: cyan3
-*VT100*color7: gray90
-*VT100*color8: gray50
-*VT100*color9: red
-*VT100*color10: green
-*VT100*color11: yellow
-*VT100*color12: rgb:5c/5c/ff
-*VT100*color13: magenta
-*VT100*color14: cyan
-*VT100*color15: white
-
-! Disclaimer: there are no standard colors used in terminal emulation.
-!
-! The choice for color4 and color12 is a tradeoff between contrast, depending
-! on whether they are used for text or backgrounds.  Note that either color4 or
-! color12 would be used for text, while only color4 would be used for a
-! background.  These are treated specially, since the luminosity of blue is
-! only about half that of red/green, and is typically not accounted for in the
-! RGB scheme.
-!
-! Blue text on a black background should be readable.
-! Blue backgrounds should not be "too" bright.
-!
-! Originally color4/color12 were set to the names blue3/blue
-!*VT100*color4: blue3
-!*VT100*color12: blue
-!
-! They are from rgb.txt respectively:
-!  0   0 205		blue3
-!  0   0 255		blue
-! However, blue3 is not readable on a black background.
-!
-! Another choice was from the Debian settings:
-!*VT100*color4: DodgerBlue1
-!*VT100*color12: SteelBlue1
-!
-! From rgb.txt:
-! 30 144 255		DodgerBlue1
-! 99 184 255		SteelBlue1
-!
-! Some users object to this choice because the background (color4) is brighter
-! than they are accustomed.  Others point out that the different weights for
-! the red/green components make it appear to be not really blue.  Finally, it
-! provides poor contrast against color13 and color14.
-!
-! The current choice uses equal weights for red/green (effectively adding a
-! gray to the result).  It is brighter than the original choice, and provides
-! more contrast between color12 and color13, color14 than SteelBlue1 did.
-! Contrast of color4 against black is slightly improved over the original.
-!
-! Some refinement is certainly possible (you are welcome to try) -TD
-
-
-#if PLANES > 8
-! Color the popup menus and the menubar to match:
-*SimpleMenu*background: AntiqueWhite
-*SimpleMenu*foreground: gray15
-
-! Color the menubar to match:
-*Form.menubar.background: AntiqueWhite
-*Form.menubar*background: AntiqueWhite
-*Form.menubar.foreground: gray15
-*Form.menubar*foreground: gray15
-*Form.background: AntiqueWhite
-*form.background: AntiqueWhite
-
-*mainMenu*background: AntiqueWhite
-*mainMenu*foreground: gray15
-*vtMenu*background: AntiqueWhite
-*vtMenu*foreground: gray15
-*fontMenu*background: AntiqueWhite
-*fontMenu*foreground: gray15
-*tekMenu*background: AntiqueWhite
-*tekMenu*foreground: gray15
-
-! The following two sections take advantage of new features in version 7
-! of the Athena widget library; see Xaw(7x).
-
-! This section is commented out because Xaw has no way to dynamically size
-! the gradient.  The dimension parameter may need to be adjusted depending
-! on the font used in the menu.
-!*SimpleMenu*backgroundPixmap:   gradient:vertical?dimension=350&start=gray90&end=gray60
-!*SimpleMenu*foreground:         gray15
-
-*VT100.scrollbar.thumb:         vlines2
-*VT100.scrollbar.width:         14
-*VT100.scrollbar.background:    gray60
-*VT100.scrollbar.foreground:    rgb:a/5/5
-*VT100.scrollbar.borderWidth:   0
-*VT100.scrollbar.displayList:\
-foreground      gray90;\
-lines           1,-1,-1,-1,-1,1;\
-foreground      gray60;\
-lines           -1,0,0,0,0,-1
-#endif
@@ -1,95 +0,0 @@
-*Panner*backgroundStipple: grid2
-
-*allowShellResize: true
-*buttonbox*ShapeStyle: oval
-*Form*Panner.Thickness: -1
-*Form.defaultDistance: 0
-*Form.BorderWidth: 0
-*Porthole.BorderWidth: 0
-*Porthole.top: ChainTop
-*Porthole.left: ChainLeft
-*Porthole.bottom: ChainBottom
-*Porthole.right:  ChainRight
-*Porthole.resizable: on
-*Panner.top: ChainTop
-*Panner.left: ChainLeft
-*Panner.bottom: ChainTop
-*Panner.right:  ChainLeft
-*Panner.resizable: on
-*Tree*ShapeStyle: rectangle
-*Tree*Toggle*BorderWidth: 0
-*Porthole*Box.BorderWidth: 0
-*Porthole*Box.HSpace: 0
-*Porthole*Box.VSpace: 0
-*Paned*allowResize: true
-
-*Tree*List*Font: -adobe-helvetica-medium-r-normal--*-80-*-*-*-*-iso*-*
-
-*SimpleMenu*BackingStore: NotUseful
-*Font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
-*buttonbox.MenuButton.leftBitmap: menu12
-*SimpleMenu*menuLabel.vertSpace:   100
-*SimpleMenu*SmeLine*Height: 12
-
-*quit.Label: Quit
-
-*buttonbox.quit.baseTranslations:  #override \
-		<Btn1Down>,<Btn1Up>: Quit() unset()
-
-*Toggle.baseTranslations: #augment \n\
-<Btn2Down>,<Btn2Up>: set() notify() Resources(toggle) \n\
-<Key>q: Quit() \n\
-<Key>space: Select(nothing) \n\
-<Key>p: Select(parent) \n\
-<Key>a: Select(ancestors) \n\
-<Key>c: Select(children) \n\
-<Key>d: Select(descendants) \n\
-Ctrl<Key>r: Resources(on) \n\
-Ctrl<Key>n: Resources(off) \n\
-
-*List.baseTranslations: #augment \n\
-<Key>q: Quit() \n\
-<Key>space: Select(nothing) \n\
-<Key>p: Select(parent) \n\
-<Key>a: Select(ancestors) \n\
-<Key>c: Select(children) \n\
-<Key>d: Select(descendants) \n\
-Ctrl<Key>r: Resources(on) \n\
-Ctrl<Key>n: Resources(off) \n\
-
-*Porthole.baseTranslations: #override \n\
-<Btn1Down>,<Btn1Up>:	Select(nothing) \n\
-<Key>q: Quit() \n\
-Ctrl<Key>h: SetOrientation(west) \n\
-Ctrl<Key>v: SetOrientation(north) \n\
-Ctrl<Key>r: Resources(on) \n\
-Ctrl<Key>n: Resources(off) \n\
-Shift<Key>c: SetLabelType(class) \n\
-Shift<Key>v: SetLabelType(variable) \n\
-<Key>space: Select(nothing) \n\
-<Key>i: Select(invert) \n\
-<Key>p: Select(parent) \n\
-<Key>a: Select(ancestors) \n\
-<Key>c: Select(children) \n\
-<Key>d: Select(descendants) \n\
-<Key>r: Select(resources) \n\
-<Key>s: Select(shown) \n\
-
-*buttonbox.view.Label: View
-*buttonbox.view.viewMenu.layoutHorizontal.Label: Layout Horizontal
-*buttonbox.view.viewMenu.layoutVertical.Label: Layout Vertical
-*buttonbox.view.viewMenu.namesVariable.Label: Show Variable Names
-*buttonbox.view.viewMenu.namesClass.Label: Show Class Names
-*buttonbox.view.viewMenu.viewResources.Label: Show Resource Boxes
-*buttonbox.view.viewMenu.viewNoResources.Label: Hide Resource Boxes
-
-*buttonbox.select.Label: Select
-*buttonbox.select.selectMenu.unselect.Label: Unselect All
-*buttonbox.select.selectMenu.selectAll.Label: Select All
-*buttonbox.select.selectMenu.selectInvert.Label: Invert All
-*buttonbox.select.selectMenu.selectParent.Label: Select Parent
-*buttonbox.select.selectMenu.selectAncestors.Label: Select Ancestors
-*buttonbox.select.selectMenu.selectChildren.Label: Select Children
-*buttonbox.select.selectMenu.selectDescendants.Label: Select Descendants
-*buttonbox.select.selectMenu.selectHasResources.Label: Select Has Resources
-*buttonbox.select.selectMenu.selectShownResources.Label: Select Shown Resource Boxes
@@ -1,24 +0,0 @@
-#include "Viewres"
-
-*background:				gray95
-*foreground:				gray30
-*borderColor:				gray80
-*showGrip:				False
-*Font:					XtDefaultFont
-*buttonbox*ShapeStyle:			rectangle
-*internalBorderWidth:			0
-*buttonbox.backgroundPixmap:		gradient:vertical?dimension=4&start=gray95&end=gray90
-*buttonbox.displayList:			foreground gray70;line 0,-1,-1,-1;foreground gray95;line 0,0,-1,0
-*treeform.porthole.tree.backgroundPixmap:gradient:vertical?dimension=4&start=gray85&end=gray90
-*Tree*List.BorderWidth: 		0
-*Tree.foreground:			gray75
-*Tree.lineWidth:			7
-*List.backgroundPixmap:			gradient:vertical?dimension=4&start=gray95&end=gray90
-*List.displayList:			foreground gray50;line 0,-1,-1,-1;foreground white;line 0,0,-1,0
-*Porthole*Box.BorderWidth:		1
-*Panner.BorderWidth:			1
-*Panner.background:			gray70
-*Panner.foreground:			gray80
-*Panner.shadowColor:			gray50
-*Panner*backgroundStipple:		hlines2
-*SimpleMenu.backgroundPixmap:		gradient:vertical?dimension=4&start=gray92&end=gray98
@@ -1,148 +0,0 @@
-! $XConsortium: XFontSel.ad,v 1.12 94/04/17 20:43:40 gildea Exp $
-!
-! app-defaults for XFontSel
-!
-! Copyright (c) 1985, 1986, 1987, 1988, 1989  X Consortium
-!
-! Permission is hereby granted, free of charge, to any person obtaining
-! a copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-!
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-!
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-! OTHER DEALINGS IN THE SOFTWARE.
-!
-! Except as contained in this notice, the name of the X Consortium shall
-! not be used in advertising or otherwise to promote the sale, use or
-! other dealings in this Software without prior written authorization
-! from the X Consortium.
-!
-! Author:
-!	Ralph R. Swick, Digital Equipment Corporation/M.I.T. Project Athena
-!	one weekend in November, 1989
-!
-! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.1 2000/02/13 03:26:24 dawes Exp $
-
-*appDefaultsVersion:	1
-
-*pixelSizeList: 7, 30, 40, 50, 60
-*pointSizeList: 250, 300, 350, 400
-
-XFontSel.cursor:	left_ptr
-*allowShellResize:	true
-
-*commandBox.ShowGrip:	false
-*commandBox*top:	chainTop
-*commandBox*bottom:	chainTop
-
-*quitButton.Label:	quit
-*quitButton.left:	chainLeft
-*quitButton.right:	chainLeft
-
-*ownButton.Label:	select
-*ownButton.fromHoriz:	quitButton
-*ownButton.left:	chainLeft
-*ownButton.right:	chainLeft
-
-*countLabel.BorderWidth: 0
-*countLabel.Justify:	right
-*countLabel.Label:	999999 fonts match
-*countLabel.left:	chainRight
-*countLabel.right:	chainRight
-
-*fieldBox.Orientation:	horizontal
-*fieldBox.HSpace:	0
-*fieldBox.HSpace:	0
-
-*dash.label:		-
-*dash.borderWidth:	0
-*dash.internalHeight:	0
-*dash.internalWidth:	0
-
-*fieldBox*MenuButton.BorderWidth:	0
-*fieldBox*MenuButton.internalHeight:	0
-*fieldBox*MenuButton.internalWidth:	0
-*fieldBox*MenuButton.shapeStyle:	rectangle
-
-#ifdef LONG_NAMES
-*fieldBox*field0.Label:	foundry
-*fieldBox*field1.Label: family
-*fieldBox*field2.Label: weight
-*fieldBox*field3.Label: slant
-*fieldBox*field4.Label: set width
-*fieldBox*field5.Label: add style
-*fieldBox*field6.Label: pixel size
-*fieldBox*field7.Label: point size
-*fieldBox*field8.Label: resolutionX
-*fieldBox*field9.Label: resolutionY
-*fieldBox*field10.Label: spacing
-*fieldBox*field11.Label: avg width
-*fieldBox*field12.Label: registry
-*fieldBox*field13.Label: encoding
-#else
-*fieldBox*field0.Label:	fndry
-*fieldBox*field1.Label: fmly
-*fieldBox*field2.Label: wght
-*fieldBox*field3.Label: slant
-*fieldBox*field4.Label: sWdth
-*fieldBox*field5.Label: adstyl
-*fieldBox*field6.Label: pxlsz
-*fieldBox*field7.Label: ptSz
-*fieldBox*field8.Label: resx
-*fieldBox*field9.Label: resy
-*fieldBox*field10.Label: spc
-*fieldBox*field11.Label: avgWdth
-*fieldBox*field12.Label: rgstry
-*fieldBox*field13.Label: encdng
-#endif
-
-!*fieldBox*field11.Sensitive: False
-*fieldBox*field11.menu.Options.ShowUnselectable: False
-
-
-!*field1*menu*courier.Font:
-
-*fontName*skipAdjust:	true
-
-*sampleText*international: false
-
-*sampleText*Label: \
-Processing fonts...
-
-*sampleText: \
-ABCDEFGHIJKLMNOPQRSTUVWXYZ\n\
-abcdefghijklmnopqrstuvwxyz\n\
-0123456789\n\
-\340\346\347\353\356\360\361\363\371\375\
-\300\306\307\313\316\320\321\323\331\335
-
-
-*sampleText16: \
-\044\042\044\044\044\046\044\050\044\052\044\053\044\055\044\057\
-\044\061\044\063\044\065\044\067\044\071\044\073\044\075\044\077\n\
-\044\101\044\104\044\106\044\110\044\112\044\113\044\114\044\115\
-\044\116\044\117\044\122\044\125\044\130\044\133\044\136\044\137\n\
-\061\042\061\044\061\046\061\050\061\052\061\053\061\055\061\057\
-\061\061\061\063\061\065\061\067\061\071\061\073\061\075\061\077\n\
-\061\101\061\104\061\106\061\110\061\112\061\113\061\114\061\115\
-\061\116\061\117\061\122\061\125\061\130\061\133\061\136\061\137\n\
-
-*sampleTextUCS: \
-ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789\n\
-abcdefghijklmnopqrstuvwxyz £©µÀÆÖÞßéöÿ\n\
-–—‘“”„†•…‰™œŠŸž€ ΑΒΓΔΩαβγδω АБВГДабвгд\n\
-∀∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ ﬁ�⑀₂ἠḂӥẄɐː⍎אԱა
-
-*sampleText*allowResize: true
-*sampleText*Height:	 50
@@ -1,263 +0,0 @@
-! $XTermId: XTerm.ad,v 1.101 2016/01/28 02:15:29 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 1996-2011,2016 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-
-*saveLines: 1024
-
-*SimpleMenu*BackingStore: NotUseful
-*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
-*SimpleMenu*menuLabel.vertSpace: 	100
-*SimpleMenu*HorizontalMargins: 16
-*SimpleMenu*Sme.height:	16
-
-*SimpleMenu*Cursor: left_ptr
-
-*mainMenu.Label:  Main Options
-*mainMenu*toolbar*Label:  Toolbar
-*mainMenu*fullscreen*Label: Full Screen
-*mainMenu*securekbd*Label:  Secure Keyboard
-*mainMenu*allowsends*Label:  Allow SendEvents
-*mainMenu*redraw*Label:  Redraw Window
-*mainMenu*logging*Label:  Log to File
-*mainMenu*print-immediate*Label:  Print-All Immediately
-*mainMenu*print-on-error*Label:  Print-All on Error
-*mainMenu*print*Label:  Print Window
-*mainMenu*print-redir*Label:  Redirect to Printer
-*mainMenu*dump-html*Label:  XHTML Screen Dump
-*mainMenu*dump-svg*Label:  SVG Screen Dump
-*mainMenu*8-bit control*Label: 8-Bit Controls
-*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
-*mainMenu*num-lock*Label: Alt/NumLock Modifiers
-*mainMenu*alt-esc*Label: Alt Sends Escape
-*mainMenu*meta-esc*Label: Meta Sends Escape
-*mainMenu*delete-is-del*Label: Delete is DEL
-*mainMenu*oldFunctionKeys*Label: Old Function-Keys
-*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
-*mainMenu*sunKeyboard*Label: VT220 Keyboard
-*mainMenu*hpFunctionKeys*Label: HP Function-Keys
-*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
-*mainMenu*tcapFunctionKeys*Label: Termcap Function-Keys
-*mainMenu*suspend*Label:  Send STOP Signal
-*mainMenu*continue*Label:  Send CONT Signal
-*mainMenu*interrupt*Label:  Send INT Signal
-*mainMenu*hangup*Label:  Send HUP Signal
-*mainMenu*terminate*Label:  Send TERM Signal
-*mainMenu*kill*Label:  Send KILL Signal
-*mainMenu*quit*Label:  Quit
-
-*vtMenu.Label:  VT Options
-*vtMenu*scrollbar*Label:  Enable Scrollbar
-*vtMenu*jumpscroll*Label:  Enable Jump Scroll
-*vtMenu*reversevideo*Label:  Enable Reverse Video
-*vtMenu*autowrap*Label:  Enable Auto Wraparound
-*vtMenu*reversewrap*Label:  Enable Reverse Wraparound
-*vtMenu*autolinefeed*Label:  Enable Auto Linefeed
-*vtMenu*appcursor*Label:  Enable Application Cursor Keys
-*vtMenu*appkeypad*Label:  Enable Application Keypad
-*vtMenu*scrollkey*Label:  Scroll to Bottom on Key Press
-*vtMenu*scrollttyoutput*Label:  Scroll to Bottom on Tty Output
-*vtMenu*allow132*Label: Allow 80/132 Column Switching
-*vtMenu*keepSelection*Label: Keep Selection
-*vtMenu*selectToClipboard*Label: Select to Clipboard
-*vtMenu*cursesemul*Label:  Enable Curses Emulation
-*vtMenu*visualbell*Label:  Enable Visual Bell
-*vtMenu*bellIsUrgent*Label:  Enable Bell Urgency
-*vtMenu*poponbell*Label:  Enable Pop on Bell
-*vtMenu*cursorblink*Label: Enable Blinking Cursor
-*vtMenu*titeInhibit*Label:  Enable Alternate Screen Switching
-*vtMenu*activeicon*Label: Enable Active Icon
-*vtMenu*softreset*Label:  Do Soft Reset
-*vtMenu*hardreset*Label:  Do Full Reset
-*vtMenu*clearsavedlines*Label:  Reset and Clear Saved Lines
-*vtMenu*tekshow*Label:  Show Tek Window
-*vtMenu*tekmode*Label:  Switch to Tek Mode
-*vtMenu*vthide*Label:  Hide VT Window
-*vtMenu*altscreen*Label:  Show Alternate Screen
-*vtMenu*sixelScrolling*Label:  Sixel Scrolling
-*vtMenu*privateColorRegisters*Label:  Private Color Registers
-
-*fontMenu.Label:  VT Fonts
-*fontMenu*fontdefault*Label:	Default
-*fontMenu*font1*Label:	Unreadable
-*VT100.font1:		nil2
-*IconFont:		nil2
-*fontMenu*font2*Label:	Tiny
-*VT100.font2:		5x7
-*fontMenu*font3*Label:	Small
-*VT100.font3:		6x10
-*fontMenu*font4*Label:	Medium
-*VT100.font4:		7x13
-*fontMenu*font5*Label:	Large
-*VT100.font5:		9x15
-*fontMenu*font6*Label:	Huge
-*VT100.font6:		10x20
-*fontMenu*fontescape*Label:	Escape Sequence
-*fontMenu*fontsel*Label:	Selection
-!fontescape and fontsel overridden by application
-*fontMenu*allow-bold-fonts*Label:  Bold Fonts
-*fontMenu*font-linedrawing*Label:  Line-Drawing Characters
-*fontMenu*font-doublesize*Label: Doublesized Characters
-*fontMenu*font-loadable*Label:	VT220 Soft Fonts
-*fontMenu*font-packed*Label:	Packed Font
-*fontMenu*render-font*Label:	TrueType Fonts
-*fontMenu*utf8-mode*Label:	UTF-8 Encoding
-*fontMenu*utf8-fonts*Label:	UTF-8 Fonts
-*fontMenu*utf8-title*Label:	UTF-8 Titles
-
-*fontMenu*allow-color-ops*Label:	Allow Color Ops
-*fontMenu*allow-font-ops*Label:	Allow Font Ops
-*fontMenu*allow-tcap-ops*Label:	Allow Termcap Ops
-*fontMenu*allow-title-ops*Label:	Allow Title Ops
-*fontMenu*allow-window-ops*Label:	Allow Window Ops
-
-*VT100.utf8Fonts.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.utf8Fonts.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-*VT100.utf8Fonts.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-*VT100.utf8Fonts.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.utf8Fonts.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.utf8Fonts.font6:	-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
-
-*tekMenu.Label:  Tek Options
-*tekMenu*tektextlarge*Label:  Large Characters
-*tekMenu*tektext2*Label:  #2 Size Characters
-*tekMenu*tektext3*Label:  #3 Size Characters
-*tekMenu*tektextsmall*Label:  Small Characters
-*tekMenu*tekpage*Label:  PAGE
-*tekMenu*tekreset*Label:  RESET
-*tekMenu*tekcopy*Label:  COPY
-*tekMenu*vtshow*Label:  Show VT Window
-*tekMenu*vtmode*Label:  Switch to VT Mode
-*tekMenu*tekhide*Label:  Hide Tek Window
-
-*tek4014*fontLarge: 9x15
-*tek4014*font2: 8x13
-*tek4014*font3: 6x13
-*tek4014*fontSmall: 6x10
-
-! Debian package customizations follow.
-*ptyInitialErase: true
-
-! If xterm is built with a toolbar, the widget hierarchy looks like this,
-! showing widget name / class names.  The complete menu hierarchy is built
-! at startup because it is needed to make the layout work for the menubar:
-!
-!	xterm/XTerm
-!		form/Form
-!			menubar/Box
-!				mainMenuButton/MenuButton
-!					mainMenu/SimpleMenu
-!						menuLabel/SmeBSB
-!						toolbar/SmeBSB
-!						...
-!					vtMenu/SimpleMenu
-!						menuLabel/SmeBSB
-!						scrollbar/SmeBSB
-!						...
-!					fontMenu/SimpleMenu
-!						menuLabel/SmeBSB
-!						fontdefault/SmeBSB
-!						...
-!					tekMenu/SimpleMenu
-!						menuLabel/SmeBSB
-!						fontdefault/SmeBSB
-!						...
-!			vt100/VT100
-!			tektronix/TopLevelShell
-!				shellext/VendorShellExt
-!					tek4014/Tek4014
-!
-! If built without a toolbar, the widget hierarchy is simpler, because there
-! is no form, and the popup menu widgets are created only when they are first
-! used.
-!
-!	xterm/XTerm
-!		shellext/VendorShellExt
-!			mainMenu/SimpleMenu
-!				menuLabel/SmeBSB
-!				...
-!			...
-!		vt100/VT100
-!		tektronix/TopLevelShell
-!			shellext/VendorShellExt
-!				tek4014/Tek4014
-!
-! A more complete list of the widget/class names can be obtained using editres
-! to dump a file.  Some widget names are not available until the corresponding
-! menu has been created.
-
-! These resources reduce space around the menubar, by eliminating padding in
-! the enclosing form (Thickness) and the border of the Box which represents
-! the menubar widget.
-*form.Thickness: 0
-*menubar.borderWidth: 0
-
-! If we wanted to eliminate the border of the popup menus, we could do this
-! instead, since they are children of the menubar:
-!*menubar*borderWidth: 0
-
-! Eliminate the border of the buttons in the menubar, so the only line around
-! the text is for the highlighted button:
-*MenuButton*borderWidth: 0
-
-! Set a border for the menus to make them simpler to distinguish against the
-! vt100 widget:
-*SimpleMenu*borderWidth: 2
-
-! xterm can switch at runtime between bitmap (default) and TrueType fonts.
-! The "faceSize" resource controls the size of the latter.  However, it was
-! originally given with a size that makes the two types of fonts different
-! sizes.  Uncomment this line to use the same size as "fixed".
-!*faceSize: 8
-
-! Here is a pattern that is useful for double-clicking on a URL:
-!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
-!
-! Alternatively,
-!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
-
-! VT100s and similar terminals recognize escape sequences and control
-! characters to which they reply to the host with other escape sequences,
-! to provide information.  The "resize" program uses this feature.
-!
-! In addition, xterm recognizes several escape sequences which can be used to
-! set fonts, window properties, return settings via escape sequences.  Some
-! find these useful; others are concerned with the possibility of unexpected
-! inputs.
-!
-! All of these features can be enabled or disabled via menus.
-!
-! Depending on your environment, you may wish to disable those by default by
-! uncommenting one or more of the resource settings below:
-!*allowFontOps: false
-!*allowTcapOps: false
-!*allowTitleOps: false
-!*allowWindowOps: false
@@ -1,175 +0,0 @@
-! $XTermId: XTerm-col.ad,v 1.22 2009/08/15 15:56:29 tom Exp $
-! -----------------------------------------------------------------------------
-! this file is part of xterm
-!
-! Copyright 2002-2006,2009 by Thomas E. Dickey
-! 
-!                         All Rights Reserved
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a
-! copy of this software and associated documentation files (the
-! "Software"), to deal in the Software without restriction, including
-! without limitation the rights to use, copy, modify, merge, publish,
-! distribute, sublicense, and/or sell copies of the Software, and to
-! permit persons to whom the Software is furnished to do so, subject to
-! the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included
-! in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name(s) of the above copyright
-! holders shall not be used in advertising or otherwise to promote the
-! sale, use or other dealings in this Software without prior written
-! authorization.
-! -----------------------------------------------------------------------------
-
-#include "XTerm"
-
-*VT100*colorMode: on
-*VT100*boldColors: on
-*VT100*dynamicColors: on
-
-! Set the default text foreground and background colors.
-*VT100*foreground: gray90
-*VT100*background: black
-
-! - OR -
-! Uncomment this for black text on a "white" background.
-!*VT100*foreground: black
-!*VT100*background: gray90
-
-! - OR -
-! leave the foreground/background colors alone (at the mercy of your desktop
-! designer).
-
-! Color the popup/pulldown menu border to match the text widget foreground.
-!*SimpleMenu*borderColor: gray15
-
-! Uncomment this to use color for underline attribute
-!*VT100*colorULMode: on
-*VT100*colorUL: yellow
-
-!*VT100*italicULMode: on
-
-! Uncomment this to disable underlining, e.g., if colorULMode is set.
-!*VT100*underLine: off
-
-! Uncomment this to use color for the bold attribute
-!*VT100*colorBDMode: on
-*VT100*colorBD: white
-
-! Uncomment this to use the bold/underline colors in preference to other colors
-!*VT100*colorAttrMode: on
-
-! These are the 8 ANSI colors and their bright equivalents.  Depending on
-! other resource settings, xterm may use the bright colors when displaying
-! bold text (see the boldColors resource).
-*VT100*color0: black
-*VT100*color1: red3
-*VT100*color2: green3
-*VT100*color3: yellow3
-*VT100*color4: blue2
-*VT100*color5: magenta3
-*VT100*color6: cyan3
-*VT100*color7: gray90
-*VT100*color8: gray50
-*VT100*color9: red
-*VT100*color10: green
-*VT100*color11: yellow
-*VT100*color12: rgb:5c/5c/ff
-*VT100*color13: magenta
-*VT100*color14: cyan
-*VT100*color15: white
-
-! Disclaimer: there are no standard colors used in terminal emulation.
-!
-! The choice for color4 and color12 is a tradeoff between contrast, depending
-! on whether they are used for text or backgrounds.  Note that either color4 or
-! color12 would be used for text, while only color4 would be used for a
-! background.  These are treated specially, since the luminosity of blue is
-! only about half that of red/green, and is typically not accounted for in the
-! RGB scheme.
-!
-! Blue text on a black background should be readable.
-! Blue backgrounds should not be "too" bright.
-!
-! Originally color4/color12 were set to the names blue3/blue
-!*VT100*color4: blue3
-!*VT100*color12: blue
-!
-! They are from rgb.txt respectively:
-!  0   0 205		blue3
-!  0   0 255		blue
-! However, blue3 is not readable on a black background.
-!
-! Another choice was from the Debian settings:
-!*VT100*color4: DodgerBlue1
-!*VT100*color12: SteelBlue1
-!
-! From rgb.txt:
-! 30 144 255		DodgerBlue1
-! 99 184 255		SteelBlue1
-!
-! Some users object to this choice because the background (color4) is brighter
-! than they are accustomed.  Others point out that the different weights for
-! the red/green components make it appear to be not really blue.  Finally, it
-! provides poor contrast against color13 and color14.
-!
-! The current choice uses equal weights for red/green (effectively adding a
-! gray to the result).  It is brighter than the original choice, and provides
-! more contrast between color12 and color13, color14 than SteelBlue1 did.
-! Contrast of color4 against black is slightly improved over the original.
-!
-! Some refinement is certainly possible (you are welcome to try) -TD
-
-
-#if PLANES > 8
-! Color the popup menus and the menubar to match:
-*SimpleMenu*background: AntiqueWhite
-*SimpleMenu*foreground: gray15
-
-! Color the menubar to match:
-*Form.menubar.background: AntiqueWhite
-*Form.menubar*background: AntiqueWhite
-*Form.menubar.foreground: gray15
-*Form.menubar*foreground: gray15
-*Form.background: AntiqueWhite
-*form.background: AntiqueWhite
-
-*mainMenu*background: AntiqueWhite
-*mainMenu*foreground: gray15
-*vtMenu*background: AntiqueWhite
-*vtMenu*foreground: gray15
-*fontMenu*background: AntiqueWhite
-*fontMenu*foreground: gray15
-*tekMenu*background: AntiqueWhite
-*tekMenu*foreground: gray15
-
-! The following two sections take advantage of new features in version 7
-! of the Athena widget library; see Xaw(7x).
-
-! This section is commented out because Xaw has no way to dynamically size
-! the gradient.  The dimension parameter may need to be adjusted depending
-! on the font used in the menu.
-!*SimpleMenu*backgroundPixmap:   gradient:vertical?dimension=350&start=gray90&end=gray60
-!*SimpleMenu*foreground:         gray15
-
-*VT100.scrollbar.thumb:         vlines2
-*VT100.scrollbar.width:         14
-*VT100.scrollbar.background:    gray60
-*VT100.scrollbar.foreground:    rgb:a/5/5
-*VT100.scrollbar.borderWidth:   0
-*VT100.scrollbar.displayList:\
-foreground      gray90;\
-lines           1,-1,-1,-1,-1,1;\
-foreground      gray60;\
-lines           -1,0,0,0,0,-1
-#endif
@@ -1,34 +0,0 @@
-*internalBorderWidth: 0
-*showGrip: false
-
-*grid.borderWidth: 0
-
-*quit.Label: Quit
-*prev.Label: Prev
-*next.Label: Next
-*prev16.Label: -16
-*next16.Label: +16
-
-*select.Label: Select a character
-*metrics.Label:
-*select.Justify: center
-*metrics.Justify: center
-*range.Justify: left
-*start.Justify: left
-
-*quit.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Quit() unset()
-*next16.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Next16() unset()
-*next.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Next() unset()
-*prev.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Prev() unset()
-*prev16.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Prev16() unset()
-
-*Translations: #override \n\
-<Key>q: Quit()\n\
-Ctrl <Key>n: Next()\n\
-Ctrl <Key>p: Prev()
-
@@ -1,6 +0,0 @@
-! $XConsortium: Xmessage.ad,v 1.3 94/07/26 20:23:17 gildea Exp $
-*baseTranslations: 		#override :<Key>Return: default-exit()
-*message.scrollVertical:	Always
-*message.scrollHorizontal:	Never
-*Command.shapeStyle:		oval
-*Command.highlightThickness:	1
@@ -1,44 +0,0 @@
-! $XFree86$
-
-#include "Xmessage"
-
-*background:			gray85
-*foreground:			gray15
-
-*Scrollbar.thumb:		vlines2
-*Scrollbar.width:		14
-*Scrollbar.foreground:		rgb:a/5/5
-*Scrollbar.borderWidth:		0
-*Scrollbar.displayList:\
-foreground	gray90;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray60;\
-lines		-1,0,0,0,0,-1
-
-*Text.?.cursorColor:		rgb:d/5/5
-*Text.borderColor:		gray80
-*Text*background:		gray96
-*Text*Scrollbar.background:	gray80
-*Text.displayList:\
-foreground	gray90;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray60;\
-lines		-1,0,0,0,0,-1
-
-*Command.highlightThickness:	2
-*Command.internalWidth:		5
-*Command.internalHeight:	3
-*Command.borderColor:		gray40
-*Command.shapeStyle:		Rectangle
-*Command.background:		gray80
-*Command.displayList:\
-foreground	gray60;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray90;\
-lines		-1,0,0,0,0,-1
-
-*Form.displayList:\
-foreground	gray60;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray90;\
-lines		-1,0,0,0,0,-1
@@ -36,10 +36,10 @@ LAST_SYSTEM_GID=999
 # FIRST_[GU]ID to LAST_[GU]ID inclusive is the range of UIDs of dynamically
 # allocated user accounts/groups.
 FIRST_UID=1000
-LAST_UID=29999
+LAST_UID=59999

 FIRST_GID=1000
-LAST_GID=29999
+LAST_GID=59999

 # The USERGROUPS variable can be either "yes" or "no".  If "yes" each
 # created user will be given their own group to use as a default.  If
@@ -1,8 +0,0 @@
-# See man 5 aliases for format
-#postmaster:    root
-#clamav: root
-postmaster: admin@solusar.de
-clamav: admin@solusar.de
-amavis: admin@solusar.de
-root: admin@solusar.de
-logcheck: admin@solusar.de
@@ -1 +0,0 @@
-/usr/bin/bsd-mailx
@@ -1 +0,0 @@
-/usr/share/man/man1/bsd-mailx.1.gz
@@ -1,2 +1,2 @@
-Please read the update-alternatives(8) man page for information on this
+Please read the update-alternatives(1) man page for information on this
 directory and its contents.
@@ -1 +0,0 @@
-/usr/bin/aclocal-1.15
@@ -1 +0,0 @@
-/usr/share/man/man1/aclocal-1.15.1.gz
@@ -1 +0,0 @@
-/usr/bin/animate-im6.q16
@@ -1 +0,0 @@
-/usr/bin/animate-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/animate-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/animate-im6.q16.1.gz
@@ -0,0 +1 @@
+/usr/sbin/arptables-nft
@@ -0,0 +1 @@
+/usr/sbin/arptables-nft-restore
@@ -0,0 +1 @@
+/usr/sbin/arptables-nft-save
@@ -1 +0,0 @@
-/usr/bin/automake-1.15
@@ -1 +0,0 @@
-/usr/share/man/man1/automake-1.15.1.gz
@@ -1 +1 @@
-/usr/bin/gawk
+/usr/bin/mawk
@@ -1 +1 @@
-/usr/share/man/man1/gawk.1.gz
+/usr/share/man/man1/mawk.1.gz
@@ -1 +0,0 @@
-/usr/bin/compare-im6.q16
@@ -1 +0,0 @@
-/usr/bin/compare-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/compare-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/compare-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/bin/composite-im6.q16
@@ -1 +0,0 @@
-/usr/bin/composite-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/composite-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/composite-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/bin/conjure-im6.q16
@@ -1 +0,0 @@
-/usr/bin/conjure-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/conjure-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/conjure-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/bin/convert-im6.q16
@@ -1 +0,0 @@
-/usr/bin/convert-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/convert-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/convert-im6.q16.1.gz
@@ -1 +0,0 @@
-/bin/tcsh
@@ -1 +0,0 @@
-/usr/share/man/man1/tcsh.1.gz
@@ -0,0 +1 @@
+/lib/firmware/cypress/cyfmac43455-sdio-standard.bin
@@ -1 +0,0 @@
-/usr/bin/display-im6.q16
@@ -1 +0,0 @@
-/usr/bin/display-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/display-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/display-im6.q16.1.gz
@@ -0,0 +1 @@
+/usr/sbin/ebtables-nft
@@ -0,0 +1 @@
+/usr/sbin/ebtables-nft-restore
@@ -0,0 +1 @@
+/usr/sbin/ebtables-nft-save
@@ -1 +1 @@
-/usr/bin/vim.basic
+/usr/bin/vim.tiny
@@ -0,0 +1 @@
+/usr/share/man/da/man1/vim.1.gz
@@ -0,0 +1 @@
+/usr/share/man/de/man1/vim.1.gz
@@ -1 +0,0 @@
-/usr/bin/bsd-from
@@ -1 +0,0 @@
-/usr/share/man/man1/bsd-from.1.gz
@@ -1 +0,0 @@
-/usr/bin/identify-im6.q16
@@ -1 +0,0 @@
-/usr/bin/identify-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/identify-im6.q16.1.gz
@@ -1 +0,0 @@
-/usr/share/man/man1/identify-im6.q16.1.gz
@@ -0,0 +1 @@
+/usr/lib/aarch64-linux-gnu/cifs-utils/idmapwb.so
@@ -0,0 +1 @@
+/usr/share/man/man8/idmapwb.8.gz
@@ -1 +0,0 @@
-/usr/bin/import-im6.q16
@@ -1 +0,0 @@
-/usr/bin/import-im6.q16
@@ -1 +0,0 @@
-/usr/share/man/man1/import-im6.q16.1.gz
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`/lib/firmware/cypress/cyfmac43455-sdio-standard.bin`
				`@@ -0,0 +1 @@`
				`/usr/lib/aarch64-linux-gnu/cifs-utils/idmapwb.so`