libis-format 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fd6394c2eb7964f14d60e8c0ae9b116b8b4e6c12e0a8ee8cffc6b1f94063d1
-  data.tar.gz: 60ef07f34501ce38ab9a3551009aeab0548cee6dbd02612ca2c6ec2da884d288
+  metadata.gz: '09143d3be9aca7d01b5c6ba3512e4b106d4ee2f0e370fad9c565bf0724c61846'
+  data.tar.gz: 5c9f5fb67527e828a2b293ffe6e4bf8616d7a08f67780b963e5f292bb50ae385
 SHA512:
-  metadata.gz: 4d72580ea2c577507190fa7c8f05dc29edb01e76ff16a8f55669575ca52006eafd26ca9d184628ea9b69d292a9b15b98289722cb25e17ec5d71df496114b1116
-  data.tar.gz: 72ef4b7c04340d86f61fb4211cc4532147c3933a16fefabadce7eacd524981b012ba1dfcdf1e52a29f7ff287488b1bc73ff846de9d04eb3afaea243e91a5a104
+  metadata.gz: cbf99230e3566a2aacdfd02e97f2622cd83d32601cb772fec50a94c04054754e367ea1a09276e7cdee6d9bc564f8642a63967159a2d3290769c368945fe3c233
+  data.tar.gz: c0f33d0d7d0208ea7ed8678da52dea0dd30ee54438c321a4be0a1b5ccc01f2451591251615775074639b03e4548d9a97cf4218e4ae0b8ce0aa2819e70f12a964

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /spec/work/
+/spec/tmp/
 /tmp/
 *.bundle
 *.so
@@ -15,4 +16,5 @@
 mkmf.log
 /.idea/
 *.pyc
-tools/pdf/
+tools/pdf/
+/test*

data/.travis.yml

@@ -44,7 +44,7 @@ before_install:
   - 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
+  - echo "8\n9\n" | sudo dpkg-reconfigure tzdata
 env:
   - LC_ALL=en_US.UTF-8
   - LANG=en_US.UTF-8

data/base/Dockerfile

@@ -1,13 +1,33 @@
 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 apt-get -q update \
+ && apt-get install -q -y --no-install-recommends \
+        wget \
+        unzip \
+        imagemagick \
+        python2.7 \
+        python-pip \
+        openjdk-8-jre-headless \
+        libreoffice \
+        ghostscript
+
+RUN apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
 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
+
+RUN echo "8\n9\n" | apt-get install tzdata
+ADD ./tools /tools
+ADD ./data /config
+ADD ./spec/data /data
+CMD /bin/bash

data/base/Dockerfile.alpine

@@ -0,0 +1,20 @@
+FROM alpine:3.8
+LABEL maintainer="kris.dekeyser@libis.be"
+RUN apk update -q && apk upgrade -q
+RUN apk add -q python2 py-pip openjdk8-jre ffmpeg libreoffice ttf-liberation ttf-freefont ttf-opensans sox git wget unzip sudo bash curl tar imagemagick
+# install fido
+RUN pip install -q --upgrade pip && pip install -q opf-fido
+# install droid
+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 -q -d /opt/droid droid.zip \
+ && chmod 755 /opt/droid/droid.sh \
+ && rm droid.zip
+# install ImageMagick
+RUN apk add -q imagemagick
+ADD ../tools /tools
+ADD ../data /cfg
+VOLUME /data
+WORKDIR /data
+
+CMD ["/bin/bash", "-l"]

data/base/Dockerfile.rvm

@@ -0,0 +1,56 @@
+ARG ubuntu_ver=latest
+ARG ruby_ver=2.5.3
+ARG node_ver=10.15.0
+
+FROM ubuntu:${ubuntu_ver}
+LABEL maintainer="kris.dekeyser@libis.be"
+
+ENV RUBY_ENV=${ruby_ver}
+ENV NVM_DIR=/usr/local/nvm
+ENV NODE_VER=${node_ver}
+ENV NODE_PATH=$NVM_DIR/v$NODE_VER/lib/node_modules
+ENV NODE_PATH=$NVM_DIR/versions/node/v$NODE_VER/bin
+ENV PATH "${PATH}:${NODE_PATH}:${NODE_PATH}/npm"
+
+RUN echo $RUBY_ENV
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -q \
+ && apt-get install -y -q --no-install-recommends software-properties-common apt-utils
+RUN apt-add-repository -y ppa:rael-gc/rvm \
+ && apt-get update -q
+RUN apt-get  install -y -q --no-install-recommends \
+        build-essential \
+        gnupg2 \
+        git \
+        wget \
+        curl \
+        sudo \
+        unzip \
+        openjdk-8-jre-headless
+
+ENV BASH_ENV='/etc/profile exec bash'
+SHELL ["/bin/bash", "-l", "-c"]
+
+RUN addgroup --gid 2000 teneo \
+ && adduser --uid 2000 --gid 2000 --disabled-password --gecos "Teneo user" teneo \
+ && usermod -L -s /bin/bash teneo
+RUN echo 'teneo ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers
+
+USER teneo
+
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+
+RUN curl -sSL https://get.rvm.io | bash -s stable
+
+RUN echo 'gem: --no-document' > ${HOME}/.gemrc
+RUN echo rvm install ${ruby_ver}
+RUN echo rvm use ${RUBY_ENV}@teneo --create --ruby-version --ruby-gems
+
+# required due to bug in rubygems (https://github.com/rubygems/rubygems/issues/2483)
+RUN gem install rdoc bundler
+RUN gem update --no-document --system
+RUN rvm info
+#ADD . /home/libis/libis_format
+#WORKDIR /home/libis/libis_format
+#RUN bundle install && bundle exec rake spec

data/base/rework_path

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#file=${1/$SRC_PATH/$TGT_PATH}
+#echo "$1 -> $file"
+
+CMD=$1
+shift
+
+readarray -d ',' -t mapping <<< "$VOLUME_MAPPING"
+
+args=("$@")
+echo "args: ${args[@]}"
+#args="${args[@]/$SRC_PATH/$TGT_PATH}"
+#args="${args[@]/$SRC_TMP/$TGT_TMP}"
+for map in "${mapping[@]}"
+do
+        map="${map//[$'\t\r\n ']}"
+        readarray -d '=' -t m <<< "$map"
+        src="${m[0]//[$'\t\r\n ']}"
+        tgt="${m[1]//[$'\t\r\n ']}"
+        echo "$src -> $tgt"
+        args="${args[@]/$src/$tgt}"
+        echo "args: ${args[@]}"
+done
+echo $CMD "${args[@]}"

data/docker_cfg.yml

@@ -0,0 +1 @@
+:fop_jar: '/tools/fop.jar'

data/lib/libis/format/type_database.rb

@@ -1,8 +1,7 @@
 # coding: utf-8
 
 require 'yaml'
-
-require 'backports/rails/hash'
+require 'libis/tools/extend/hash'
 
 module Libis
   module Format

data/lib/libis/format/type_database_impl.rb

@@ -3,8 +3,8 @@
 require 'singleton'
 require 'yaml'
 
-require 'backports/rails/hash'
 require 'libis/tools/logger'
+require 'libis/tools/extend/hash'
 require 'libis/tools/extend/string'
 
 module Libis

data/lib/libis/format/version.rb

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

data/tools/fop/fop.bat

@@ -1,75 +1,75 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
-
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-rem %~dp0 is the expanded pathname of the current script under NT
-set LOCAL_FOP_HOME=
-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
-
-rem Code from Apache Ant project
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
-rem with Win9x.
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-rem and for NT handling to skip to.
-:doneStart
-
-set LOGCHOICE=
-rem The default commons logger for JDK1.4 is JDK1.4Logger.
-rem To use a different logger, uncomment the one desired below
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
-
-set LOGLEVEL=
-rem Logging levels
-rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
-rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
-rem file instead.
-rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
-rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
-
-set LIBDIR=%LOCAL_FOP_HOME%lib
-
-set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
-for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
-
-set JAVAOPTS=-Denv.windir=%WINDIR%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
-goto runFop
-
-:noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=java
-
-:runFop
-rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-
-ENDLOCAL
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+rem %~dp0 is the expanded pathname of the current script under NT
+set LOCAL_FOP_HOME=
+if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
+
+rem Code from Apache Ant project
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
+rem with Win9x.
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+rem and for NT handling to skip to.
+:doneStart
+
+set LOGCHOICE=
+rem The default commons logger for JDK1.4 is JDK1.4Logger.
+rem To use a different logger, uncomment the one desired below
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+
+set LOGLEVEL=
+rem Logging levels
+rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
+rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
+rem file instead.
+rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
+rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
+
+set LIBDIR=%LOCAL_FOP_HOME%lib
+
+set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
+for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
+
+set JAVAOPTS=-Denv.windir=%WINDIR%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
+goto runFop
+
+:noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=java
+
+:runFop
+rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+
+ENDLOCAL

data/tools/fop/fop.cmd

@@ -1,31 +1,31 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
-
-set LOCAL_FOP_HOME=%~dp0
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-:doneStart
-
-call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
-
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
+
+set LOCAL_FOP_HOME=%~dp0
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+:doneStart
+
+call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
+

data/tools/fop/fop.js

@@ -1,341 +1,341 @@
-//   Licensed to the Apache Software Foundation (ASF) under one or more
-//   contributor license agreements.  See the NOTICE file distributed with
-//   this work for additional information regarding copyright ownership.
-//   The ASF licenses this file to You under the Apache License, Version 2.0
-//   (the "License"); you may not use this file except in compliance with
-//   the License.  You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//   $Id: fop.js 1734671 2016-03-12 05:39:53Z gadams $ -->
-
-// jscript to run FOP, adapted from the Jakarta-Ant project.
-
-// rpm_mode is irrelevant on Windows
-// var rpm_mode=true;
-var fop_exec_args = "";
-var no_config=false;
-var fop_exec_debug=false;
-var debug=false;
-var keep_open=false;
-var show_help=false;
-
-var config_wanted = new Array("FOP_HOME", "CLASSPATH", "FOP_HYPHENATION_PATH", "FOP_OPTS", "JAVA_OPTS", "LOGCHOICE", "LOGLEVEL");
-
-// parse command-line arguments
-function read_args() {
-  var args = WScript.Arguments;
-  var named = new ActiveXObject("Scripting.Dictionary");
-  for (i = 0; i < args.length; i++) {
-	switch(args(i)) {
-	case "--debug":
-	  debug=true;
-	  break;
-	case "--execdebug":
-	  fop_exec_debug=true;
-	  break;
-	case "--keepopen":
-	  keep_open=true;
-	  break;
-	case "--noconfig":
-	  no_config=true;
-	  break;
-	case "-h":
-	case "--help":
-	case "--h":
-	case "-help":
-	  show_help=true;
-	  // fop_exec_args=fop_exec_args + " -h";
-	  break;
-	default:
-	  fop_exec_args=fop_exec_args + " " + args(i);
-	}
-  }
-  if (debug) {
-	WScript.Echo("debug: " + debug);
-	WScript.Echo("execdebug: " + fop_exec_debug);
- 	WScript.Echo("keepopen: " + keep_open);
- 	WScript.Echo("noconfig: " + no_config);
-	WScript.Echo("help: " + show_help);
- 	WScript.Echo("fop arguments: " + fop_exec_args);
-  }
-}
-
-var help_text="Usage:\n"
-  + WScript.ScriptFullName + " [script options] [FOP options]\n"
-  + "Script Options:\n"
-  + "  --help, -h             print this message and FOP help\n"
-  + "  --debug                print debugging information for this launch script\n"
-  + "  --execdebug            print FOP exec line generated by this launch script\n"
-  + "  --keepopen             keep FOP's command window open\n"
-  + "  --noconfig             suppress reading of configuration file and registry";
-
-function read_environment() {
-  for (i in config_wanted) {
-	if (!config.Exists(config_wanted[i])) {
-		var env_var_string = "%" + config_wanted[i] + "%";
-		var env_var = shell.ExpandEnvironmentStrings(env_var_string);
-		if (env_var != "" && env_var != env_var_string) {
-		  config.Add(config_wanted[i], env_var);
-		  if (debug) {
-			WScript.Echo(config_wanted[i] + " env: "
-						 + config.Item(config_wanted[i]));
-		  }
-		}
-	}
-  }
-}
-
-function read_desktop(dtname) {
-  if (fs.FolderExists(dtname)) {
-	var fopname = fs.GetFolder(dtname).ParentFolder.Path
-	  + "\\Application Data\\Fop";
-	if (fs.FolderExists(fopname)) {
-	  var fop_conf_name = fs.GetFolder(fopname).Path + "\\fop.conf";
-	  if (fs.FileExists(fop_conf_name)) {
-		// source fop_conf_file
-		var conf_file = fs.openTextFile(fs.GetFile(fop_conf_name));
-		var conf_lines = new ActiveXObject("Scripting.Dictionary");
-		while (!conf_file.AtEndOfStream) {
-		  var line = conf_file.ReadLine();
-		  var m = line.match(/(.+?)=(.+)/);
-		  if (m != null) {
-			conf_lines.Add(m[1], m[2]);
-		  }
-		}
-		for (j in config_wanted) {
-		  if (!config.Exists(config_wanted[j])
-			  && conf_lines.Exists(config_wanted[j])) {
-			config.Add(config_wanted[j], conf_lines.Item(config_wanted[j]));
-			if (debug) {
-			  WScript.Echo(config_wanted[j] + " " + dts[i] + ": "
-						   + config.Item(config_wanted[i]));
-			}
-		  }
-		}
-	  }
-	}
-  }
-}
-
-function read_registry(section) {
-  for (j in config_wanted) {
-	if (!config.Exists(config_wanted[j])) {
-	  var reg_var;
-	  try {
-		reg_var = shell.RegRead(section + "\\Software\\Fop\\"
-								+ config_wanted[j]);
-		config.Add(config_wanted[j], reg_var);
-		if (debug) {
-		  WScript.Echo(config_wanted[j] + " " + rks[i] + ": "
-					   + config.Item(config_wanted[j]));
-		}
-	  } catch(e) {}
-	}
-  }
-}
-
-// construct FOP_HOME from the script folder
-function get_fop_home() {
-  if (!config.Exists("FOP_HOME")
-	  || !fs.FolderExists(config.Item("FOP_HOME"))) {
-	var fop_home = WScript.ScriptFullName;
-	fop_home = fop_home.substring(0, fop_home.length
-								  - WScript.ScriptName.length - 1);
-	if (config.Exists("FOP_HOME")) {
-	  config.Remove("FOP_HOME");
-	}
-	config.Add("FOP_HOME", fop_home);
-	if (debug) {
-	  WScript.Echo("FOP_HOME dyn: " + config.Item("FOP_HOME"));
-	}
-  }
-}
-
-function get_java_cmd() {
-  var java_home = shell.ExpandEnvironmentStrings("%JAVA_HOME%");
-  javacmd = "java";
-  if (java_home != "" && typeof(java_home) != "undefined"
-	  && fs.FolderExists(java_home)) {
-	var javacmd_candidate = java_home + "\\bin\\java.exe";
-	if (fs.FileExists(javacmd_candidate)) {
-	  javacmd = javacmd_candidate;
-	}
-  }
-  if (debug) {
-	WScript.Echo("java command: " + javacmd);
-  }
-}
-
-function get_local_classpath() {
-  if (config.Exists("CLASSPATH")) {
-	local_classpath = config.Item("CLASSPATH");
-	if (debug) {
-	  WScript.Echo("local classpath: " + local_classpath);
-	}
-  }
-
-  // add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build
-  var lcp = local_classpath;
-  local_classpath = config.Item("FOP_HOME") + "\\build\\fop.jar;"
-	+ config.Item("FOP_HOME") + "\\build\\fop-sandbox.jar;"
-	+ config.Item("FOP_HOME") + "\\build\\fop-hyph.jar";
-  if (lcp != "") {
-	local_classpath += ";" + lcp;
-  }
-  if (debug) {
-	WScript.Echo("local classpath: " + local_classpath);
-  }
-
-  // add in the dependency .jar files, which reside in $FOP_HOME/lib
-  var libdir_name = config.Item("FOP_HOME") + "\\lib";
-  var dirlibs;
-  if (fs.FolderExists(libdir_name)) {
-	dirlibs = fs.GetFolder(libdir_name).Files;
-	var e = new Enumerator(dirlibs);
-	for (; !e.atEnd(); e.moveNext()) {
-	  if (e.item().Name.match("\.jar$")) {
-		local_classpath = libdir_name + "\\" + e.item().Name + ";" + local_classpath;
-	  }
-	}
-	if (debug) {
-	  WScript.Echo("local classpath: " + local_classpath);
-	}
-  }
-
-  // add in user-defined hyphenation JARs
-  if (config.Exists("FOP_HYPHENATION_PATH")) {
-	local_classpath += ";" + config.Item("FOP_HYPHENATION_PATH");
-	if (debug) {
-	  WScript.Echo("local classpath: " + local_classpath);
-	}
-  }
-}
-
-// Execute fop via shell.Exec
-function fop_exec() {
-  var fop_exec_command = "\"" + javacmd + "\" "
-	+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
-	+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
-	+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
-	+ "-classpath \"" + local_classpath + "\" "
-	+ (config.Exists("FOP_OPTS")?config.Item("FOP_OPTS"):"")
-	+ "org.apache.fop.cli.Main " + fop_exec_args;
-  if (debug || fop_exec_debug) {
-	WScript.Echo(fop_exec_command);
-  }
-
-  var fop_run = shell.Exec(fop_exec_command);
-  while (true) {
-	while (!fop_run.StdOut.AtEndOfStream) {
-	  WScript.Echo(fop_run.StdOut.ReadLine());
-	}
-	while (!fop_run.StdErr.AtEndOfStream) {
-	  WScript.Echo(fop_run.StdErr.ReadLine());
-	}
-	if (fop_run.Status == 1) {
-	  break;
-	}
-	WScript.Sleep(100);
-  }
-  if (debug) {
-	WScript.Echo("exit status: " + fop_run.ExitCode);
-  }
-}
-
-// Execute fop via shell.Run
-function fop_run() {
-  var fop_exec_command = "cmd /" + (keep_open?"K":"C") + " \""
-	+ "\"" + javacmd + "\" " 
-	+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
-	+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
-	+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
-	+ "-classpath \"" + local_classpath + "\" "
-	+ (config.Exists("FOP_OPTS")?config.Item("FOP_OPTS") + " ":"")
-	+ "org.apache.fop.cli.Main " + fop_exec_args + "\"";
-  if (debug || fop_exec_debug) {
-	WScript.Echo(fop_exec_command);
-  }
-  var exit_code = shell.Run(fop_exec_command, 1, 1);
-  if (debug) {
-	WScript.Echo("exit status: " + exit_code);
-  } else {
-	if (exit_code != 0) {
-	  WScript.Echo("A FOP error occurred (FOP exit status: " + exit_code + ")\n"
-	               + "Use option --keepopen to see FOP's output\n"
-                       + "(that is two dashes)");
-	}
-  }
-}
-
-function get_log_choice() {
-  // The default commons logger for JDK1.4 is JDK1.4Logger.
-  // To use a different logger, uncomment the one desired below
-  if (!config.Exists("LOGCHOICE")) {
-	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog\"");
-	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog\"");
-	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger\"");
-	if (debug && config.Exists("LOGCHOICE")) {
-	  WScript.Echo("LOGCHOICE script: " + config.Item("LOGCHOICE"));
-	}
-  }
-}
-
-function get_log_level() {
-  // Logging levels
-  // Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
-  // To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%/JRE/LIB/logging.properties 
-  // file instead.
-  // Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
-  if (!config.Exists("LOGLEVEL")) {
-	// config.Add("LOGLEVEL","\"-Dorg.apache.commons.logging.simplelog.defaultlog=INFO\"");
-	if (debug && config.Exists("LOGLEVEL")) {
-	  WScript.Echo("LOGLEVEL script: " + config.Item("LOGLEVEL"));
-	}
-  }
-}
-
-var shell = WScript.CreateObject("WScript.Shell");
-var fs = WScript.CreateObject("Scripting.FileSystemObject");
-
-// configuration
-var config = new ActiveXObject("Scripting.Dictionary");
-
-read_args();
-read_environment();
-if (!no_config) {
-  // read user and system-wide fop configurations
-  var spec = shell.SpecialFolders;
-  var dts = new Array("Desktop", "AllUsersDesktop");
-  for (i in dts) {
-	read_desktop(spec(dts[i]));
-  }
-  // read user and system-wide registry
-  var rks = new Array("HKCU", "HKLM");
-  for (i in rks) {
-	read_registry(rks[i]);
-  }
-}
-
-get_fop_home();
-get_log_choice();
-get_log_level();
-var javacmd = "";
-get_java_cmd();
-var local_classpath = "";
-get_local_classpath();
-
-// Show script help if requested
-if (show_help) {
-  // fop_exec_args = "";
-  keep_open = true;
-  WScript.Echo(help_text);
-}
-
-// fop_exec();
-fop_run();
+//   Licensed to the Apache Software Foundation (ASF) under one or more
+//   contributor license agreements.  See the NOTICE file distributed with
+//   this work for additional information regarding copyright ownership.
+//   The ASF licenses this file to You under the Apache License, Version 2.0
+//   (the "License"); you may not use this file except in compliance with
+//   the License.  You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   $Id: fop.js 1734671 2016-03-12 05:39:53Z gadams $ -->
+
+// jscript to run FOP, adapted from the Jakarta-Ant project.
+
+// rpm_mode is irrelevant on Windows
+// var rpm_mode=true;
+var fop_exec_args = "";
+var no_config=false;
+var fop_exec_debug=false;
+var debug=false;
+var keep_open=false;
+var show_help=false;
+
+var config_wanted = new Array("FOP_HOME", "CLASSPATH", "FOP_HYPHENATION_PATH", "FOP_OPTS", "JAVA_OPTS", "LOGCHOICE", "LOGLEVEL");
+
+// parse command-line arguments
+function read_args() {
+  var args = WScript.Arguments;
+  var named = new ActiveXObject("Scripting.Dictionary");
+  for (i = 0; i < args.length; i++) {
+	switch(args(i)) {
+	case "--debug":
+	  debug=true;
+	  break;
+	case "--execdebug":
+	  fop_exec_debug=true;
+	  break;
+	case "--keepopen":
+	  keep_open=true;
+	  break;
+	case "--noconfig":
+	  no_config=true;
+	  break;
+	case "-h":
+	case "--help":
+	case "--h":
+	case "-help":
+	  show_help=true;
+	  // fop_exec_args=fop_exec_args + " -h";
+	  break;
+	default:
+	  fop_exec_args=fop_exec_args + " " + args(i);
+	}
+  }
+  if (debug) {
+	WScript.Echo("debug: " + debug);
+	WScript.Echo("execdebug: " + fop_exec_debug);
+ 	WScript.Echo("keepopen: " + keep_open);
+ 	WScript.Echo("noconfig: " + no_config);
+	WScript.Echo("help: " + show_help);
+ 	WScript.Echo("fop arguments: " + fop_exec_args);
+  }
+}
+
+var help_text="Usage:\n"
+  + WScript.ScriptFullName + " [script options] [FOP options]\n"
+  + "Script Options:\n"
+  + "  --help, -h             print this message and FOP help\n"
+  + "  --debug                print debugging information for this launch script\n"
+  + "  --execdebug            print FOP exec line generated by this launch script\n"
+  + "  --keepopen             keep FOP's command window open\n"
+  + "  --noconfig             suppress reading of configuration file and registry";
+
+function read_environment() {
+  for (i in config_wanted) {
+	if (!config.Exists(config_wanted[i])) {
+		var env_var_string = "%" + config_wanted[i] + "%";
+		var env_var = shell.ExpandEnvironmentStrings(env_var_string);
+		if (env_var != "" && env_var != env_var_string) {
+		  config.Add(config_wanted[i], env_var);
+		  if (debug) {
+			WScript.Echo(config_wanted[i] + " env: "
+						 + config.Item(config_wanted[i]));
+		  }
+		}
+	}
+  }
+}
+
+function read_desktop(dtname) {
+  if (fs.FolderExists(dtname)) {
+	var fopname = fs.GetFolder(dtname).ParentFolder.Path
+	  + "\\Application Data\\Fop";
+	if (fs.FolderExists(fopname)) {
+	  var fop_conf_name = fs.GetFolder(fopname).Path + "\\fop.conf";
+	  if (fs.FileExists(fop_conf_name)) {
+		// source fop_conf_file
+		var conf_file = fs.openTextFile(fs.GetFile(fop_conf_name));
+		var conf_lines = new ActiveXObject("Scripting.Dictionary");
+		while (!conf_file.AtEndOfStream) {
+		  var line = conf_file.ReadLine();
+		  var m = line.match(/(.+?)=(.+)/);
+		  if (m != null) {
+			conf_lines.Add(m[1], m[2]);
+		  }
+		}
+		for (j in config_wanted) {
+		  if (!config.Exists(config_wanted[j])
+			  && conf_lines.Exists(config_wanted[j])) {
+			config.Add(config_wanted[j], conf_lines.Item(config_wanted[j]));
+			if (debug) {
+			  WScript.Echo(config_wanted[j] + " " + dts[i] + ": "
+						   + config.Item(config_wanted[i]));
+			}
+		  }
+		}
+	  }
+	}
+  }
+}
+
+function read_registry(section) {
+  for (j in config_wanted) {
+	if (!config.Exists(config_wanted[j])) {
+	  var reg_var;
+	  try {
+		reg_var = shell.RegRead(section + "\\Software\\Fop\\"
+								+ config_wanted[j]);
+		config.Add(config_wanted[j], reg_var);
+		if (debug) {
+		  WScript.Echo(config_wanted[j] + " " + rks[i] + ": "
+					   + config.Item(config_wanted[j]));
+		}
+	  } catch(e) {}
+	}
+  }
+}
+
+// construct FOP_HOME from the script folder
+function get_fop_home() {
+  if (!config.Exists("FOP_HOME")
+	  || !fs.FolderExists(config.Item("FOP_HOME"))) {
+	var fop_home = WScript.ScriptFullName;
+	fop_home = fop_home.substring(0, fop_home.length
+								  - WScript.ScriptName.length - 1);
+	if (config.Exists("FOP_HOME")) {
+	  config.Remove("FOP_HOME");
+	}
+	config.Add("FOP_HOME", fop_home);
+	if (debug) {
+	  WScript.Echo("FOP_HOME dyn: " + config.Item("FOP_HOME"));
+	}
+  }
+}
+
+function get_java_cmd() {
+  var java_home = shell.ExpandEnvironmentStrings("%JAVA_HOME%");
+  javacmd = "java";
+  if (java_home != "" && typeof(java_home) != "undefined"
+	  && fs.FolderExists(java_home)) {
+	var javacmd_candidate = java_home + "\\bin\\java.exe";
+	if (fs.FileExists(javacmd_candidate)) {
+	  javacmd = javacmd_candidate;
+	}
+  }
+  if (debug) {
+	WScript.Echo("java command: " + javacmd);
+  }
+}
+
+function get_local_classpath() {
+  if (config.Exists("CLASSPATH")) {
+	local_classpath = config.Item("CLASSPATH");
+	if (debug) {
+	  WScript.Echo("local classpath: " + local_classpath);
+	}
+  }
+
+  // add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build
+  var lcp = local_classpath;
+  local_classpath = config.Item("FOP_HOME") + "\\build\\fop.jar;"
+	+ config.Item("FOP_HOME") + "\\build\\fop-sandbox.jar;"
+	+ config.Item("FOP_HOME") + "\\build\\fop-hyph.jar";
+  if (lcp != "") {
+	local_classpath += ";" + lcp;
+  }
+  if (debug) {
+	WScript.Echo("local classpath: " + local_classpath);
+  }
+
+  // add in the dependency .jar files, which reside in $FOP_HOME/lib
+  var libdir_name = config.Item("FOP_HOME") + "\\lib";
+  var dirlibs;
+  if (fs.FolderExists(libdir_name)) {
+	dirlibs = fs.GetFolder(libdir_name).Files;
+	var e = new Enumerator(dirlibs);
+	for (; !e.atEnd(); e.moveNext()) {
+	  if (e.item().Name.match("\.jar$")) {
+		local_classpath = libdir_name + "\\" + e.item().Name + ";" + local_classpath;
+	  }
+	}
+	if (debug) {
+	  WScript.Echo("local classpath: " + local_classpath);
+	}
+  }
+
+  // add in user-defined hyphenation JARs
+  if (config.Exists("FOP_HYPHENATION_PATH")) {
+	local_classpath += ";" + config.Item("FOP_HYPHENATION_PATH");
+	if (debug) {
+	  WScript.Echo("local classpath: " + local_classpath);
+	}
+  }
+}
+
+// Execute fop via shell.Exec
+function fop_exec() {
+  var fop_exec_command = "\"" + javacmd + "\" "
+	+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+	+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+	+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
+	+ "-classpath \"" + local_classpath + "\" "
+	+ (config.Exists("FOP_OPTS")?config.Item("FOP_OPTS"):"")
+	+ "org.apache.fop.cli.Main " + fop_exec_args;
+  if (debug || fop_exec_debug) {
+	WScript.Echo(fop_exec_command);
+  }
+
+  var fop_run = shell.Exec(fop_exec_command);
+  while (true) {
+	while (!fop_run.StdOut.AtEndOfStream) {
+	  WScript.Echo(fop_run.StdOut.ReadLine());
+	}
+	while (!fop_run.StdErr.AtEndOfStream) {
+	  WScript.Echo(fop_run.StdErr.ReadLine());
+	}
+	if (fop_run.Status == 1) {
+	  break;
+	}
+	WScript.Sleep(100);
+  }
+  if (debug) {
+	WScript.Echo("exit status: " + fop_run.ExitCode);
+  }
+}
+
+// Execute fop via shell.Run
+function fop_run() {
+  var fop_exec_command = "cmd /" + (keep_open?"K":"C") + " \""
+	+ "\"" + javacmd + "\" " 
+	+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+	+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+	+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
+	+ "-classpath \"" + local_classpath + "\" "
+	+ (config.Exists("FOP_OPTS")?config.Item("FOP_OPTS") + " ":"")
+	+ "org.apache.fop.cli.Main " + fop_exec_args + "\"";
+  if (debug || fop_exec_debug) {
+	WScript.Echo(fop_exec_command);
+  }
+  var exit_code = shell.Run(fop_exec_command, 1, 1);
+  if (debug) {
+	WScript.Echo("exit status: " + exit_code);
+  } else {
+	if (exit_code != 0) {
+	  WScript.Echo("A FOP error occurred (FOP exit status: " + exit_code + ")\n"
+	               + "Use option --keepopen to see FOP's output\n"
+                       + "(that is two dashes)");
+	}
+  }
+}
+
+function get_log_choice() {
+  // The default commons logger for JDK1.4 is JDK1.4Logger.
+  // To use a different logger, uncomment the one desired below
+  if (!config.Exists("LOGCHOICE")) {
+	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog\"");
+	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog\"");
+	// config.Add("LOGCHOICE","\"-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger\"");
+	if (debug && config.Exists("LOGCHOICE")) {
+	  WScript.Echo("LOGCHOICE script: " + config.Item("LOGCHOICE"));
+	}
+  }
+}
+
+function get_log_level() {
+  // Logging levels
+  // Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
+  // To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%/JRE/LIB/logging.properties 
+  // file instead.
+  // Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
+  if (!config.Exists("LOGLEVEL")) {
+	// config.Add("LOGLEVEL","\"-Dorg.apache.commons.logging.simplelog.defaultlog=INFO\"");
+	if (debug && config.Exists("LOGLEVEL")) {
+	  WScript.Echo("LOGLEVEL script: " + config.Item("LOGLEVEL"));
+	}
+  }
+}
+
+var shell = WScript.CreateObject("WScript.Shell");
+var fs = WScript.CreateObject("Scripting.FileSystemObject");
+
+// configuration
+var config = new ActiveXObject("Scripting.Dictionary");
+
+read_args();
+read_environment();
+if (!no_config) {
+  // read user and system-wide fop configurations
+  var spec = shell.SpecialFolders;
+  var dts = new Array("Desktop", "AllUsersDesktop");
+  for (i in dts) {
+	read_desktop(spec(dts[i]));
+  }
+  // read user and system-wide registry
+  var rks = new Array("HKCU", "HKLM");
+  for (i in rks) {
+	read_registry(rks[i]);
+  }
+}
+
+get_fop_home();
+get_log_choice();
+get_log_level();
+var javacmd = "";
+get_java_cmd();
+var local_classpath = "";
+get_local_classpath();
+
+// Show script help if requested
+if (show_help) {
+  // fop_exec_args = "";
+  keep_open = true;
+  WScript.Echo(help_text);
+}
+
+// fop_exec();
+fop_run();