libis-format 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a96a71d90952cf5d8be62d9b82ac6fc22c4f080a
-  data.tar.gz: 79bda271ae8b628e96c7a3d19b65884a3fe1eee0
+SHA256:
+  metadata.gz: c9fd6394c2eb7964f14d60e8c0ae9b116b8b4e6c12e0a8ee8cffc6b1f94063d1
+  data.tar.gz: 60ef07f34501ce38ab9a3551009aeab0548cee6dbd02612ca2c6ec2da884d288
 SHA512:
-  metadata.gz: 303f4353c79d988110668ddc1c4bb5867d4e644b30d1a6f60e24da13a2f8f99703ab1b8f5afba73ed11aee0cfdd8bad6e759e857350a97d734d021fcfca31c32
-  data.tar.gz: 612a76df7a9907900aa292e68065f3c13d1362edffa01cbf2425edb8c8f41040d17871680ad7bab430a49790da96bba323ce2706ab13dfa39494ca8795e7d639
+  metadata.gz: 4d72580ea2c577507190fa7c8f05dc29edb01e76ff16a8f55669575ca52006eafd26ca9d184628ea9b69d292a9b15b98289722cb25e17ec5d71df496114b1116
+  data.tar.gz: 72ef4b7c04340d86f61fb4211cc4532147c3933a16fefabadce7eacd524981b012ba1dfcdf1e52a29f7ff287488b1bc73ff846de9d04eb3afaea243e91a5a104

data/.travis.yml

@@ -34,10 +34,20 @@ branches:
       - master
 before_install:
   - sudo add-apt-repository ppa:mc3man/trusty-media -y
-  - sudo apt-get update -y
-  - sudo apt-get install -y ffmpeg gstreamer0.10-ffmpeg
-  - sudo pip install opf-fido --upgrade --ignore-installed six
-
+  - sudo apt-get update -y -q
+  - sudo apt-get install -y -q ffmpeg gstreamer0.10-ffmpeg
+  - sudo pip install --upgrade pip
+  - sudo pip install --upgrade --ignore-installed opf-fido six
+  - sudo wget -O droid.zip -q http://www.nationalarchives.gov.uk/documents/information-management/droid-binary-6.4-bin.zip
+  - sudo mkdir -p /opt/droid
+  - sudo unzip droid.zip -d /opt/droid
+  - sudo chmod 755 /opt/droid/droid.sh
+  - sudo locale-gen "en_US.UTF-8"
+  - sudo dpkg-reconfigure locales
+  - echo "8\n9\n" | sudo apt-get install tzdata
+env:
+  - LC_ALL=en_US.UTF-8
+  - LANG=en_US.UTF-8
 addons:
   apt:
     packages:

data/base/Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:18.04
+RUN apt-get -q update
+RUN apt-get -q -y install wget unzip imagemagick python2.7 python-pip openjdk-8-jre-headless libreoffice --no-install-recommends
+RUN pip install --upgrade pip && pip install opf-fido
+RUN wget -q -O droid.zip "http://www.nationalarchives.gov.uk/documents/information-management/droid-binary-6.4-bin.zip" \
+ && mkdir -p /opt/droid \
+ && unzip -d /opt/droid droid.zip \
+ && chmod 755 /opt/droid/droid.sh \
+ && rm droid.zip
+RUN wget -q -O fop.tar.gz "http://www.apache.org/dyn/closer.cgi?filename=/xmlgraphics/fop/binaries/fop-2.3-bin.tar.gz&action=download" \
+ && mkdir -p /opt/fop \
+ && tar xzf fop.tar.gz -C /opt/fop --strip-components=2 \
+ && rm fop.tar.gz

data/lib/libis/format/config.rb

@@ -9,20 +9,22 @@ module Libis
 
     Config[:converter_chain_max_level] = 8
 
-    Config[:java_path] = 'java'
-    Config[:j2kdriver] = 'j2kdriver'
-    Config[:soffice_path] = 'soffice'
-    Config[:ghostscript_path] = 'gs'
-    Config[:droid_path] = '/opt/droid/droid.sh'
-    Config[:fido_path] = '/usr/local/bin/fido'
-    Config[:fop_jar] = '/opt/fop/current/fop/build/fop.jar'
-    Config[:ffmpeg_path] = 'ffmpeg'
+    Config[:java_cmd] = 'java'
+    Config[:j2k_cmd] = 'j2kdriver'
+    Config[:soffice_cmd] = 'soffice'
+    Config[:ghostscript_cmd] = 'gs'
+    Config[:droid_cmd] = '/opt/droid/droid.sh'
+    Config[:droid_temp_path] = '/tmp'
+    Config[:fido_cmd] = '/usr/local/bin/fido'
+    Config[:fop_jar] = File.join(Libis::Format::TOOL_DIR, 'fop', 'build', 'fop.jar')
+    Config[:ffmpeg_cmd] = 'ffmpeg'
     Config[:fido_formats] = [(File.join(Libis::Format::DATA_DIR, 'lias_formats.xml'))]
     Config[:pdf_tool] = File.join(Libis::Format::TOOL_DIR, 'PdfTool.jar')
+    Config[:preflight_jar] = File.join(Libis::Format::TOOL_DIR, 'pdfbox', 'preflight-app-2.0.13.jar')
     # noinspection RubyStringKeysInHashInspection
     Config[:xml_validations] = [['archive/ead', File.join(Libis::Format::DATA_DIR, 'ead.xsd')]]
     Config[:type_database] = File.join(Libis::Format::DATA_DIR, 'types.yml')
-    Config[:raw_audio_convert_cmd] = 'sox %s -e signed -b 16 -t wav %s rate %d channels %d'
+    Config[:raw_audio_convert_cmd] = 'sox -V1 %s -e signed -b 16 -t wav %s rate %d channels %d'
     Config[:watermark_font] = '/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf'
     Config[:timeouts] = {
         droid: 20 * 60,

data/lib/libis/format/converter/audio_converter.rb

@@ -112,7 +112,7 @@ module Libis
           target
         end
 
-        def sounds_like(file1, file2, threshold, rate, channels)
+        def self.sounds_like(file1, file2, threshold, rate, channels)
           rate ||= 96000
           channels ||= 2
           threshold ||= 0.85

data/lib/libis/format/converter/image_converter.rb

@@ -167,7 +167,7 @@ module Libis
 
           else
 
-            image = MiniMagick::Image.new(source) { |b| b.quiet }
+            image = MiniMagick::Image.open(source) { |b| b.quiet }
 
             if image.pages.size > 1
               if @page

data/lib/libis/format/converter/jp2_converter.rb

@@ -91,7 +91,7 @@ module Libis
 
 
           Libis::Tools::Command.run(
-              Libis::Format::Config[:j2kdriver],
+              Libis::Format::Config[:j2k_cmd],
               '--input-file-name', source,
               '--set-output-type', 'JP2',
               *options,

data/lib/libis/format/converter/pdf_converter.rb

@@ -128,7 +128,7 @@ module Libis
           using_temp(target) do |tmpname|
             result = Libis::Format::Tool::PdfOptimizer.run(source, tmpname, quality)
             unless result[:status] == 0
-              error("Pdf optimization encountered errors:\n%s", (result[:err] + result[:out]).join('\n'))
+              error("Pdf optimization encountered errors:\n%s", (result[:err] + result[:out]).join("\n"))
               next nil
             end
             tmpname
@@ -140,15 +140,15 @@ module Libis
           using_temp(target) do |tmpname|
             result = Libis::Format::Tool::PdfCopy.run(
                 source, tmpname,
-                @options.map { |k, v|
+                @options.map {|k, v|
                   if v.nil?
                     nil
                   else
                     ["--#{k}", (v.is_a?(Array) ? v : v.to_s)]
-                  end }.flatten
+                  end}.flatten
             )
             unless result[:err].empty?
-              error("Pdf conversion encountered errors:\n%s", result[:err].join('\n'))
+              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
               next nil
             end
             tmpname
@@ -160,9 +160,11 @@ module Libis
 
           using_temp(target) do |tmpname|
             result = Libis::Format::Tool::PdfToPdfa.run source, tmpname
-            unless result[:status] == 0
-              error("Pdf/A conversion encountered errors:\n%s", result[:err].join('\n'))
+            if result[:status] != 0
+              error("Pdf/A conversion encountered errors:\n%s", result[:err].join("\n"))
               next nil
+            else
+              warn("Pdf/A conversion warnings:\n%s", result[:err].join("\n")) unless result[:err].empty?
             end
             tmpname
           end

data/lib/libis/format/tool/droid.rb

@@ -76,7 +76,7 @@ module Libis
           ]
           timeout = Libis::Format::Config[:timeouts][:droid]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:droid_path], *args,
+              Libis::Format::Config[:droid_cmd], *args,
               timeout: timeout,
               kill_after: timeout * 2
           )
@@ -96,7 +96,7 @@ module Libis
           args << '-R' if recursive
           timeout = Libis::Format::Config[:timeouts][:droid]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:droid_path], *args,
+              Libis::Format::Config[:droid_cmd], *args,
               timeout: timeout,
               kill_after: timeout * 2
           )

data/lib/libis/format/tool/ffmpeg.rb

@@ -28,7 +28,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:ffmpeg]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:ffmpeg_path], *opts,
+              Libis::Format::Config[:ffmpeg_cmd], *opts,
               timeout: timeout,
               kill_after: timeout * 2
           )

data/lib/libis/format/tool/fido.rb

@@ -76,7 +76,7 @@ module Libis
           # Run command and capture results
           timeout = Libis::Format::Config[:timeouts][:fido]
           result = ::Libis::Tools::Command.run(
-              Libis::Format::Config[:fido_path], *args,
+              Libis::Format::Config[:fido_cmd], *args,
               timeout: timeout,
               kill_after: timeout * 2
           )

data/lib/libis/format/tool/fop_pdf.rb

@@ -25,7 +25,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:fop]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
+              Libis::Format::Config[:java_cmd],
               "-Dfop.home=#{File.dirname(Libis::Format::Config[:fop_jar])}",
               '-jar', Libis::Format::Config[:fop_jar],
               '-fo', xml,

data/lib/libis/format/tool/office_to_pdf.rb

@@ -33,7 +33,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:office_to_pdf]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:soffice_path], '--headless',
+              Libis::Format::Config[:soffice_cmd], '--headless',
               "-env:UserInstallation=file://#{workdir}",
               '--convert-to', export_filter,
               '--outdir', workdir, src_file,

data/lib/libis/format/tool/pdf_copy.rb

@@ -25,7 +25,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:pdf_copy]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
+              Libis::Format::Config[:java_cmd],
               '-cp', Libis::Format::Config[:pdf_tool],
               'CopyPdf',
               '--file_input', source,

data/lib/libis/format/tool/pdf_merge.rb

@@ -26,7 +26,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:pdf_merge]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
+              Libis::Format::Config[:java_cmd],
               '-cp', Libis::Format::Config[:pdf_tool],
               'MergePdf',
               '--file_output', target,

data/lib/libis/format/tool/pdf_split.rb

@@ -25,7 +25,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:pdf_split]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
+              Libis::Format::Config[:java_cmd],
               '-cp', Libis::Format::Config[:pdf_tool],
               'SplitPdf',
               '--file_input', source,

data/lib/libis/format/tool/pdf_to_pdfa.rb

@@ -39,7 +39,7 @@ module Libis
 
           timeout = Libis::Format::Config[:timeouts][:pdf_to_pdfa]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:ghostscript_path],
+              Libis::Format::Config[:ghostscript_cmd],
               '-dBATCH', '-dNOPAUSE', '-dNOOUTERSAVE',
               '-sColorConversionStrategy=/UseDeviceIndependentColor',
               "-sProcessColorModel=#{icc_info[:device]}",
@@ -53,7 +53,6 @@ module Libis
           )
 
           raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
-          raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
 
           FileUtils.rm [icc_file, def_filename].compact, force: true
 

data/lib/libis/format/tool/pdfa_validator.rb

@@ -22,7 +22,7 @@ module Libis
           src_file = File.absolute_path(source)
 
           timeout = Libis::Format::Config[:timeouts][:pdfa_validator]
-          if (pdfa = Libis::Format::Config[:pdfa_path])
+          if (pdfa = Libis::Format::Config[:pdfa_cmd])
             # Keep it clean: tool generates fontconfig/ cache dir in current working dir
             previous_wd = Dir.getwd
             Dir.chdir(Dir.tmpdir)
@@ -48,16 +48,15 @@ module Libis
               return false
             end
           else
-            jar = File.join(Libis::Format::TOOL_DIR, 'pdfbox', 'preflight-app-1.8.10.jar')
+            jar = Libis::Format::Config[:preflight_jar]
             result = Libis::Tools::Command.run(
-                Libis::Format::Config[:java_path],
+                Libis::Format::Config[:java_cmd],
                 '-jar', jar,
                 src_file,
                 timeout: timeout,
                 kill_after: timeout * 2
             )
             raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
-            raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:err].empty?
 
             unless result[:status] == 0
               warn "Validator failed to validate the PDF file '%s' against PDF/A-1B constraints:\n%s", source,

data/lib/libis/format/tool/spreadsheet_to_ods.rb

@@ -34,7 +34,7 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:spreadsheet_to_ods] ||
               Libis::Format::Config[:timeouts][:office_to_pdf]
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:soffice_path], '--headless',
+              Libis::Format::Config[:soffice_cmd], '--headless',
               "-env:UserInstallation=file://#{workdir}",
               '--convert-to', export_filter,
               '--outdir', workdir, src_file,

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/libis-format.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 
   spec.platform      = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^bin/[^/]+$}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'rake', '~> 10.3'

data/tools/fop/conf/fop.xconf

@@ -0,0 +1,466 @@
+<?xml version="1.0"?>
+<!-- $Id: fop.xconf 1616312 2014-08-06 19:19:31Z gadams $ -->
+
+<!--
+
+This is an example configuration file for FOP.
+This file contains the same settings as the default values
+and will have no effect if used unchanged.
+
+Relative config url's will be resolved relative to
+the location of this file.
+
+-->
+
+<!-- NOTE: This is the version of the configuration -->
+<fop version="1.0">
+
+  <!-- Base URL for resolving relative URLs -->
+  <base>.</base>
+  
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
+  <source-resolution>72</source-resolution>
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
+  <target-resolution>72</target-resolution>
+  
+  <!-- Default page-height and page-width, in case value is specified as auto -->
+  <default-page-settings height="11.00in" width="8.50in"/>
+  
+  <!-- Information for specific renderers -->
+  <!-- Uses renderer mime type for renderers -->
+  <renderers>
+    <renderer mime="application/pdf">
+      <filterList>
+        <!-- provides compression using zlib flate (default is on) -->
+        <value>flate</value>
+  
+        <!-- encodes binary data into printable ascii characters (default off)
+             This provides about a 4:5 expansion of data size -->
+        <!-- <value>ascii-85</value> -->
+  
+        <!-- encodes binary data with hex representation (default off)
+             This filter is not recommended as it doubles the data size -->
+        <!-- <value>ascii-hex</value> -->
+      </filterList>
+
+      <fonts>
+        <!-- embedded fonts -->
+        <!--
+        This information must exactly match the font specified
+        in the fo file. Otherwise it will use a default font.
+
+        For example,
+        <fo:inline font-family="Arial" font-weight="bold" font-style="normal">
+            Arial-normal-normal font
+        </fo:inline>
+        for the font triplet specified by:
+        <font-triplet name="Arial" style="normal" weight="bold"/>
+
+        If you do not want to embed the font in the pdf document
+        then do not include the "embed-url" attribute.
+        The font will be needed where the document is viewed
+        for it to be displayed properly.
+
+        possible styles: normal | italic | oblique | backslant
+        possible weights: normal | bold | 100 | 200 | 300 | 400
+                          | 500 | 600 | 700 | 800 | 900
+        (normal = 400, bold = 700)
+        -->
+
+        <!--
+        <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf">
+          <font-triplet name="Arial" style="normal" weight="normal"/>
+          <font-triplet name="ArialMT" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf">
+          <font-triplet name="Arial" style="normal" weight="bold"/>
+          <font-triplet name="ArialMT" style="normal" weight="bold"/>
+        </font>
+        -->
+
+        <!-- auto-detect fonts -->
+        <auto-detect/>
+
+      </fonts>
+
+      <!-- This option lets you specify additional options on an XML handler -->
+      <!--xml-handler namespace="http://www.w3.org/2000/svg">
+        <stroke-text>false</stroke-text>
+      </xml-handler-->
+
+    </renderer>
+
+    <renderer mime="application/x-afp">
+      <!--
+           The bit depth and type of images produced
+           (this is the default setting)
+      -->
+      <images mode="b+w" bits-per-pixel="8"/>
+      <renderer-resolution>240</renderer-resolution>
+      <line-width-correction>2.5</line-width-correction>
+      <resource-group-file>resources.afp</resource-group-file>
+
+      <fonts>
+      <!--
+           Below is an example using raster font configuration using FOP builtin base-14 font metrics.
+           for Times Roman, Helvetica and Courier.
+
+           Depending on AFP raster and outline font availability on your installation you will
+           most likely need to modify the configuration provided below.
+
+           See http://xmlgraphics.apache.org/fop/trunk/output.html#afp-configuration
+           for details of FOP configuration for AFP
+      -->
+
+        <!-- Times Roman -->
+        <font>
+          <afp-font name="Times Roman" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N20060" base14-font="TimesRoman"/>
+            <afp-raster-font size="7" characterset="C0N20070" base14-font="TimesRoman"/>
+            <afp-raster-font size="8" characterset="C0N20080" base14-font="TimesRoman"/>
+            <afp-raster-font size="9" characterset="C0N20090" base14-font="TimesRoman"/>
+            <afp-raster-font size="10" characterset="C0N20000" base14-font="TimesRoman"/>
+            <afp-raster-font size="11" characterset="C0N200A0" base14-font="TimesRoman"/>
+            <afp-raster-font size="12" characterset="C0N200B0" base14-font="TimesRoman"/>
+            <afp-raster-font size="14" characterset="C0N200D0" base14-font="TimesRoman"/>
+            <afp-raster-font size="16" characterset="C0N200F0" base14-font="TimesRoman"/>
+            <afp-raster-font size="18" characterset="C0N200H0" base14-font="TimesRoman"/>
+            <afp-raster-font size="20" characterset="C0N200J0" base14-font="TimesRoman"/>
+            <afp-raster-font size="24" characterset="C0N200N0" base14-font="TimesRoman"/>
+            <afp-raster-font size="30" characterset="C0N200T0" base14-font="TimesRoman"/>
+            <afp-raster-font size="36" characterset="C0N200Z0" base14-font="TimesRoman"/>
+          </afp-font>
+          <font-triplet name="Times" style="normal" weight="normal"/>
+          <font-triplet name="TimesRoman" style="normal" weight="normal"/>
+          <font-triplet name="Times Roman" style="normal" weight="normal"/>
+          <font-triplet name="Times-Roman" style="normal" weight="normal"/>
+          <font-triplet name="Times New Roman" style="normal" weight="normal"/>
+          <font-triplet name="TimesNewRoman" style="normal" weight="normal"/>
+          <font-triplet name="serif" style="normal" weight="normal"/>
+        </font>
+ 
+        <!-- Times Roman Italic -->
+        <font>
+          <afp-font name="Times Roman Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N30060" base14-font="TimesItalic"/>
+            <afp-raster-font size="7" characterset="C0N30070" base14-font="TimesItalic"/>
+            <afp-raster-font size="8" characterset="C0N30080" base14-font="TimesItalic"/>
+            <afp-raster-font size="9" characterset="C0N30090" base14-font="TimesItalic"/>
+            <afp-raster-font size="10" characterset="C0N30000" base14-font="TimesItalic"/>
+            <afp-raster-font size="11" characterset="C0N300A0" base14-font="TimesItalic"/>
+            <afp-raster-font size="12" characterset="C0N300B0" base14-font="TimesItalic"/>
+            <afp-raster-font size="14" characterset="C0N300D0" base14-font="TimesItalic"/>
+            <afp-raster-font size="16" characterset="C0N300F0" base14-font="TimesItalic"/>
+            <afp-raster-font size="18" characterset="C0N300H0" base14-font="TimesItalic"/>
+            <afp-raster-font size="20" characterset="C0N300J0" base14-font="TimesItalic"/>
+            <afp-raster-font size="24" characterset="C0N300N0" base14-font="TimesItalic"/>
+            <afp-raster-font size="30" characterset="C0N300T0" base14-font="TimesItalic"/>
+            <afp-raster-font size="36" characterset="C0N300Z0" base14-font="TimesItalic"/>
+          </afp-font>
+          <font-triplet name="Times" style="italic" weight="normal"/>
+          <font-triplet name="TimesRoman" style="italic" weight="normal"/>
+          <font-triplet name="Times Roman" style="italic" weight="normal"/>
+          <font-triplet name="Times-Roman" style="italic" weight="normal"/>
+          <font-triplet name="Times New Roman" style="italic" weight="normal"/>
+          <font-triplet name="TimesNewRoman" style="italic" weight="normal"/>
+          <font-triplet name="serif" style="italic" weight="normal"/>
+        </font>
+ 
+        <!-- Times Roman Bold -->
+        <font>
+          <afp-font name="Times Roman Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N40060" base14-font="TimesBold"/>
+            <afp-raster-font size="7" characterset="C0N40070" base14-font="TimesBold"/>
+            <afp-raster-font size="8" characterset="C0N40080" base14-font="TimesBold"/>
+            <afp-raster-font size="9" characterset="C0N40090" base14-font="TimesBold"/>
+            <afp-raster-font size="10" characterset="C0N40000" base14-font="TimesBold"/>
+            <afp-raster-font size="11" characterset="C0N400A0" base14-font="TimesBold"/>
+            <afp-raster-font size="12" characterset="C0N400B0" base14-font="TimesBold"/>
+            <afp-raster-font size="14" characterset="C0N400D0" base14-font="TimesBold"/>
+            <afp-raster-font size="16" characterset="C0N400F0" base14-font="TimesBold"/>
+            <afp-raster-font size="18" characterset="C0N400H0" base14-font="TimesBold"/>
+            <afp-raster-font size="20" characterset="C0N400J0" base14-font="TimesBold"/>
+            <afp-raster-font size="24" characterset="C0N400N0" base14-font="TimesBold"/>
+            <afp-raster-font size="30" characterset="C0N400T0" base14-font="TimesBold"/>
+            <afp-raster-font size="36" characterset="C0N400Z0" base14-font="TimesBold"/>
+          </afp-font>
+          <font-triplet name="Times" style="normal" weight="bold"/>
+          <font-triplet name="TimesRoman" style="normal" weight="bold"/>
+          <font-triplet name="Times Roman" style="normal" weight="bold"/>
+          <font-triplet name="Times-Roman" style="normal" weight="bold"/>
+          <font-triplet name="Times New Roman" style="normal" weight="bold"/>
+          <font-triplet name="TimesNewRoman" style="normal" weight="bold"/>
+          <font-triplet name="serif" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Times Roman Italic Bold -->
+        <font>
+          <afp-font name="Times Roman Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N50060" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="7" characterset="C0N50070" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="8" characterset="C0N50080" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="9" characterset="C0N50090" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="10" characterset="C0N50000" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="11" characterset="C0N500A0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="12" characterset="C0N500B0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="14" characterset="C0N500D0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="16" characterset="C0N500F0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="18" characterset="C0N500H0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="20" characterset="C0N500J0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="24" characterset="C0N500N0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="30" characterset="C0N500T0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="36" characterset="C0N500Z0" base14-font="TimesBoldItalic"/>
+          </afp-font>
+          <font-triplet name="Times" style="italic" weight="bold"/>
+          <font-triplet name="TimesRoman" style="italic" weight="bold"/>
+          <font-triplet name="Times Roman" style="italic" weight="bold"/>
+          <font-triplet name="Times-Roman" style="italic" weight="bold"/>
+          <font-triplet name="Times New Roman" style="italic" weight="bold"/>
+          <font-triplet name="TimesNewRoman" style="italic" weight="bold"/>
+          <font-triplet name="serif" style="italic" weight="bold"/>
+        </font>
+
+        <!-- Helvetica -->
+        <font>
+          <afp-font name="Helvetica" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H20060" base14-font="Helvetica"/>
+            <afp-raster-font size="7" characterset="C0H20070" base14-font="Helvetica"/>
+            <afp-raster-font size="8" characterset="C0H20080" base14-font="Helvetica"/>
+            <afp-raster-font size="9" characterset="C0H20090" base14-font="Helvetica"/>
+            <afp-raster-font size="10" characterset="C0H20000" base14-font="Helvetica"/>
+            <afp-raster-font size="11" characterset="C0H200A0" base14-font="Helvetica"/>
+            <afp-raster-font size="12" characterset="C0H200B0" base14-font="Helvetica"/>
+            <afp-raster-font size="14" characterset="C0H200D0" base14-font="Helvetica"/>
+            <afp-raster-font size="16" characterset="C0H200F0" base14-font="Helvetica"/>
+            <afp-raster-font size="18" characterset="C0H200H0" base14-font="Helvetica"/>
+            <afp-raster-font size="20" characterset="C0H200J0" base14-font="Helvetica"/>
+            <afp-raster-font size="24" characterset="C0H200N0" base14-font="Helvetica"/>
+            <afp-raster-font size="30" characterset="C0H200T0" base14-font="Helvetica"/>
+            <afp-raster-font size="36" characterset="C0H200Z0" base14-font="Helvetica"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="normal" weight="normal"/>
+          <font-triplet name="Arial" style="normal" weight="normal"/>
+          <font-triplet name="sans-serif" style="normal" weight="normal"/>
+          <font-triplet name="any" style="normal" weight="normal"/>
+        </font>
+
+        <!-- Helvetica Italic -->
+        <font>
+          <afp-font name="Helvetica Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H30060" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="7" characterset="C0H30070" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="8" characterset="C0H30080" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="9" characterset="C0H30090" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="10" characterset="C0H30000" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="11" characterset="C0H300A0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="12" characterset="C0H300B0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="14" characterset="C0H300D0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="16" characterset="C0H300F0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="18" characterset="C0H300H0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="20" characterset="C0H300J0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="24" characterset="C0H300N0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="30" characterset="C0H300T0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="36" characterset="C0H300Z0" base14-font="HelveticaOblique"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="italic" weight="normal"/>
+          <font-triplet name="Arial" style="italic" weight="normal"/>
+          <font-triplet name="sans-serif" style="italic" weight="normal"/>
+        </font>
+
+        <!-- Helvetica (Semi) Bold -->
+        <font>
+          <afp-font name="Helvetica (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H40060" base14-font="HelveticaBold"/>
+            <afp-raster-font size="7" characterset="C0H40070" base14-font="HelveticaBold"/>
+            <afp-raster-font size="8" characterset="C0H40080" base14-font="HelveticaBold"/>
+            <afp-raster-font size="9" characterset="C0H40090" base14-font="HelveticaBold"/>
+            <afp-raster-font size="10" characterset="C0H40000" base14-font="HelveticaBold"/>
+            <afp-raster-font size="11" characterset="C0H400A0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="12" characterset="C0H400B0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="14" characterset="C0H400D0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="16" characterset="C0H400F0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="18" characterset="C0H400H0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="20" characterset="C0H400J0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="24" characterset="C0H400N0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="30" characterset="C0H400T0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="36" characterset="C0H400Z0" base14-font="HelveticaBold"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="normal" weight="bold"/>
+          <font-triplet name="Arial" style="normal" weight="bold"/>
+          <font-triplet name="sans-serif" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Helvetica Italic (Semi) Bold -->
+        <font>
+          <afp-font name="Helvetica Italic (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H50060" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="7" characterset="C0H50070" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="8" characterset="C0H50080" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="9" characterset="C0H50090" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="10" characterset="C0H50000" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="11" characterset="C0H500A0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="12" characterset="C0H500B0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="14" characterset="C0H500D0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="16" characterset="C0H500F0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="18" characterset="C0H500H0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="20" characterset="C0H500J0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="24" characterset="C0H500N0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="30" characterset="C0H500T0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="36" characterset="C0H500Z0" base14-font="HelveticaBoldOblique"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="italic" weight="bold"/>
+          <font-triplet name="Arial" style="italic" weight="bold"/>
+          <font-triplet name="sans-serif" style="italic" weight="bold"/>
+        </font>
+
+        <!-- Courier -->
+        <font>
+          <afp-font name="Courier" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0420060" base14-font="Courier"/>
+            <afp-raster-font size="7" characterset="C0420070" base14-font="Courier"/>
+            <afp-raster-font size="8" characterset="C0420080" base14-font="Courier"/>
+            <afp-raster-font size="9" characterset="C0420090" base14-font="Courier"/>
+            <afp-raster-font size="10" characterset="C0420000" base14-font="Courier"/>
+            <afp-raster-font size="11" characterset="C04200A0" base14-font="Courier"/>
+            <afp-raster-font size="12" characterset="C04200B0" base14-font="Courier"/>
+            <afp-raster-font size="14" characterset="C04200D0" base14-font="Courier"/>
+            <afp-raster-font size="16" characterset="C04200F0" base14-font="Courier"/>
+            <afp-raster-font size="18" characterset="C04200H0" base14-font="Courier"/>
+            <afp-raster-font size="20" characterset="C04200J0" base14-font="Courier"/>
+            <afp-raster-font size="24" characterset="C04200N0" base14-font="Courier"/>
+            <afp-raster-font size="30" characterset="C04200T0" base14-font="Courier"/>
+            <afp-raster-font size="36" characterset="C04200Z0" base14-font="Courier"/>
+          </afp-font>
+          <font-triplet name="Courier" style="normal" weight="normal"/>
+          <font-triplet name="monospace" style="normal" weight="normal"/>
+        </font>
+
+        <!-- Courier Italic -->
+        <font>
+          <afp-font name="Courier Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0430060" base14-font="CourierOblique"/>
+            <afp-raster-font size="7" characterset="C0430070" base14-font="CourierOblique"/>
+            <afp-raster-font size="8" characterset="C0430080" base14-font="CourierOblique"/>
+            <afp-raster-font size="9" characterset="C0430090" base14-font="CourierOblique"/>
+            <afp-raster-font size="10" characterset="C0430000" base14-font="CourierOblique"/>
+            <afp-raster-font size="11" characterset="C04300A0" base14-font="CourierOblique"/>
+            <afp-raster-font size="12" characterset="C04300B0" base14-font="CourierOblique"/>
+            <afp-raster-font size="14" characterset="C04300D0" base14-font="CourierOblique"/>
+            <afp-raster-font size="16" characterset="C04300F0" base14-font="CourierOblique"/>
+            <afp-raster-font size="18" characterset="C04300H0" base14-font="CourierOblique"/>
+            <afp-raster-font size="20" characterset="C04300J0" base14-font="CourierOblique"/>
+            <afp-raster-font size="24" characterset="C04300N0" base14-font="CourierOblique"/>
+            <afp-raster-font size="30" characterset="C04300T0" base14-font="CourierOblique"/>
+            <afp-raster-font size="36" characterset="C04300Z0" base14-font="CourierOblique"/>
+          </afp-font>
+          <font-triplet name="Courier" style="italic" weight="normal"/>
+          <font-triplet name="monospace" style="italic" weight="normal"/>
+        </font>
+
+        <!-- Courier Bold -->
+        <font>
+          <afp-font name="Courier Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0440060" base14-font="CourierBold"/>
+            <afp-raster-font size="7" characterset="C0440070" base14-font="CourierBold"/>
+            <afp-raster-font size="8" characterset="C0440080" base14-font="CourierBold"/>
+            <afp-raster-font size="9" characterset="C0440090" base14-font="CourierBold"/>
+            <afp-raster-font size="10" characterset="C0440000" base14-font="CourierBold"/>
+            <afp-raster-font size="11" characterset="C04400A0" base14-font="CourierBold"/>
+            <afp-raster-font size="12" characterset="C04400B0" base14-font="CourierBold"/>
+            <afp-raster-font size="14" characterset="C04400D0" base14-font="CourierBold"/>
+            <afp-raster-font size="16" characterset="C04400F0" base14-font="CourierBold"/>
+            <afp-raster-font size="18" characterset="C04400H0" base14-font="CourierBold"/>
+            <afp-raster-font size="20" characterset="C04400J0" base14-font="CourierBold"/>
+            <afp-raster-font size="24" characterset="C04400N0" base14-font="CourierBold"/>
+            <afp-raster-font size="30" characterset="C04400T0" base14-font="CourierBold"/>
+            <afp-raster-font size="36" characterset="C04400Z0" base14-font="CourierBold"/>
+          </afp-font>
+          <font-triplet name="Courier" style="normal" weight="bold"/>
+          <font-triplet name="monospace" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Courier Italic Bold -->
+        <font>
+          <afp-font name="Courier Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0450060" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="7" characterset="C0450070" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="8" characterset="C0450080" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="9" characterset="C0450090" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="10" characterset="C0450000" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="11" characterset="C04500A0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="12" characterset="C04500B0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="14" characterset="C04500D0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="16" characterset="C04500F0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="18" characterset="C04500H0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="20" characterset="C04500J0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="24" characterset="C04500N0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="30" characterset="C04500T0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="36" characterset="C04500Z0" base14-font="CourierBoldOblique"/>
+          </afp-font>
+          <font-triplet name="Courier" style="italic" weight="bold"/>
+          <font-triplet name="monospace" style="italic" weight="bold"/>
+        </font>
+        
+         <!-- 
+        Configure double-byte (CID Keyed font (Type 0)) AFP fonts with type="CIDKeyed".  
+        
+        example:
+         <font>
+                <afp-font type="CIDKeyed" encoding="UnicodeBigUnmarked"  
+                codepage="T1120000" characterset="CZJHMNU" 
+                base-uri="fonts" />
+                <font-triplet name="J-Heisei Mincho" style="normal" weight="normal" />
+         </font>
+        -->
+        
+        
+      </fonts>
+    </renderer>
+
+    <renderer mime="application/postscript">
+      <!-- This option forces the PS renderer to rotate landscape pages -->
+      <!--auto-rotate-landscape>true</auto-rotate-landscape-->
+      
+      <!-- This option lets you specify additional options on an XML handler -->
+      <!--xml-handler namespace="http://www.w3.org/2000/svg">
+        <stroke-text>false</stroke-text>
+      </xml-handler-->
+    </renderer>
+
+    <renderer mime="application/vnd.hp-PCL">
+    </renderer>
+
+    <!-- MIF does not have a renderer
+    <renderer mime="application/vnd.mif">
+    </renderer>
+    -->
+
+    <renderer mime="image/svg+xml">
+      <format type="paginated"/>
+      <link value="true"/>
+      <strokeText value="false"/>
+    </renderer>
+
+    <renderer mime="application/awt">
+    </renderer>
+
+    <renderer mime="image/png">
+      <!--transparent-page-background>true</transparent-page-background-->
+    </renderer>
+
+    <renderer mime="image/tiff">
+      <!--transparent-page-background>true</transparent-page-background-->
+      <!--compression>CCITT T.6</compression-->
+    </renderer>
+
+    <renderer mime="text/xml">
+    </renderer>
+
+    <!-- RTF does not have a renderer
+    <renderer mime="text/rtf">
+    </renderer>
+    -->
+
+  </renderers>
+
+</fop>