Update regular expression for media size names.

Author: michaelrsweet

examples/pwg5101.1.test

@@ -3,7 +3,7 @@
 #
 # https://ftp.pwg.org/pub/pwg/candidates/cs-pwgmsn21-20230915-5101.1.pdf
 #
-# Copyright © 2022-2024 by OpenPrinting.
+# Copyright © 2022-2025 by OpenPrinting.
 # Copyright © 2007-2017 by Apple Inc.
 # Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
@@ -20,7 +20,7 @@
 #
 
 # Regular expression for PWG self-describing media size names (eek!)
-DEFINE MEDIA_REGEX "/^(choice(_((custom|na|asme|roc|oe|roll)_[a-z0-9][-a-z0-9]*_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])in|(custom|iso|jis|jpn|prc|om|roll)_[a-z0-9][-a-z0-9]*_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])mm)){2,}|(custom|na|asme|roc|oe|roll)_[a-z0-9][-a-z0-9]*_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])in|(custom|iso|jis|jpn|prc|om|roll)_[a-z0-9][-a-z0-9]*_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])mm)$$/"
+DEFINE MEDIA_REGEX "/^(((custom|na|asme|roc|oe|roll)_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x(([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])|0)in|(custom|iso|jis|jpn|prc|om|roll)_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x(([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])|0)mm|disc_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])mm)|choice(_((custom|na|asme|roc|oe|roll)_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x(([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])|0)in|(custom|iso|jis|jpn|prc|om|roll)_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x(([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])|0)mm|disc_([A-Za-z0-9][-A-Z.a-z0-9]*)_([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])x([1-9][0-9]*(\.[0-9]*[1-9])?|0\.[0-9]*[1-9])mm)){2,})$$/"
 
 
 # Simple test of media-xxx values...