summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-28 22:44:16 +0000
committerKarl Berry <karl@freefriends.org>2014-01-28 22:44:16 +0000
commita2be3e804efcd0ae25349c50199baddb24b5c343 (patch)
tree4daa73e0add0c223a15e43056a02d5cc3e0a168d /Master/texmf-dist
parent6558684eddf81be5903af36a77fad398f63bd9c5 (diff)
pdf-trans (28jan14)
git-svn-id: svn://tug.org/texlive/trunk@32809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pdf-trans/example.pdf252
-rw-r--r--Master/texmf-dist/doc/generic/pdf-trans/example.tex37
-rw-r--r--Master/texmf-dist/tex/generic/pdf-trans/pdf-trans.tex92
3 files changed, 214 insertions, 167 deletions
diff --git a/Master/texmf-dist/doc/generic/pdf-trans/example.pdf b/Master/texmf-dist/doc/generic/pdf-trans/example.pdf
index f42fa4d1792..de3c6de7071 100644
--- a/Master/texmf-dist/doc/generic/pdf-trans/example.pdf
+++ b/Master/texmf-dist/doc/generic/pdf-trans/example.pdf
@@ -951,7 +951,7 @@ stream
>>
% 11 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F53 13 0 R /F52 14 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -969,7 +969,7 @@ stream
>>
% 20 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -987,7 +987,7 @@ stream
>>
% 26 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1005,7 +1005,7 @@ stream
>>
% 32 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1023,7 +1023,7 @@ stream
>>
% 38 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1041,7 +1041,7 @@ stream
>>
% 44 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1059,7 +1059,7 @@ stream
>>
% 50 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1077,7 +1077,7 @@ stream
>>
% 57 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1095,7 +1095,7 @@ stream
>>
% 63 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1113,7 +1113,7 @@ stream
>>
% 69 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1131,7 +1131,7 @@ stream
>>
% 75 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1149,7 +1149,7 @@ stream
>>
% 81 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1167,7 +1167,7 @@ stream
>>
% 87 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1185,7 +1185,7 @@ stream
>>
% 94 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1203,7 +1203,7 @@ stream
>>
% 100 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1221,7 +1221,7 @@ stream
>>
% 106 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1239,7 +1239,7 @@ stream
>>
% 112 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1257,7 +1257,7 @@ stream
>>
% 118 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1275,7 +1275,7 @@ stream
>>
% 124 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1293,7 +1293,7 @@ stream
>>
% 131 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1311,7 +1311,7 @@ stream
>>
% 137 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1329,7 +1329,7 @@ stream
>>
% 143 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -1347,7 +1347,7 @@ stream
>>
% 149 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2162,7 +2162,7 @@ stream
296 7751 299 7796 297 7820 300 7935 302 8085 305 8130 303 8159 306 8274 308 8424 311 8469
% 155 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2180,7 +2180,7 @@ stream
>>
% 162 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2198,7 +2198,7 @@ stream
>>
% 169 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2216,7 +2216,7 @@ stream
>>
% 175 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2234,7 +2234,7 @@ stream
>>
% 181 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2252,7 +2252,7 @@ stream
>>
% 187 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2270,7 +2270,7 @@ stream
>>
% 193 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2288,7 +2288,7 @@ stream
>>
% 199 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2306,7 +2306,7 @@ stream
>>
% 206 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2324,7 +2324,7 @@ stream
>>
% 212 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2342,7 +2342,7 @@ stream
>>
% 218 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2360,7 +2360,7 @@ stream
>>
% 224 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2378,7 +2378,7 @@ stream
>>
% 230 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2388,7 +2388,7 @@ stream
(\\boxxformspec)
% 237 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2402,7 +2402,7 @@ stream
>>
% 238 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/XObject << /Fm1 236 0 R >>
/ProcSet [ /PDF /Text ]
@@ -2421,7 +2421,7 @@ stream
>>
% 245 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2439,7 +2439,7 @@ stream
>>
% 251 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2457,7 +2457,7 @@ stream
>>
% 257 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2475,7 +2475,7 @@ stream
>>
% 263 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2493,7 +2493,7 @@ stream
>>
% 269 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2511,7 +2511,7 @@ stream
>>
% 275 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2529,7 +2529,7 @@ stream
>>
% 282 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2547,7 +2547,7 @@ stream
>>
% 288 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2565,7 +2565,7 @@ stream
>>
% 294 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2583,7 +2583,7 @@ stream
>>
% 300 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2601,7 +2601,7 @@ stream
>>
% 306 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -2636,11 +2636,11 @@ ET
endstream
endobj
318 0 obj <<
-/Length 1108
+/Length 1769
>>
stream
BT
-/F53 7.9701 Tf 28.346 301.848 Td [(Each)-525(transformation)-525(expands)-525(to)-525(<box>)-525(\050\134hbox)-525(in)-525(most)-525(cases\051.)]TJ 0 -11.955 Td [(Each)-525(transformation)-525(must)-525(be)-525(followed)-525(by)-525(a)-525(<box>.)]TJ 0 -23.91 Td [(<box>)-525(states)-525(for)-525(any)-525(kind)-525(of)-525(T)]TJ 124.135 -1.716 Td [(E)]TJ 3.138 1.716 Td [(X)-525(box;)-525(\134hbox,)-525(\134vbox,)-525(\134vtop,)-525(\134box,)-525(\134copy)]TJ -127.273 -11.955 Td [(<trans>)-525(is)-525(a)-525(list)-525(of)-525(box)-525(transformations)]TJ 0 -11.955 Td [(<dimexpr>)-525(states)-525(for)-525(dimen)-525(in)-525(eTeX)-525(form)]TJ 0 -11.956 Td [(<numexpr>)-525(states)-525(for)-525(integer)-525(in)-525(eTeX)-525(form)]TJ 0 -11.955 Td [(<angle>)-525(is)-525(an)-525(integer)-525(or)-525(float-like)-525(string)]TJ 0 -11.955 Td [(<gsspec>)-525(is)-525(a)-525(literal)-525(pdf)-525(content)-525(stream)]TJ 0 -11.955 Td [(<paintop>)-525(means)-525(pdf)-525(painting)-525(operator)-525(\050S,)-525(f,)-525(B,)-525(W...\051)]TJ 0 -23.911 Td [(See)-525(the)-525(code)-525(for)-525(more.)]TJ
+/F53 7.9701 Tf 28.346 301.848 Td [(Each)-525(transformation)-525(expands)-525(to)-525(<box>)-525(\050\134hbox)-525(in)-525(most)-525(cases\051.)]TJ 0 -11.955 Td [(Each)-525(transformation)-525(must)-525(be)-525(followed)-525(by)-525(a)-525(<box>.)]TJ 0 -23.91 Td [(<box>)-525(states)-525(for)-525(any)-525(kind)-525(of)-525(T)]TJ 124.135 -1.716 Td [(E)]TJ 3.138 1.716 Td [(X)-525(box;)-525(\134hbox,)-525(\134vbox,)-525(\134vtop,)-525(\134box,)-525(\134copy)]TJ -127.273 -11.955 Td [(<trans>)-525(is)-525(a)-525(list)-525(of)-525(box)-525(transformations)]TJ 0 -11.955 Td [(<dimexpr>)-525(states)-525(for)-525(dimen)-525(in)-525(eTeX)-525(form)]TJ 0 -11.956 Td [(<numexpr>)-525(states)-525(for)-525(integer)-525(in)-525(eTeX)-525(form)]TJ 0 -11.955 Td [(<angle>)-525(is)-525(an)-525(integer)-525(or)-525(float-like)-525(string)]TJ 0 -11.955 Td [(<gsspec>)-525(is)-525(a)-525(literal)-525(pdf)-525(content)-525(stream)]TJ 0 -11.955 Td [(<paintop>)-525(means)-525(pdf)-525(painting)-525(operator)-525(\050S,)-525(f,)-525(B,)-525(W...\051)]TJ 0 -23.911 Td [(Some)-525(extra)-525(macros:)]TJ 0 -11.955 Td [(\134tobp)-525({<dimexpr>})-525(returns)-525(PDF)-525(dimen)-525(\050big)-525(points)-525(with)-525(no)-525(unit\051)]TJ 0 -11.955 Td [(\134enablebpround)-1050(makes)-525(\134tobp)-1050(rounding)-525(to)-525(\134pdfdecimaldigits)-1050(\050equivalent)-525(to)-525(\134roundbp)-525(\051)]TJ 0 -11.955 Td [(\134setbpround)-525({<0..4>})-525(makes)-525(\134tobp)-1050(rounding)-525(to)-525(<0..4>)-525(digits)-525(\050equivalent)-525(to)-525(\134roundbpto)-525({<0..4>}\051)]TJ 0 -11.955 Td [(\134disablebpround)-1050(turns)-525(off)-525(rounding)-525(\050equivalent)-525(to)-525(\134asbp)-525(\051)]TJ 0 -23.911 Td [(See)-525(the)-525(code)-525(for)-525(more.)]TJ
ET
endstream
endobj
@@ -2800,10 +2800,10 @@ n B fy࿭ /mB,T|pV7mm3gi<84_h..J4[')
endstream
endobj
325 0 obj <<
-/Length1 2642
-/Length2 27728
+/Length1 2689
+/Length2 28048
/Length3 0
-/Length 30370
+/Length 30737
>>
stream
%!PS-AdobeFont-1.0: LMMono10-Regular 2.004
@@ -2835,10 +2835,11 @@ FontDirectory/LMMono10-Regular known{/LMMono10-Regular findfont dup/UniqueID kno
/UnderlinePosition -167 def
/UnderlineThickness 69 def
end readonly def
-/FontName /HSROTO+LMMono10-Regular def
+/FontName /CDHRCQ+LMMono10-Regular def
/Encoding 256 array
0 1 255 {1 index exch /.notdef put} for
dup 66 /B put
+dup 68 /D put
dup 69 /E put
dup 70 /F put
dup 71 /G put
@@ -2859,6 +2860,7 @@ dup 125 /braceright put
dup 91 /bracketleft put
dup 93 /bracketright put
dup 99 /c put
+dup 58 /colon put
dup 44 /comma put
dup 100 /d put
dup 101 /e put
@@ -2884,6 +2886,7 @@ dup 40 /parenleft put
dup 41 /parenright put
dup 46 /period put
dup 43 /plus put
+dup 113 /q put
dup 114 /r put
dup 115 /s put
dup 59 /semicolon put
@@ -2955,63 +2958,60 @@ _X7hm}Y"U]@_xR 1#Q Ag+Yt裬T5n
3p%Ӽ[R,+0pO0ldsSӦjTO=巖ifܐHi]
?¶ ^L<s_mbcȖӘ"<Mb l' Vݬ$1'@v]D l{JL- !1ibڞhVFYA=k5!p//8.ݺo|`"ţ I>xnK/ ԭbqGOZ_
iC&W38FY'Gֈ[V~R8, `Z.f6dq((2OWX̍)$bc ;l76W8
-F|IIWGY^}QƓ1<vk`lrVWr\F+ga ^p  >;aZ)9?2N>hq5fbޢg}B |J?Ju9`ޔ`dZ 5gw&ZNPðLƶq~yJ:dd9O&Z8iՍ?Ü-ehoUۣGH)~3"pҶ-VZLBx" a8*2o3ʢ^S9~j'Ep}H4X5GZ~hTEYbM5Tk:PX` ]K97߆P#|b BL}A?]gc؀gipн퀾t$o VYۮJn96xR0=ĠUNhwI!NlGtJ_HvARK?U:&ilc+~B\lNCGS@4}'yyŘfA-Zqy%0b:.Q-)܀<V ;СPoψ.fSzƁW(.ʨ3@mfCj)$h5˜nG'K\19R/-!(s&FY+"Q)@UAX0
-C<ؗ{m /yk=1mfU4
-.15mnj
-YuS'1$H] ?Zzwk< 颸<t
-"ƅz8ClrK@ `ŋ:y+Q?SK똷p$_H'O-
-\kFsZPS?yO&P6o~@>u_薪u5Ǧ/0@}G4/o@U5JfcS'K>113I1(+ݖ\URPoGPC8ICĝEQbnp87\1Sӓf#&$+EsuzaW~kJu1n.͞
-X cS㹂< IOwmB?IPinڊ`sq!%9! )^ IlAݜ>FWKw_0<*ÿXMv t]{=r,lK*}_xSLnbY~DZaaȟ][ rAPfN-7̈]͂pOdu;͉um1_eq'FKhz}:u9PwkY++DoUxy?{͹Zi|ǛfEƧxV@s!~Λh [V$XyTʟVX~H;" k $}[ ;2]~CHXOlV
-yF2FgajX|/CمC&B4zI{'G^Y!]oNK/ $p7tNҘ=uxWc%lldJ{c&$̼\5mf@H4<vm9/90Id$@[cܜ#4
- hSۉG/df
-v)lO96a)rڳQU1J0vPXvIڝdM#(8vVH},ħ$q=Xptw&G`_*$.>VtTK{!eE<UsWGnv<jht/JbN}}(j v?9-Y
-F?  qḔJ׃?^:2^{w^5
- <?s78-FY()լ rUg]uJ:xd]zv؛<=Hdmj-M^SJZ8A;g-hb2Pv4zM=mY,', v~ER
- O 䭾[ذ;J +‚H8.<lmfNrrL5[>ѳV-X&wQ-:Ɛp"dl|nnXT3(3o׆-r̉*::4☐k>ޞ
-
-DUH!1<8 g?!}9g^6Yb3VSIg]$L@<9lںf|.
-cVOo=;۴m?a k7wQtS [C~'56;C$mۙL_X$;"o:o2U) چQU)ļ]wQ<dMgJ`tVt ; rДpǖ,W=H%t?ۯ"J=Y=~`nYOs1_B\{$(a8ӑrQ'ȉ
-Z,b:mfO)h udJ_Ը)yU!CqcT,8;mXBqwX[m2. π)^¨C}*lʠ E^4T9zt`
-U+m~#y8jVf]+*pᓓh@t%+mNb@$Kk+$i\=ڌL(Az ]ps?OpAyFsc%o-nvtt:1]]=a;*p|<r "p.<O9D@AfwJɞp<XDBA&xRN .Ԟ1gia멾p$yҬLϖL-a5>
-#VƒxRwP cTsp qlB'Gn/]@ xhH˨UD; N8'j)UP|qu>,}cU\"XOW1{,3gCo]yq\ipW-/}'5-tD+ tr> ˎfe(D5'H~0"nY(8T"]-pSynh'"݄3
-[5Hq1M]
-nѕ [IrԽ_bs-i^޵YԨ6Tُeި7cU-D#ddw>@0x':E"U|'Y,,2+?Bb7SbT# +4C^ 83$Zu`wp9+ļMCB6s
-Z`ruv Ma1"t٩XDZʴ"L'HQ^팜EQG"43
- Z00< = l;8cT,8;mXB'Dsm
-ѯT\,rzOHgqHu<P ecjӈ1ZG_6LZqsLusIH'+*g _ٜLD5<*¾
-)Wlǻ 9
-t&W'iKw} @bz{UMҮ.
->j5xBĒ1^h'Zp\-gSuC㞂&*e*}5 LѪni\2fٯBWfe`9;YLt뾃J@I:x4i,WE>8ڽ$ШW>P֤E$q)rśo2k̼#<7ri=X
-'ƨy݁O e/" J
-|ο=L,+< ~Bi{K[NU;!j[$|/쓒/F2E AzmL2M/Ex:;%z2! cnw37Au/q "2$14_(; >S9m=&\DBm"Uٍ(%rk0z bQ+-̕HWDLI_X>MX_eِiF=M3a,ܘ,q|.a.[4ҊNJA=S![m}:GV.=5iX/,`plAo OЪC4*b0Yh,g~"WlE ܄5\*#*
-k@( >@fϿ]S B)wL݇L(/EڄJApHtd4+[F sBBD.cƷcto!CLR[I7Hqo4dQ~r ? tRhጆ xrs$4B- WI1 ?ݷ #uuUu6n.nC Я6}'sJOPkA߆H jf,]:D |pފO,a!BX8y;wIԂ[NmvkYU,PÎ,PT|3&(FB#1!&5?9s0ѻ5rCE];t`o 7Jz
-`'Gڕe,]'E#eplT4waP wKc7EN֩@TGM%EUv:`)/* X 3ɶJLC`=['CoZAo:Up} c
-=56Z
-o=DED#$/x>47{Mmٺ_) 6U,ۍ
- 'I*\P1FzTSW?s۲Eq_snGZ
-r`H{^M?"7Zst
-GigjGw=j+ $!*£?
-Ӓ1t _'-'C`RDT?Y)ÝkgPvZ wn7!"
-ICZ̩D}}'f*!Uk^LAնYk r):W0ʈjM3ʘMvx5ՠ5JvLdn+e.yz!` Ã#4!Cb<O~{ w Uڊyȿ(G27fh:EkY Z~44⮀C0r,#mƋFp 9m^tTi!ZTyݑaOIq*z`xzRLRZ .
-KgüӤZi,(@O;ii\ʏ5>awW5cv SD'8p
-h=nYsǺG17[*Dx:X[Ma;U68} ]6c!Hkz"6D$
-10NO=><te@ Ȩ&qsm/3`ԛM_Ɖ2,?{OW` +!M<N3z=m&[ 1AERrڒ \VFȖXUBA<XIW~NW'̵Ap/ܽx8GQ 0P p$$+Wp }'cUe6R+_}7?'f}ș#9vsң1p>~]k>͛%#1 \M<HTmطu I{@G;8A *'EZ]U@X/EqА%qq$fl~m맮 kL05ɡD}^揤vU!.5C@fz4ZT^] wl7BbnO·0Piӿ
-
-8Yܲb2;!Evu38nS+BnX29SQdn\ZAfJrC5+!ِL&EavB=Oԩ6$l1:N%M93<G6{JZݮ-2"8 #r<fAs+ו1ٿσFo<uCz<ztq EH<ق _.z`g$>4Z:얋\^\ExgV}mR3ozU.|Ikӑ᦬#hS:_=p0huδS;1&lZ73iT2 ^cU2O$zoxջw0xD1/nT$LGw@*C廟Fź
-YGoP JKc 'J  w^tyGFyISn Ȧu`s50a>g)9#U1
-ʼnOly75BLüsӦJUe_/g[*~`:7逆2"CzVYQ;ūSˍxg3;ǗQ pqX銬Rl4')-h!*(7$MVx&xX\fb]$; bi7ʫpaŚ]g`
-7_\ȮFh!1ضG'P` y3brb灚#G Q:>rd;(u?ߞRB3Ưl&a%
-7cG못*ڦ"LK"laE-=@)ٓ,mq} G0t|ڶoqlCj}V|s8gM
-n.rvOl=ݧ6eEN1x
-#Lrk<+L)8kXY Lߑ"v &"@e'-LBcn8V!?Sdwjw]Kb5fpg Y*C
-"ߚ^$yC ۋ9^w}i2K1e#,YNSUC',m+O)f4ZBbF{q7M,|O:uғxxE,i NYZ1'Y9PƸ}?ʿ%=Sv>C|
+F|IIWGY^}QƓ1<vk`lrVWr\F+ga ^p  >;aZ)9?2N>hq5fbޢg}B |J?Ju9`ޔ`dZ 5gw&ZNPðLƶq~yJ:dd9O&Z8iՍ?Ü-ehoUۣGH)~3"pҶ-VZLBx" a8*2o3ʢ^S9~j'Ep}H4X5GZ~hTEYbM5Tk:PX` ]K97߆P#|b BL}A?]gc؀gipн퀾t$o VYۮJn96xR0=ĠUNhwI!NlGtJ_HvARK?U:&ilc+~B\lNCGS@4}'yyŘfA-Zqy%0b:.Q-)܀<V ;СPoψ.fSzƁW(.ʨ3@mfCj)$h5˜nG'K\19R/-!(s&FY+"Q)@UAX0
+AJHY`jrLf_Wc5
+ZUÂzi Ud/7$Rw@87;OSK= nS$-QO H>9kFpWS|ߐ9S<hI=8[ݼ*ҵ&U'$0ȲSam)V(gRg-RqC2Tw /
+oOUU K?y xq{ .p855+aOiLB3tp#*-F>5;U1sr
+}}aYk~~ GyILPYX[ ^ii=V/B9\[j͐U@':`!09-MA;l4nmg$b>'ʨ( ^S^›^bY}ƶ),xʑ2;2O\7$ Yk={<`-/$ʟ/;)k
+fPO:cdҵQFq!pi,lsU8u5=A:BVbfUkę˳ԃ}\aD-zT?>I L`*!Ho~-;#`v\Ÿ:0JưMnFVm*ʹzxnG9HFn!Z]n/
+5.!:'kr
++ HJFi3SD==hpM0l]K͸P':&k]Hq[bp#f/XKثQC4]V]0n&bmefpN&3꩔a|
+ȿlF-!sG<F` MςQ>>jv.R K#ϾV"ߡpQQz0x;wI"%YUH&mDy(4
+ p5Tavp?z3\Cej"HNPE)!+SE3#AKnΟmk8_Umquޏz55kA 9zca]\aViWn
+._jb3"EΑa<6Lׂϣd:qFө #p ޟ|º+riYHeE>n'}T;Zn>(%TiO4H
+iP >M(]Kxɷ4\5@U&RNcwK ϼ/̣|l1c"1
+v5i\WW'fVeȊӎ:Ϧ8nV{
+[ Npx>1خeU2Lh3W\'~Bԕdp]H&cp-,kݕ4LӦM±^]zA&;EH[nFC#ݯ/Q&!>c
+8UqϚ"F-*2Vf`kn׽.b4inr\\~zfnm+cx망 [ݦ%mR@q Z!cb%S0Z;9=[![ܣ9o3ԗB*ZU8`v `pj1SӜ
+.1~>7~iBÈރ'3 i3 $
+q>,soc -
+p#9-U=7c]Qk|Ry3ꆿcNw g]'qcuX[*' MS뼒{ T1j ])L{#-{|e =\T+lr)h
+_F3ꗟwe#xlO
+ѼFlD37*7j!Oz>d7QOiR/ q6kA~$k F:]?pbСj;i $rN8&o
+K-vīhG4gu?
+:+-wqmXU\">pDJ::D0a3v})z M ɸi>pqNA^bK 9I0^mD.}X
+ $#M19 $o<oqCw~fBKA@SqI)|
+$3_ #6PBHy<
+Wu̯$%霱gYtNFe3j[n@hlZ+
+:=i׏:>ʭ|%hWm2}RuhWQmpg_
+20oo)4rm{M%ckF\u͊j1']C)u7̌Tn<-A9pcdp=pXrx;?zS907>rf.996-il?>E4/Z%p47|'v-(5 ͖C]6npoBI 8ͦ)]E~lfhQDK'14B,w\)`j<,sC-Q  ƣp_sӳzއ:->TBy{>%'Ljr<z/0%`DW&'T(`'f]_9ӃT-^D#%KBޤ LxkHR "w=W&?·8v,EWfe`)fi"Bu]D!-H] f9d;Rד{s+x씿IFU˜j'C[؞nֵ두?!yy^Ķ*tdMuh+H
+*.<[mֽ,q +yIaٱ f_=)Tf8;Fu`eײ*Ib+6᦭+Jİwj#%Ng`8^-΋- &o}ß-jf^N?Bg8O8]yQ<6H6G yk O?XGmIN] c˴VaŒJ{Vrڽo )pPHjىUW.9THПG*6bgBf .(iFZL?M&AIwDM@ba]Q`Xs5]U+mX"qB%3e"PR쬆unY-{ΊG96^0OuwE}l>q#~m H9_^r%BO,;'=Q nܐ+^S߯#ߚP\vpء6 k!fY3 n !բRu|KxݘpvPď,g%iOAĔ8or6?%f{*&]so<k CN,`@vV3FBsweQ?{53i౎煉;^`7Ce=
+zN}5t]B(^Ն +8kσו؀uQΆvedH cRLS[u}ŭK.3
+=j!`T?4p߽EOo'/9)'`24ɧ=bYh &YāR.BqeXٍus(^64khP;/PR.~îD|n8SL`9P&04hl!s('HX
+" մd(KnϑjguDc1'h|GO!kRddR,Lo@۽4.#> YU&xq3IA&z=S™*`pEW
+g6V[)bH9(My[[VО"a#L mx$ݎ/&KX#>hm}1v#oʶLƖzؗ?
+Nc.O%*y%Qa}8WtSCnu`/vK7Bg$&Ћp
+PIXX?1&ZE1 n7SXlų M<d}jEzj7nILE9;,Tlm}jqpnkl mV> jWH,@OVx|Y,M&5!0i-iZʧB?Hσ
+rč'ּ/D=4wح 6
+ jԅ%) /4F!r͢7tOLېd@'SsJ=Y"0)~O`X BJH#ꄎ80{X 1-N q/֑gI?ד.9R>n=h,m?n%4nr{)2/KۘQ-`IWE%dn"C
+WnGWa2ZPq -8ѕA?DZZ,޵Qd'h> Ciūv3ն($=誂'k[6W`сBMwSIw,HF3>Ps :ISШL%ljbqwM/vx_Eq<h{݁dyn<c59=6|qP@V٥qVuޒ%TK6B_\=?uw0%^Y^cv =kvX; ėPu0
+-wWWɦW3m;\P&s5Ўm<=֖nK!t4>t"g\F> 95l3 zl&i 'jk P%DjH0ra
+^뼁Fs4xI=quwX >`Y>G-<a5y`Y:5B9^69<Rh"С!jFj")irURNW5PdA22Taں#
+)5RT'V 07B@$`@X?6uj^Z
+aۥ3F-NxVG<\?8D$[
+or`u $m0:.b
+1eݨ7%t'aSuH3vFQ幪MqlpՌ ?*m¦P/vY0bj'4_E]2=#ghKW8^
+Yk+Ah'ЏuءmvB|/.бW0ՐfHۇa f ~JsTe6eA6uȵؓ*ԡ>ɟ:|YY `!
+jͽp$Yce}EH3~5:9ݮ83ht8E,yВ`}07͇hy6~73@t=̭3l3fp`Jh `oeޯY8ʀB(Mpч>
+&jzL٭&%sRPJp5zsAT%־!I'?1#g/5i&=9sG1)̯#֋
+&$Ѥd I3gBNo84T©|}/ܺ}줇?ơ^v'Ч$6ݬm2%,ЋU^E~)9zىhQLtC4a wƯu׃o0 X0{(2ƌda "#g+iut+NR\kcU?%bO-LAj?Iz5R<C\
endstream
endobj
332 0 obj <<
/Producer (pdfTeX-1.40.14)
/Creator (TeX)
-/CreationDate (D:20131112234219+01'00')
-/ModDate (D:20131112234219+01'00')
+/CreationDate (D:20140125010020+01'00')
+/ModDate (D:20140125010020+01'00')
/Trapped /False
/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013/W32TeX) kpathsea version 6.1.1)
>> endobj
@@ -3019,17 +3019,17 @@ endobj
/Type /ObjStm
/N 75
/First 646
-/Length 8829
+/Length 8842
>>
stream
-309 0 312 115 317 265 316 380 320 518 322 658 324 1016 326 1250 319 1730 321 1801
-14 2160 13 2327 15 2493 52 2597 89 2702 126 2810 164 2922 201 3034 240 3146 277 3258
-315 3370 327 3450 328 3560 329 3649 330 3714 310 3785 304 3859 298 3947 292 4035 286 4123
-280 4211 273 4299 267 4387 261 4475 255 4563 249 4651 243 4739 234 4827 228 4915 222 5003
-216 5091 210 5179 204 5267 197 5355 191 5443 185 5531 179 5619 173 5707 167 5795 160 5883
-153 5971 147 6059 141 6147 135 6235 129 6323 122 6411 116 6499 110 6587 104 6675 98 6762
-92 6846 85 6929 79 7012 73 7095 67 7178 61 7261 55 7344 48 7427 42 7510 36 7593
-30 7676 24 7759 18 7842 9 7924 331 7992
+309 0 312 115 317 265 316 380 320 518 322 658 324 1016 326 1250 319 1740 321 1811
+14 2173 13 2340 15 2506 52 2610 89 2715 126 2823 164 2935 201 3047 240 3159 277 3271
+315 3383 327 3463 328 3573 329 3662 330 3727 310 3798 304 3872 298 3960 292 4048 286 4136
+280 4224 273 4312 267 4400 261 4488 255 4576 249 4664 243 4752 234 4840 228 4928 222 5016
+216 5104 210 5192 204 5280 197 5368 191 5456 185 5544 179 5632 173 5720 167 5808 160 5896
+153 5984 147 6072 141 6160 135 6248 129 6336 122 6424 116 6512 110 6600 104 6688 98 6775
+92 6859 85 6942 79 7025 73 7108 67 7191 61 7274 55 7357 48 7440 42 7523 36 7606
+30 7689 24 7772 18 7855 9 7937 331 8005
% 309 0 obj
<<
/Type /Page
@@ -3040,7 +3040,7 @@ stream
>>
% 312 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F52 14 0 R /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -3054,7 +3054,7 @@ stream
>>
% 316 0 obj
<<
-/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>
+/Properties << /OC1 1 0 R /OC2 3 0 R /OC3 4 0 R /OC4 5 0 R /OC5 6 0 R>>
/Font << /F53 13 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -3080,7 +3080,7 @@ stream
% 326 0 obj
<<
/Type /FontDescriptor
-/FontName /HSROTO+LMMono10-Regular
+/FontName /CDHRCQ+LMMono10-Regular
/Flags 4
/FontBBox [-451 -316 731 1016]
/Ascent 624
@@ -3089,7 +3089,7 @@ stream
/ItalicAngle 0
/StemV 69
/XHeight 431
-/CharSet (/B/E/F/G/J/N/P/R/S/T/W/X/a/at/b/backslash/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/eight/f/five/four/g/greater/h/hyphen/i/k/l/less/m/n/nine/o/one/p/parenleft/parenright/period/plus/r/s/semicolon/seven/six/slash/t/three/two/u/v/w/x/y/z/zero)
+/CharSet (/B/D/E/F/G/J/N/P/R/S/T/W/X/a/at/b/backslash/braceleft/braceright/bracketleft/bracketright/c/colon/comma/d/e/eight/f/five/four/g/greater/h/hyphen/i/k/l/less/m/n/nine/o/one/p/parenleft/parenright/period/plus/q/r/s/semicolon/seven/six/slash/t/three/two/u/v/w/x/y/z/zero)
/FontFile 325 0 R
>>
% 319 0 obj
@@ -3100,7 +3100,7 @@ stream
% 321 0 obj
<<
/Type /Encoding
-/Differences [40/parenleft/parenright 43/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon/less 62/greater 64/at 66/B 69/E/F/G 74/J 78/N 80/P 82/R/S/T 87/W/X 91/bracketleft/backslash/bracketright 97/a/b/c/d/e/f/g/h/i 107/k/l/m/n/o/p 114/r/s/t/u/v/w/x/y/z/braceleft 125/braceright]
+/Differences [40/parenleft/parenright 43/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less 62/greater 64/at 66/B 68/D/E/F/G 74/J 78/N 80/P 82/R/S/T 87/W/X 91/bracketleft/backslash/bracketright 97/a/b/c/d/e/f/g/h/i 107/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright]
>>
% 14 0 obj
<<
@@ -3117,7 +3117,7 @@ stream
<<
/Type /Font
/Subtype /Type1
-/BaseFont /HSROTO+LMMono10-Regular
+/BaseFont /CDHRCQ+LMMono10-Regular
/FontDescriptor 326 0 R
/FirstChar 40
/LastChar 125
@@ -3609,7 +3609,7 @@ stream
/Type /Catalog
/Pages 329 0 R
/Outlines 330 0 R
-/OCProperties << /OCGs [1 0 R 2 0 R 3 0 R 4 0 R 5 0 R] /D << /Order [1 0 R 2 0 R 3 0 R 4 0 R 5 0 R] /OFF [2 0 R 4 0 R] >> >>
+/OCProperties << /OCGs [1 0 R 3 0 R 4 0 R 5 0 R 6 0 R] /D << /Order [1 0 R 3 0 R 4 0 R 5 0 R 6 0 R] /OFF [3 0 R 5 0 R] >> >>
>>
endstream
endobj
@@ -3620,16 +3620,16 @@ endobj
/W [1 3 1]
/Root 331 0 R
/Info 332 0 R
-/ID [<53CCA53D9C46883D649A2C096B03C1C5> <53CCA53D9C46883D649A2C096B03C1C5>]
+/ID [<02687FF66C85E65BD608D421CB9F5F4C> <02687FF66C85E65BD608D421CB9F5F4C>]
/Length 1670
>>
stream


-
+
endstream
endobj
startxref
-135708
+136749
%%EOF
diff --git a/Master/texmf-dist/doc/generic/pdf-trans/example.tex b/Master/texmf-dist/doc/generic/pdf-trans/example.tex
index 8d14757393f..99e0dab7d07 100644
--- a/Master/texmf-dist/doc/generic/pdf-trans/example.tex
+++ b/Master/texmf-dist/doc/generic/pdf-trans/example.tex
@@ -36,20 +36,25 @@
\pdfminorversion=5
\fi
-\immediate\pdfobj{<< /Type /OCG /Name (box content before) >>}
-\immediate\pdfobj{<< /Type /OCG /Name (box outline before) >>}
-\immediate\pdfobj{<< /Type /OCG /Name (box content after) >>}
-\immediate\pdfobj{<< /Type /OCG /Name (box outline after) >>}
-\immediate\pdfobj{<< /Type /OCG /Name (final bounding box) >>}
-
-\pdfpageresources{/Properties << /OC1 1 0 R /OC2 2 0 R /OC3 3 0 R /OC4 4 0 R /OC5 5 0 R>>}
-\pdfcatalog{/OCProperties
+\def\saveobjnum#1{\expandafter\edef\csname objnum:#1\endcsname{\the\pdflastobj\space 0 R}}
+\def\objnum#1{\csname objnum:#1\endcsname}
+\immediate\pdfobj{<< /Type /OCG /Name (box content before) >>}\saveobjnum{1}
+\immediate\pdfobj{<< /Type /OCG /Name (box outline before) >>}\saveobjnum{2}
+\immediate\pdfobj{<< /Type /OCG /Name (box content after) >>}\saveobjnum{3}
+\immediate\pdfobj{<< /Type /OCG /Name (box outline after) >>}\saveobjnum{4}
+\immediate\pdfobj{<< /Type /OCG /Name (final bounding box) >>}\saveobjnum{5}
+
+\edef\pdfpagerc{/Properties << /OC1 \objnum{1} /OC2 \objnum{2} /OC3 \objnum{3} /OC4 \objnum{4} /OC5 \objnum{5}>>}
+\expandafter\pdfpageresources\expandafter{\pdfpagerc}
+\edef\pdfcatalogoc{%
+/OCProperties
<<
- /OCGs [1 0 R 2 0 R 3 0 R 4 0 R 5 0 R]
- /D << /Order [1 0 R 2 0 R 3 0 R 4 0 R 5 0 R]
- /OFF [2 0 R 4 0 R]
+ /OCGs [\objnum{1} \objnum{2} \objnum{3} \objnum{4} \objnum{5}]
+ /D << /Order [\objnum{1} \objnum{2} \objnum{3} \objnum{4} \objnum{5}]
+ /OFF [\objnum{2} \objnum{4}]
>>
>>}
+\expandafter\pdfcatalog\expandafter{\pdfcatalogoc}% \pdfcatalog expands anyway
\newbox\qbox
@@ -208,6 +213,16 @@ Each transformation must be followed by a <box>.\bigskip
<paintop> means pdf painting operator (S, f, B, W...)\par
\bigskip
+
+Some extra macros:\par
+\def\type#1{{\detokenize{#1}}}
+\type{\tobp{<dimexpr>}} returns PDF dimen (big points with no unit) \par
+\type{\enablebpround} makes \type{\tobp} rounding to \type{\pdfdecimaldigits} (equivalent to \type{\roundbp}) \par
+\type{\setbpround{<0..4>}} makes \type{\tobp} rounding to <0..4> digits (equivalent to \type{\roundbpto{<0..4>}}) \par
+\type{\disablebpround} turns off rounding (equivalent to \type{\asbp}) \par
+
+
+\bigskip
See the code for more.
\end
diff --git a/Master/texmf-dist/tex/generic/pdf-trans/pdf-trans.tex b/Master/texmf-dist/tex/generic/pdf-trans/pdf-trans.tex
index 4326d3187d3..870e1dacb99 100644
--- a/Master/texmf-dist/tex/generic/pdf-trans/pdf-trans.tex
+++ b/Master/texmf-dist/tex/generic/pdf-trans/pdf-trans.tex
@@ -1,8 +1,8 @@
%%% A set of macros for various transformations of TeX boxes.
-%%% (bases on plain and pdfeTeX primitives)
+%%% (bases on plain and pdf(e)TeX primitives)
%
-% Version: 2.3
-% Author: Pawe/l Jackowski (P.Jackowski@gust.org.pl)
+% Version: 2.4
+% Author: Pawe{\l} Jackowski (P.Jackowski@gust.org.pl)
% Public Domain
%
% The macro provides a bunch of TeX box transformations. It was initially
@@ -38,6 +38,18 @@
% (minus sign remains)
% * \roundbponce renamed to \round:bp:once
%
+% 01.2014, v2.4
+% * some rework on pdf unit related macros
+% - \t@bp renamed to \asbp as pretty useful converter to big points (with no rounding)
+% - new macro \roundbpto{0..4}{<dimexpr>} rounds #2 to #1 digits
+% - \roundbp now always rounds to \pdfdecimaldigits
+% - \enablebpround, \disablebpround and \setbpround now redefine \tobp:
+% - \enablebpround makes \tobp equivalent to \roundbp
+% - \disablebpround makes \tobp equivalent to \asbp
+% - \setbpround{0..4} makes \tobp equivalent to \roundbpto{#1}
+% - removed \romannumeral from csnames, decimal digits used instead
+% - removed \big:p@ints
+
\def\starttrans{%
\xdef\endtrans{%
@@ -1041,42 +1053,68 @@
\endgroup
\def\withoutpt{\expandafter\with@ut:pt}
-\def\big:p@ints#1#2{#1\the\dimexpr#2*\pt:f@ctor/\bp:f@ctor\relax}
\def\negbp#1{\withoutpt\the\dimexpr-#1pt\relax}
+\def\asbp#1{\withoutpt\the\dimexpr#1*\pt:f@ctor/\bp:f@ctor\relax}
% If we assume that \pdfdecimaldigits never exceeds possible range (0..4),
% we can implement PDF dimens rounding in the following way:
-\def\t@bp{\big:p@ints\withoutpt}
-
+% \def\roundbp#1{%
+% \expandafter\expandafter
+% \csname r@und:bp:\the\pdfdecimaldigits\expandafter\endcsname
+% \expandafter\with@ut:pt\the\dimexpr(#1)*\pt:f@ctor/\bp:f@ctor\relax0000\relax}
+% or with less \expandafters
\def\roundbp#1{%
- \expandafter\expandafter
- \csname r@und:bp:\romannumeral\pdfdecimaldigits\expandafter\endcsname
- \expandafter\with@ut:pt\the\dimexpr(#1)*\pt:f@ctor/\bp:f@ctor\relax0000\relax}
-
-\def\r@und:bp: #1.#2#3\relax{\number\numexpr#1#2/10\relax}
-\def\r@und:bp:i #1.#2#3#4\relax{\round:bp:once{#1}{#2#3}\relax}
-\def\r@und:bp:ii #1.#2#3#4#5\relax{\round:bp:once{#1}{#2#3#4}\relax}
-\def\r@und:bp:iii #1.#2#3#4#5#6\relax{\round:bp:once{#1}{#2#3#4#5}\relax}
-\def\r@und:bp:iv #1.#2#3#4#5#6#7\relax{\round:bp:once{#1}{#2#3#4#5#6}\relax}
+ \expandafter\r@undbp\the\dimexpr(#1)*\pt:f@ctor/\bp:f@ctor\relax0000\relax}
+\def\r@undbp{%
+ \csname r@und:bp:\the\pdfdecimaldigits\expandafter\endcsname
+ \with@ut:pt}
-% To speed-up things one may say
-
-\def\setbpround#1{% 0..4
- \edef\roundbp##1{%
- \unexpanded{\expandafter\expandafter\expandafter}\expandafter\noexpand
- \csname r@und:bp:\romannumeral#1\endcsname
- \unexpanded{\expandafter\with@ut:pt\the}%
- \dimexpr(##1)*\unexpanded{\pt:f@ctor/\bp:f@ctor}\relax0000\relax}}
+\expandafter\def\csname r@und:bp:0\endcsname #1.#2#3\relax{\number\numexpr#1#2/10\relax}
+\expandafter\def\csname r@und:bp:1\endcsname #1.#2#3#4\relax{\round:bp:once{#1}{#2#3}\relax}
+\expandafter\def\csname r@und:bp:2\endcsname #1.#2#3#4#5\relax{\round:bp:once{#1}{#2#3#4}\relax}
+\expandafter\def\csname r@und:bp:3\endcsname #1.#2#3#4#5#6\relax{\round:bp:once{#1}{#2#3#4#5}\relax}
+\expandafter\def\csname r@und:bp:4\endcsname #1.#2#3#4#5#6#7\relax{\round:bp:once{#1}{#2#3#4#5#6}\relax}
\def\round:bp:once#1#2{%
- %\number\numexpr#1\ifnum#1<0-\else+\fi % 15.10.2013: wrong! that drops minus sign in case -0.xxxx
+ % 15.10.2013: that is wrong! that drops minus sign in case -0.xxxx
+ %\number\numexpr#1\ifnum#1<0-\else+\fi
%(\m@ne+\expandafter\r@und:bp:once\number\numexpr1#2/10\relax}
+ % that works but may produce -0.0
\ifnum#11<0-\number\numexpr-\else\number\numexpr\fi
#1+(\m@ne+\expandafter\r@und:bp:once\number\numexpr1#2/10\relax}
+ % 21.01.2014: but both rounds 0.9995bp to 0.999, while they should to 1.0,
+ % but this is a cost of bp<->pt conversion
\def\r@und:bp:once#1#2\relax{#1)\relax\ifnum#2>0.#2\fi}
+% To change rounding digits and speed-up a little one may say \setbpround 0..4
+
+\def\set:bp:rounder#1#2{% 0..4
+ \expandafter\edef\csname #1:\the\numexpr#2\relax\endcsname##1{%
+ \unexpanded{\expandafter\expandafter\expandafter}\expandafter\noexpand
+ \csname r@und:bp:\the\numexpr#2\relax\endcsname
+ \unexpanded{\expandafter\with@ut:pt\the}%
+ \dimexpr(##1)*\unexpanded{\pt:f@ctor/\bp:f@ctor}\relax0000\relax}}
+
+\set:bp:rounder{roundbpto}{0}
+\set:bp:rounder{roundbpto}{1}
+\set:bp:rounder{roundbpto}{2}
+\set:bp:rounder{roundbpto}{3}
+\set:bp:rounder{roundbpto}{4}
+
+\def\roundbpto#1{\csname roundbpto:#1\endcsname}
+
+\def\enablebpround{\let\tobp\roundbp}
+\def\disablebpround{\let\tobp\asbp}
+\def\setbpround#1{\expandafter\let\expandafter\tobp\csname roundbpto:\the\numexpr#1\relax\endcsname}
+
+% By default, \tobp respects \pdfdecimaldigits
+
+\enablebpround
+
+% save rounded to macro
+
\def\savebp#1{%
\def\s@vebp{%
\edef#1{\tobp{\bp:dim@n}}}%
@@ -1084,12 +1122,6 @@
\newdimen\bp:dim@n
-\def\disablebpround{\let\tobp\t@bp}
-\def\enablebpround{\let\tobp\roundbp}
-
-%\disablebpround
-\enablebpround
-
% Lets play with basic arithmetic operations. To make things consistent, each
% function expands to \numexpr|\dimexpr, even if could be easily expanded to
% digits. This approach ensures predictable behaviour whenever a \function is