From dce0278318e4af377bc18ba50bfd5b707a07bce4 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 26 Apr 2017 03:09:18 +0000 Subject: dvipdfm-x: support more length units (from Paul Vojta) git-svn-id: svn://tug.org/texlive/trunk@44053 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/dvipdfmx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Build/source/texk/dvipdfm-x/dvipdfmx.c') diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index bb8e56730cd..f262951deac 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -257,7 +257,11 @@ read_length (double *vp, const char **pp, const char *endptr) #define K_UNIT__CM 2 #define K_UNIT__MM 3 #define K_UNIT__BP 4 - "pt", "in", "cm", "mm", "bp", +#define K_UNIT__PC 5 +#define K_UNIT__DD 6 +#define K_UNIT__CC 7 +#define K_UNIT__SP 8 + "pt", "in", "cm", "mm", "bp", "pc", "dd", "cc", "sp", NULL }; int k, error = 0; @@ -292,6 +296,10 @@ read_length (double *vp, const char **pp, const char *endptr) case K_UNIT__CM: u *= 72.0 / 2.54 ; break; case K_UNIT__MM: u *= 72.0 / 25.4 ; break; case K_UNIT__BP: u *= 1.0 ; break; + case K_UNIT__PC: u *= 12.0 * 72.0 / 72.27 ; break; + case K_UNIT__DD: u *= 1238.0 / 1157.0 * 72.0 / 72.27 ; break; + case K_UNIT__CC: u *= 12.0 * 1238.0 / 1157.0 * 72.0 / 72.27 ; break; + case K_UNIT__SP: u *= 72.0 / (72.27 * 65536) ; break; default: WARN("Unknown unit of measure: %s", q); error = -1; -- cgit v1.2.3