Skip to content

Commit f03874f

Browse files
terryburtonterryburton
committed
Fix missing justify option in {x,y}align input guards
1 parent 7a55f00 commit f03874f

5 files changed

Lines changed: 193 additions & 12 deletions

File tree

‎CHANGES‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2026-03-26
2+
3+
* The text{x,y}align=justify options were fixed for the linear and matrix renderers.
4+
5+
16
2026-03-25
27

38
* The text processing for the Code 39 Extended and Code 93 Extended encoders was fixed.

‎src/renlinear.ps.src‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ dup /rendertext dup /uk.co.terryburton.bwipp findresource put
4444
begin
4545

4646
/renlinear.xalignopts <<
47-
/offleft dup /left dup /center dup /right dup /offright dup
47+
/offleft dup /left dup /center dup /right dup /offright dup /justify dup
4848
>> readonly def
4949

5050
/renlinear.yalignopts <<
51-
/above dup /top dup /center dup /bottom dup /below dup
51+
/above dup /top dup /center dup /bottom dup /below dup /justify dup
5252
>> readonly def
5353

5454
/renlinear.directionoptions <<
@@ -134,13 +134,13 @@ begin
134134
%
135135
textxalign (unset) ne {
136136
//renlinear.xalignopts textxalign known not {
137-
/bwipp.renlinearBadTextxalign (textxalign must be offleft, left, center, right or offright) //raiseerror exec
137+
/bwipp.renlinearBadTextxalign (textxalign must be offleft, left, center, right, offright or justify) //raiseerror exec
138138
} if
139139
} if
140140

141141
textyalign (unset) ne {
142142
//renlinear.yalignopts textyalign known not {
143-
/bwipp.renlinearBadTextyalign (textyalign must be above, top, center, bottom or below) //raiseerror exec
143+
/bwipp.renlinearBadTextyalign (textyalign must be above, top, center, bottom, below or justify) //raiseerror exec
144144
} if
145145
} if
146146

@@ -153,11 +153,11 @@ begin
153153
} if
154154

155155
//renlinear.xalignopts extratextxalign known not {
156-
/bwipp.renlinearBadExtratextxalign (extratextxalign must be offleft, left, center, right or offright) //raiseerror exec
156+
/bwipp.renlinearBadExtratextxalign (extratextxalign must be offleft, left, center, right, offright or justify) //raiseerror exec
157157
} if
158158

159159
//renlinear.yalignopts extratextyalign known not {
160-
/bwipp.renlinearBadExtratextyalign (extratextyalign must be above, top, center, bottom or below) //raiseerror exec
160+
/bwipp.renlinearBadExtratextyalign (extratextyalign must be above, top, center, bottom, below or justify) //raiseerror exec
161161
} if
162162

163163
//renlinear.directionoptions extratextdirection known not {

‎src/renmatrix.ps.src‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ begin
4949
(setup.define) //renmatrix.before exec
5050

5151
/renmatrix.xalignopts <<
52-
/offleft dup /left dup /center dup /right dup /offright dup
52+
/offleft dup /left dup /center dup /right dup /offright dup /justify dup
5353
>> readonly def
5454

5555
/renmatrix.yalignopts <<
56-
/above dup /top dup /center dup /bottom dup /below dup
56+
/above dup /top dup /center dup /bottom dup /below dup /justify dup
5757
>> readonly def
5858

5959
/renmatrix.directionoptions <<
@@ -224,13 +224,13 @@ begin
224224

225225
textxalign (unset) ne {
226226
//renmatrix.xalignopts textxalign known not {
227-
/bwipp.renmatrixBadTextxalign (textxalign must be offleft, left, center, right or offright) //raiseerror exec
227+
/bwipp.renmatrixBadTextxalign (textxalign must be offleft, left, center, right, offright or justify) //raiseerror exec
228228
} if
229229
} if
230230

231231
textyalign (unset) ne {
232232
//renmatrix.yalignopts textyalign known not {
233-
/bwipp.renmatrixBadTextyalign (textyalign must be above, top, center, bottom or below) //raiseerror exec
233+
/bwipp.renmatrixBadTextyalign (textyalign must be above, top, center, bottom, below or justify) //raiseerror exec
234234
} if
235235
} if
236236

@@ -243,11 +243,11 @@ begin
243243
} if
244244

245245
//renmatrix.xalignopts extratextxalign known not {
246-
/bwipp.renmatrixBadExtratextxalign (extratextxalign must be offleft, left, center, right or offright) //raiseerror exec
246+
/bwipp.renmatrixBadExtratextxalign (extratextxalign must be offleft, left, center, right, offright or justify) //raiseerror exec
247247
} if
248248

249249
//renmatrix.yalignopts extratextyalign known not {
250-
/bwipp.renmatrixBadExtratextyalign (extratextyalign must be above, top, center, bottom or below) //raiseerror exec
250+
/bwipp.renmatrixBadExtratextyalign (extratextyalign must be above, top, center, bottom, below or justify) //raiseerror exec
251251
} if
252252

253253
//renmatrix.directionoptions extratextdirection known not {

‎tests/ps_tests/renlinear.ps.test‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,94 @@
277277
>> renlinear
278278
} /bwipp.renlinearBadExtratextyalign isError
279279

280+
{
281+
0 0 moveto
282+
<<
283+
/ren /renlinear
284+
/sbs [1]
285+
/bhs [1]
286+
/bbs [0]
287+
/opt << /includetext true /alttext (TEST) /textxalign /justify /textdirection /forward >>
288+
>> renlinear true
289+
} true isEqual
290+
291+
{
292+
0 0 moveto
293+
<<
294+
/ren /renlinear
295+
/sbs [1]
296+
/bhs [1]
297+
/bbs [0]
298+
/opt << /includetext true /alttext (TEST) /textxalign /justify /textdirection /upward >>
299+
>> renlinear
300+
} /bwipp.textxjustify isError
301+
302+
{
303+
0 0 moveto
304+
<<
305+
/ren /renlinear
306+
/sbs [1]
307+
/bhs [1]
308+
/bbs [0]
309+
/opt << /includetext true /alttext (TEST) /textyalign /justify /textdirection /upward >>
310+
>> renlinear true
311+
} true isEqual
312+
313+
{
314+
0 0 moveto
315+
<<
316+
/ren /renlinear
317+
/sbs [1]
318+
/bhs [1]
319+
/bbs [0]
320+
/opt << /includetext true /alttext (TEST) /textyalign /justify /textdirection /forward >>
321+
>> renlinear
322+
} /bwipp.textyjustify isError
323+
324+
{
325+
0 0 moveto
326+
<<
327+
/ren /renlinear
328+
/sbs [1]
329+
/bhs [1]
330+
/bbs [0]
331+
/opt << /extratext (EXTRA) /extratextxalign /justify /extratextdirection /forward >>
332+
>> renlinear true
333+
} true isEqual
334+
335+
{
336+
0 0 moveto
337+
<<
338+
/ren /renlinear
339+
/sbs [1]
340+
/bhs [1]
341+
/bbs [0]
342+
/opt << /extratext (EXTRA) /extratextxalign /justify /extratextdirection /upward >>
343+
>> renlinear
344+
} /bwipp.extratextxjustify isError
345+
346+
{
347+
0 0 moveto
348+
<<
349+
/ren /renlinear
350+
/sbs [1]
351+
/bhs [1]
352+
/bbs [0]
353+
/opt << /extratext (EXTRA) /extratextyalign /justify /extratextdirection /upward >>
354+
>> renlinear true
355+
} true isEqual
356+
357+
{
358+
0 0 moveto
359+
<<
360+
/ren /renlinear
361+
/sbs [1]
362+
/bhs [1]
363+
/bbs [0]
364+
/opt << /extratext (EXTRA) /extratextyalign /justify /extratextdirection /forward >>
365+
>> renlinear
366+
} /bwipp.extratextyjustify isError
367+
280368
{
281369
0 0 moveto
282370
<<

‎tests/ps_tests/renmatrix.ps.test‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,94 @@
403403
>> renmatrix
404404
} /bwipp.renmatrixBadExtratextyalign isError
405405

406+
{
407+
0 0 moveto
408+
<<
409+
/ren /renmatrix
410+
/pixs [1]
411+
/pixx 1
412+
/pixy 1
413+
/opt << /includetext true /alttext (TEST) /textxalign /justify /textdirection /forward >>
414+
>> renmatrix true
415+
} true isEqual
416+
417+
{
418+
0 0 moveto
419+
<<
420+
/ren /renmatrix
421+
/pixs [1]
422+
/pixx 1
423+
/pixy 1
424+
/opt << /includetext true /alttext (TEST) /textxalign /justify /textdirection /upward >>
425+
>> renmatrix
426+
} /bwipp.textxjustify isError
427+
428+
{
429+
0 0 moveto
430+
<<
431+
/ren /renmatrix
432+
/pixs [1]
433+
/pixx 1
434+
/pixy 1
435+
/opt << /includetext true /alttext (TEST) /textyalign /justify /textdirection /upward >>
436+
>> renmatrix true
437+
} true isEqual
438+
439+
{
440+
0 0 moveto
441+
<<
442+
/ren /renmatrix
443+
/pixs [1]
444+
/pixx 1
445+
/pixy 1
446+
/opt << /includetext true /alttext (TEST) /textyalign /justify /textdirection /forward >>
447+
>> renmatrix
448+
} /bwipp.textyjustify isError
449+
450+
{
451+
0 0 moveto
452+
<<
453+
/ren /renmatrix
454+
/pixs [1]
455+
/pixx 1
456+
/pixy 1
457+
/opt << /extratext (EXTRA) /extratextxalign /justify /extratextdirection /forward >>
458+
>> renmatrix true
459+
} true isEqual
460+
461+
{
462+
0 0 moveto
463+
<<
464+
/ren /renmatrix
465+
/pixs [1]
466+
/pixx 1
467+
/pixy 1
468+
/opt << /extratext (EXTRA) /extratextxalign /justify /extratextdirection /upward >>
469+
>> renmatrix
470+
} /bwipp.extratextxjustify isError
471+
472+
{
473+
0 0 moveto
474+
<<
475+
/ren /renmatrix
476+
/pixs [1]
477+
/pixx 1
478+
/pixy 1
479+
/opt << /extratext (EXTRA) /extratextyalign /justify /extratextdirection /upward >>
480+
>> renmatrix true
481+
} true isEqual
482+
483+
{
484+
0 0 moveto
485+
<<
486+
/ren /renmatrix
487+
/pixs [1]
488+
/pixx 1
489+
/pixy 1
490+
/opt << /extratext (EXTRA) /extratextyalign /justify /extratextdirection /forward >>
491+
>> renmatrix
492+
} /bwipp.extratextyjustify isError
493+
406494
{
407495
0 0 moveto
408496
<<

0 commit comments

Comments
 (0)