diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-26 03:09:18 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-26 03:09:18 +0000 |
commit | dce0278318e4af377bc18ba50bfd5b707a07bce4 (patch) | |
tree | fc672751ac5156e3fb3147bb94ff6cca55a76b99 /Build/source/texk/dvipdfm-x/dvi.c | |
parent | e414f69f002041303b5360fd025e4a206204b413 (diff) |
dvipdfm-x: support more length units (from Paul Vojta)
git-svn-id: svn://tug.org/texlive/trunk@44053 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/dvi.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/dvi.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 69c9e85acb5..29b07a67a3c 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -2157,7 +2157,11 @@ read_length (double *vp, double mag, 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; @@ -2193,6 +2197,10 @@ read_length (double *vp, double mag, 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; |