From 6e3a6d6ff02209d1efe7c767d15925a05d610e41 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Fri, 1 Jul 2016 13:33:31 +0200
Subject: [PATCH] PPD: jopt() moved to PPD::PJL

---
 ppd/PPD/PJL.pm      | 13 +++++++++++++
 ppd/gen-nessie-xcpt | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ppd/PPD/PJL.pm b/ppd/PPD/PJL.pm
index ae0b66f..4019e89 100644
--- a/ppd/PPD/PJL.pm
+++ b/ppd/PPD/PJL.pm
@@ -1,5 +1,8 @@
 package PPD::PJL;
 
+use Exporter 'import';
+our @EXPORT = qw(jopt);
+
 use PPD;
 
 sub add_jcl($) {
@@ -10,4 +13,14 @@ sub add_jcl($) {
 	set('JCLEnd', '<1B>%-12345X@PJL EOJ<0A><1B>%-12345X<0A>');
 }
 
+sub jopt {
+	my $out = "";
+	while (@_) {
+		my $key = shift @_;
+		my $val = shift @_;
+		$out .= sprintf('@PJL SET %s=%s<0A>', $key, $val);
+	}
+	return $out;
+}
+
 42;
diff --git a/ppd/gen-nessie-xcpt b/ppd/gen-nessie-xcpt
index d7a4ab5..e489c89 100755
--- a/ppd/gen-nessie-xcpt
+++ b/ppd/gen-nessie-xcpt
@@ -31,17 +31,6 @@ set('cupsFilter', 'application/vnd.cups-pdf 0 /aux/root/xcpt');
 set('ColorDevice', 1);
 set('DefaultColorSpace', 'CMYK');
 
-# FIXME: Librarize
-sub jopt {
-	my $out = "";
-	while (@_) {
-		my $key = shift @_;
-		my $val = shift @_;
-		$out .= sprintf('@PJL SET %s=%s<0A>', $key, $val);
-	}
-	return $out;
-}
-
 define_ui_group({ Key => 'Basic', Name => 'Basic options' });
 
 option({
-- 
GitLab