-
Notifications
You must be signed in to change notification settings - Fork 0
/
cups-konica-minolta-ppd-to-ipp-mappings.patch
203 lines (194 loc) · 8.94 KB
/
cups-konica-minolta-ppd-to-ipp-mappings.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 40881cd39..e43ab7738 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -1727,7 +1727,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
if ((duplex = ppdFindOption(ppd, "JCLDuplex")) == NULL)
if ((duplex = ppdFindOption(ppd, "EFDuplex")) == NULL)
if ((duplex = ppdFindOption(ppd, "EFDuplexing")) == NULL)
- duplex = ppdFindOption(ppd, "KD03Duplex");
+ if ((duplex = ppdFindOption(ppd, "KMDuplex")) == NULL)
+ duplex = ppdFindOption(ppd, "KD03Duplex");
if (duplex)
{
@@ -1738,15 +1739,18 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
i --, choice ++)
{
if ((!_cups_strcasecmp(choice->choice, "None") ||
- !_cups_strcasecmp(choice->choice, "False")) && !pc->sides_1sided)
+ !_cups_strcasecmp(choice->choice, "False") ||
+ !_cups_strcasecmp(choice->choice, "Single")) && !pc->sides_1sided)
pc->sides_1sided = strdup(choice->choice);
else if ((!_cups_strcasecmp(choice->choice, "DuplexNoTumble") ||
!_cups_strcasecmp(choice->choice, "LongEdge") ||
- !_cups_strcasecmp(choice->choice, "Top")) && !pc->sides_2sided_long)
+ !_cups_strcasecmp(choice->choice, "Top") ||
+ !_cups_strcasecmp(choice->choice, "Double")) && !pc->sides_2sided_long)
pc->sides_2sided_long = strdup(choice->choice);
else if ((!_cups_strcasecmp(choice->choice, "DuplexTumble") ||
!_cups_strcasecmp(choice->choice, "ShortEdge") ||
- !_cups_strcasecmp(choice->choice, "Bottom")) &&
+ !_cups_strcasecmp(choice->choice, "Bottom") ||
+ !_cups_strcasecmp(choice->choice, "Booklet")) &&
!pc->sides_2sided_short)
pc->sides_2sided_short = strdup(choice->choice);
}
@@ -1887,6 +1891,27 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
pwg_add_finishing(pc->finishings, IPP_FINISHINGS_STAPLE_DUAL_LEFT, "StapleLocation", "DualLandscape");
}
+ if ((ppd_option = ppdFindOption(ppd, "StapleOption")) != NULL)
+ {
+ ppd_attr = ppdFindAttr(ppd, "DefaultFinisher", NULL);
+ if (ppd_attr != NULL && _cups_strcasecmp(ppd_attr->value, "none"))
+ {
+
+ /*
+ * Add (Konica Minolta) staple finishings...
+ */
+
+ if (ppdFindChoice(ppd_option, "1StapleLeft"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_STAPLE_TOP_LEFT, "StapleOption", "1StapleLeft");
+ if (ppdFindChoice(ppd_option, "1StapleRight"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_STAPLE_TOP_RIGHT, "StapleOption", "1StapleRight");
+ if (ppdFindChoice(ppd_option, "1StapleZeroLeft"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_STAPLE_BOTTOM_LEFT, "StapleOption", "1StapleZeroLeft");
+ if (ppdFindChoice(ppd_option, "2Staples"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_STAPLE_DUAL_LEFT, "StapleOptionN", "2Staples");
+ }
+ }
+
if ((ppd_option = ppdFindOption(ppd, "RIPunch")) != NULL)
{
/*
@@ -1913,6 +1938,24 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
pwg_add_finishing(pc->finishings, IPP_FINISHINGS_PUNCH_QUAD_TOP, "RIPunch", "Upper4");
}
+ if ((ppd_option = ppdFindOption(ppd, "PunchOption")) != NULL)
+ {
+ ppd_attr = ppdFindAttr(ppd, "DefaultPunchOption", NULL);
+ if (ppd_attr != NULL && _cups_strcasecmp(ppd_attr->value, "none"))
+ {
+ /*
+ * Add (Konica Minolta) punch finishings...
+ */
+
+ if (ppdFindChoice(ppd_option, "2holes"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_PUNCH_DUAL_LEFT, "PunchOption", "2holes");
+ if (ppdFindChoice(ppd_option, "3holes"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_PUNCH_TRIPLE_LEFT, "PunchOption", "3holes");
+ if (ppdFindChoice(ppd_option, "4holes"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_PUNCH_QUAD_LEFT, "PunchOption", "4holes");
+ }
+ }
+
if ((ppd_option = ppdFindOption(ppd, "BindEdge")) != NULL)
{
/*
@@ -1929,6 +1972,22 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
pwg_add_finishing(pc->finishings, IPP_FINISHINGS_BIND_BOTTOM, "BindEdge", "Bottom");
}
+ if ((ppd_option = ppdFindOption(ppd, "Binding")) != NULL)
+ {
+ /*
+ * Add (Konica Minolta) bind finishings...
+ */
+
+ if (ppdFindChoice(ppd_option, "LeftBinding"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_BIND_LEFT, "Binding", "LeftBinding");
+ if (ppdFindChoice(ppd_option, "RightBinding"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_BIND_RIGHT, "Binding", "RightBinding");
+ if (ppdFindChoice(ppd_option, "TopBinding"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_BIND_TOP, "Binding", "TopBinding");
+ if (ppdFindChoice(ppd_option, "BottomBinding"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_BIND_BOTTOM, "Binding", "BottomBinding");
+ }
+
if ((ppd_option = ppdFindOption(ppd, "FoldType")) != NULL)
{
/*
@@ -1961,6 +2020,24 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
pwg_add_finishing(pc->finishings, IPP_FINISHINGS_FOLD_LETTER, "RIFoldType", "OutsideTwoFold");
}
+ if ((ppd_option = ppdFindOption(ppd, "Fold")) != NULL)
+ {
+ ppd_attr = ppdFindAttr(ppd, "DefaultZFoldPunch", NULL);
+ if (ppd_attr != NULL && _cups_strcasecmp(ppd_attr->value, "none"))
+ {
+ /*
+ * Add (Konica Minolta) fold finishings...
+ */
+
+ if (ppdFindChoice(ppd_option, "TriFold"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_FOLD_Z, "Fold", "TriFold");
+ if (ppdFindChoice(ppd_option, "HalfFold"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_FOLD_HALF, "Fold", "HalfFold");
+ if (ppdFindChoice(ppd_option, "TFoldOne"))
+ pwg_add_finishing(pc->finishings, IPP_FINISHINGS_FOLD_LETTER, "Fold", "TFoldOne");
+ }
+ }
+
if (cupsArrayCount(pc->finishings) == 0)
{
cupsArrayDelete(pc->finishings);
diff --git a/filter/common.c b/filter/common.c
index 1d3c73736..249b9dcfd 100644
--- a/filter/common.c
+++ b/filter/common.c
@@ -186,6 +186,8 @@ SetCommonOptions(
ppdIsMarked(ppd, "JCLDuplex", "DuplexTumble") ||
ppdIsMarked(ppd, "EFDuplex", "DuplexNoTumble") ||
ppdIsMarked(ppd, "EFDuplex", "DuplexTumble") ||
+ ppdIsMarked(ppd, "KMDuplex", "DuplexNoTumble") ||
+ ppdIsMarked(ppd, "KMDuplex", "DuplexTumble") ||
ppdIsMarked(ppd, "KD03Duplex", "DuplexNoTumble") ||
ppdIsMarked(ppd, "KD03Duplex", "DuplexTumble"))
Duplex = 1;
diff --git a/filter/pstops.c b/filter/pstops.c
index 3b10ea221..7afab84d5 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -635,6 +635,10 @@ copy_comments(cups_file_t *fp, /* I - File to read from */
doc->num_options = cupsAddOption("EFDuplexing", "False",
doc->num_options, &(doc->options));
+ if (cupsGetOption("KMDuplex", doc->num_options, doc->options))
+ doc->num_options = cupsAddOption("KMDuplex", "None",
+ doc->num_options, &(doc->options));
+
if (cupsGetOption("KD03Duplex", doc->num_options, doc->options))
doc->num_options = cupsAddOption("KD03Duplex", "None",
doc->num_options, &(doc->options));
@@ -646,6 +650,7 @@ copy_comments(cups_file_t *fp, /* I - File to read from */
ppdMarkOption(ppd, "Duplex", "None");
ppdMarkOption(ppd, "EFDuplex", "None");
ppdMarkOption(ppd, "EFDuplexing", "False");
+ ppdMarkOption(ppd, "KMDuplex", "None");
ppdMarkOption(ppd, "KD03Duplex", "None");
ppdMarkOption(ppd, "JCLDuplex", "None");
}
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 5f9852e64..25f169fd2 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -4751,8 +4751,9 @@ load_ppd(cupsd_printer_t *p) /* I - Printer */
if ((duplex = ppdFindOption(ppd, "Duplex")) == NULL)
if ((duplex = ppdFindOption(ppd, "EFDuplex")) == NULL)
if ((duplex = ppdFindOption(ppd, "EFDuplexing")) == NULL)
- if ((duplex = ppdFindOption(ppd, "KD03Duplex")) == NULL)
- duplex = ppdFindOption(ppd, "JCLDuplex");
+ if ((duplex = ppdFindOption(ppd, "KMDuplex")) == NULL)
+ if ((duplex = ppdFindOption(ppd, "KD03Duplex")) == NULL)
+ duplex = ppdFindOption(ppd, "JCLDuplex");
if (duplex && duplex->num_choices > 1 &&
!ppdInstallableConflict(ppd, duplex->keyword, "DuplexTumble"))
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index d9f9c0126..3cabbacac 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1314,7 +1314,8 @@ main(int argc, /* I - Number of command-line args */
if ((option = ppdFindOption(ppd, "JCLDuplex")) == NULL)
if ((option = ppdFindOption(ppd, "EFDuplex")) == NULL)
- option = ppdFindOption(ppd, "KD03Duplex");
+ if ((option = ppdFindOption(ppd, "KMDuplex")) == NULL)
+ option = ppdFindOption(ppd, "KD03Duplex");
if (option)
_cupsLangPrintf(stdout,