update patches
Norbert Preining
8 years ago
2 | 2 | * build gregorio, replace file in the old package (Closes: #815682) |
3 | 3 | * switch to system libraries for most libraries but libteckit |
4 | 4 | (which is only in experimental) (Closes: #810001) |
5 | ||
6 | -- Norbert Preining <preining@debian.org> Sat, 09 Apr 2016 16:55:43 +0900 | |
5 | * update patches | |
6 | ||
7 | -- Norbert Preining <preining@debian.org> Sat, 09 Apr 2016 17:06:21 +0900 | |
7 | 8 | |
8 | 9 | texlive-bin (2015.20160222.37495-1) unstable; urgency=medium |
9 | 10 |
3 | 3 | |
4 | 4 | --- texlive-bin.orig/texk/web2c/am/texmf.am |
5 | 5 | +++ texlive-bin/texk/web2c/am/texmf.am |
6 | @@ -137,7 +137,7 @@ | |
6 | @@ -157,7 +157,7 @@ | |
7 | 7 | # All the x_... and X_... variables will be empty if we aren't supporting X. |
8 | 8 | # Follow the library order used in X11R6 itself: |
9 | 9 | # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). |
8 | 8 | |
9 | 9 | --- texlive-bin.orig/texk/kpathsea/texmf.cnf |
10 | 10 | +++ texlive-bin/texk/kpathsea/texmf.cnf |
11 | @@ -54,20 +54,23 @@ | |
11 | @@ -57,20 +57,23 @@ | |
12 | 12 | TEXMFROOT = $SELFAUTOPARENT |
13 | 13 | |
14 | 14 | % The main tree of distributed packages and programs: |
36 | 36 | |
37 | 37 | % Per-user texmf tree(s) -- organized per the TDS, as usual. To define |
38 | 38 | % more than one per-user tree, set this to a list of directories in |
39 | @@ -76,10 +79,10 @@ | |
39 | @@ -79,10 +82,10 @@ | |
40 | 40 | TEXMFHOME = ~/texmf |
41 | 41 | |
42 | 42 | % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. |
43 | -TEXMFVAR = ~/.texlive2015/texmf-var | |
43 | -TEXMFVAR = ~/.texlive2016/texmf-var | |
44 | 44 | +TEXMFVAR = ~/.texmf-var |
45 | 45 | |
46 | 46 | % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. |
47 | -TEXMFCONFIG = ~/.texlive2015/texmf-config | |
47 | -TEXMFCONFIG = ~/.texlive2016/texmf-config | |
48 | 48 | +TEXMFCONFIG = ~/.texmf-config |
49 | 49 | |
50 | 50 | % List all the texmf trees. For an explanation of what they are, see the |
51 | 51 | % TeX Live manual. |
52 | @@ -91,7 +94,7 @@ | |
52 | @@ -94,7 +97,7 @@ | |
53 | 53 | % should take precedence over distribution files -- although it is |
54 | 54 | % generally a source of confusion to have different versions of a |
55 | 55 | % package installed, whatever the trees, so try to avoid it. |
58 | 58 | |
59 | 59 | % Where to look for ls-R files. There need not be an ls-R in the |
60 | 60 | % directories in this path, but if there is one, Kpathsea will use it. |
61 | @@ -99,13 +102,13 @@ | |
61 | @@ -102,13 +105,13 @@ | |
62 | 62 | % does not create ls-R files in the non-!! elements -- because if an |
63 | 63 | % ls-R is present, it will be used, and the disk will not be searched. |
64 | 64 | % This is arguably a bug in kpathsea. |
74 | 74 | |
75 | 75 | % First writable tree here is used by Lua(La)TeX for the font cache. |
76 | 76 | % LuaLaTeX uses the value here, while ConTeXt uses the same variable but |
77 | @@ -116,7 +119,7 @@ | |
77 | @@ -119,7 +122,7 @@ | |
78 | 78 | % Where generated fonts may be written. This tree is used when the sources |
79 | 79 | % were found in a system tree and either that tree wasn't writable, or the |
80 | 80 | % varfonts feature was enabled in MT_FEATURES in mktex.cnf. |
83 | 83 | |
84 | 84 | % On some systems, there will be a system tree which contains all the font |
85 | 85 | % files that may be created as well as the formats. For example |
86 | @@ -486,33 +489,8 @@ | |
86 | @@ -489,33 +492,8 @@ | |
87 | 87 | % since we don't want to scatter ../'s throughout the value. Hence we |
88 | 88 | % explicitly list every directory. Arguably more understandable anyway. |
89 | 89 | % |
0 | 0 | --- |
1 | texk/detex/detex-2.8/detex.man | 2 | |
2 | 1 | texk/mendexk/mendex.1 | 2 |
3 | 2 | texk/web2c/man/mf.man | 26 +++++----- |
4 | texk/web2c/man/tex.man | 4 - | |
5 | 3 | texk/web2c/synctexdir/man5/synctex.5 | 6 +- |
6 | 4 | texk/xdvik/xdvi.1.in | 88 +++++++++++++++++------------------ |
7 | 6 files changed, 64 insertions(+), 64 deletions(-) | |
5 | 4 files changed, 61 insertions(+), 61 deletions(-) | |
8 | 6 | |
9 | --- texlive-bin.orig/texk/web2c/man/tex.man | |
10 | +++ texlive-bin/texk/web2c/man/tex.man | |
11 | @@ -6,8 +6,8 @@ | |
12 | .if n .ds TX TeX | |
13 | .if n .ds MF Metafont | |
14 | .if t .ds MF M\s-2ETAFONT\s0 | |
15 | -.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff | |
16 | -.el .ds OX TeX for nroff | |
17 | +.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP | |
18 | +.el .ds OX TeX | |
19 | .\" the same but obliqued | |
20 | .\" BX definition must follow TX so BX can use TX | |
21 | .if t .ds BX \fRB\s-2IB\s0\fP\*(TX | |
22 | 7 | --- texlive-bin.orig/texk/web2c/man/mf.man |
23 | 8 | +++ texlive-bin/texk/web2c/man/mf.man |
24 | 9 | @@ -2,7 +2,7 @@ |
25 | 10 | .\"===================================================================== |
26 | 11 | .if n .ds MF Metafont |
27 | .if t .ds MF M\s-2ETAFONT\s0 | |
12 | .if t .ds MF Metafont | |
28 | 13 | -.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP |
29 | 14 | +.if t .ds TX \fRT\h'-0.1667m'\v'0.20v'E\v'-0.20v'\h'-0.125m'X\fP |
30 | 15 | .if n .ds TX TeX |
31 | .ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff | |
32 | .el .ds OX TeX for nroff | |
33 | @@ -11,7 +11,7 @@ | |
16 | .ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP | |
17 | .el .ds OX TeX | |
18 | @@ -10,7 +10,7 @@ | |
34 | 19 | .if t .ds BX \fRB\s-2IB\s0\fP\*(TX |
35 | 20 | .if n .ds BX BibTeX |
36 | 21 | .\" LX definition must follow TX so LX can use TX |
39 | 24 | .if n .ds LX LaTeX |
40 | 25 | .if n .ds WB Web |
41 | 26 | .if t .ds WB W\s-2EB\s0 |
42 | @@ -55,7 +55,7 @@ | |
27 | @@ -54,7 +54,7 @@ | |
43 | 28 | it will use the |
44 | 29 | .I plain |
45 | 30 | base. When called under any other name, \*(MF will use that name as |
48 | 33 | .B mf |
49 | 34 | the |
50 | 35 | .I mf |
51 | @@ -91,7 +91,7 @@ | |
36 | @@ -90,7 +90,7 @@ | |
52 | 37 | .IR mode . |
53 | 38 | (Or you can just say |
54 | 39 | .I mf |
57 | 42 | control sequences, such as |
58 | 43 | .I batchmode |
59 | 44 | (for silent operation) can also appear. |
60 | @@ -116,7 +116,7 @@ | |
45 | @@ -115,7 +115,7 @@ | |
61 | 46 | the name of an actual device or, most commonly, the name |
62 | 47 | .I localfont |
63 | 48 | (see below) must |
66 | 51 | site, \*(MF will default to |
67 | 52 | .I proof |
68 | 53 | mode which produces |
69 | @@ -166,7 +166,7 @@ | |
54 | @@ -165,7 +165,7 @@ | |
70 | 55 | can be |
71 | 56 | studied in an appendix to the |
72 | 57 | .IR "\*(MF\^book" ; |
75 | 60 | altered except when it is officially upgraded. |
76 | 61 | Each |
77 | 62 | .I mode_def |
78 | @@ -369,14 +369,14 @@ | |
63 | @@ -368,14 +368,14 @@ | |
79 | 64 | Search path for |
80 | 65 | .I input |
81 | 66 | and |
92 | 77 | and DISPLAY is set, the Metafont window support for X is used. |
93 | 78 | (DISPLAY must be set to a valid X server specification, as usual.) |
94 | 79 | If neither MFTERM nor DISPLAY is set, TERM is used to guess the window |
95 | @@ -435,24 +435,24 @@ | |
80 | @@ -434,24 +434,24 @@ | |
96 | 81 | .\"===================================================================== |
97 | 82 | .SH BUGS |
98 | 83 | On January 4, 1986 the ``final'' bug in \*(MF was discovered |
121 | 106 | .I Computer Modern Typefaces |
122 | 107 | (Volume E of |
123 | 108 | .IR "Computers and Typesetting" ), |
124 | @@ -477,7 +477,7 @@ | |
109 | @@ -476,7 +476,7 @@ | |
125 | 110 | .BR tftopl (1). |
126 | 111 | .\"===================================================================== |
127 | 112 | .SH AUTHORS |
313 | 298 | in the |
314 | 299 | .B Save |
315 | 300 | dialog; see the discussion there for more information on encoding issues. |
316 | @@ -2717,7 +2717,7 @@ | |
301 | @@ -2744,7 +2744,7 @@ | |
317 | 302 | .PP |
318 | 303 | Mouse actions should refer only to |
319 | 304 | .B ButtonPress |
322 | 307 | .BR "<Btn1Down>:magnifier(*1)" ). |
323 | 308 | The corresponding motion and release events will be handled internally. |
324 | 309 | A key action may be bound to a mouse event, but not vice versa. |
325 | @@ -2961,7 +2961,7 @@ | |
310 | @@ -2988,7 +2988,7 @@ | |
326 | 311 | .\" .fi |
327 | 312 | .\" .RE |
328 | 313 | .\" .PP |
331 | 316 | .\" PostScript), the files |
332 | 317 | .\" .B mime.types |
333 | 318 | .\" and |
334 | @@ -3009,9 +3009,9 @@ | |
319 | @@ -3036,9 +3036,9 @@ | |
335 | 320 | This emphasizes the fact that searching in the |
336 | 321 | formatted text (the DVI output) works differently from |
337 | 322 | searching in the source text: Searching in the DVI file makes it easier to |
343 | 328 | footnotes. In these cases it's better to search in the \*(Te\& source |
344 | 329 | instead. The use of |
345 | 330 | .I source specials |
346 | @@ -3085,10 +3085,10 @@ | |
331 | @@ -3112,10 +3112,10 @@ | |
347 | 332 | .TP |
348 | 333 | - |
349 | 334 | \fIa|b\fR matches \fIa\fR or \fIb\fR. Brackets can be used |
356 | 341 | first match. |
357 | 342 | .TP |
358 | 343 | - |
359 | @@ -3110,7 +3110,7 @@ | |
344 | @@ -3137,7 +3137,7 @@ | |
360 | 345 | These can be negated by inserting a \fI^\fR symbol after the first bracket: |
361 | 346 | .I [^[:alpha:]] |
362 | 347 | |
365 | 350 | .B IEEE Std 1003.1 |
366 | 351 | standard definition available online from: |
367 | 352 | |
368 | @@ -3198,7 +3198,7 @@ | |
353 | @@ -3225,7 +3225,7 @@ | |
369 | 354 | listed in the |
370 | 355 | .B Dvips options |
371 | 356 | field are segmented at whitespaces and passed as separate arguments to dvips. |
374 | 359 | the following string into the |
375 | 360 | .B Printer |
376 | 361 | field: |
377 | @@ -3216,16 +3216,16 @@ | |
362 | @@ -3243,16 +3243,16 @@ | |
378 | 363 | .B dvipsPrinterString |
379 | 364 | .TP |
380 | 365 | .B dvipsOptionsString |
394 | 379 | .I -paper a4r |
395 | 380 | is translated into the dvips options |
396 | 381 | .IR "-t a4 -t landscape" . |
397 | @@ -3267,8 +3267,8 @@ | |
382 | @@ -3294,8 +3294,8 @@ | |
398 | 383 | .TP |
399 | 384 | - |
400 | 385 | Plain text in ISO-8859-1 or UTF-8 encoding. The latter will preserve more |
405 | 390 | as text; so this funcionality works best for plain text documents. |
406 | 391 | If a character cannot be displayed in the selected |
407 | 392 | charset, it is replaced by `\e' followed by the hexadecimal character code. |
408 | @@ -3372,7 +3372,7 @@ | |
393 | @@ -3399,7 +3399,7 @@ | |
409 | 394 | are supported (these names are case-insensitive). |
410 | 395 | .br |
411 | 396 | Note that UTF-8 is |
414 | 399 | symbols) of a DVI file. If ISO-8859-1 is active, characters that cannot be displayed |
415 | 400 | are replaced by `\e' followed by the hexadecimal character code. |
416 | 401 | For other encodings, such characters may trigger iconv error messages. |
417 | @@ -3456,7 +3456,7 @@ | |
402 | @@ -3483,7 +3483,7 @@ | |
418 | 403 | pixmap should have width |
419 | 404 | \fIn\fR x \fIh\fR if \fIh\fR is the height of the pixmap. |
420 | 405 | .PP |
423 | 408 | .B toolbarTranslations |
424 | 409 | can be used to map icons/buttons to specific actions. |
425 | 410 | The resource should contain a string separated by newline characters, |
426 | @@ -3687,7 +3687,7 @@ | |
411 | @@ -3714,7 +3714,7 @@ | |
427 | 412 | .BR xdvi , |
428 | 413 | unless your system |
429 | 414 | administrator or TeX distribution has already done so (which is the case |
432 | 417 | fonts, |
433 | 418 | .B xdvik |
434 | 419 | will search using the |
435 | @@ -3712,7 +3712,7 @@ | |
420 | @@ -3739,7 +3739,7 @@ | |
436 | 421 | .RB `` xdvi: ''. |
437 | 422 | Doing so does not change the behavior of the special under |
438 | 423 | .BR xdvi , |
441 | 426 | .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" |
442 | 427 | .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" |
443 | 428 | .SH SOURCE SPECIALS |
444 | @@ -3750,7 +3750,7 @@ | |
429 | @@ -3777,7 +3777,7 @@ | |
445 | 430 | inherited across pages. |
446 | 431 | .sp |
447 | 432 | You will need a \*(Te\& implementation that provides an appropriate |
450 | 435 | .IR -src ) |
451 | 436 | or a macro package |
452 | 437 | (such as |
453 | @@ -3826,12 +3826,12 @@ | |
438 | @@ -3853,12 +3853,12 @@ | |
454 | 439 | If an asterisk |
455 | 440 | .RB ( * ) |
456 | 441 | appears just before the width, then the measurements refer to the document |
465 | 450 | .RS 5 |
466 | 451 | .ft 3 |
467 | 452 | .nf |
468 | @@ -3887,7 +3887,7 @@ | |
453 | @@ -3914,7 +3914,7 @@ | |
469 | 454 | .B dvips |
470 | 455 | documentation) is not supported. |
471 | 456 | There are also some restrictions due to the way xdvi's drawing routines |
474 | 459 | .B \ecolorbox |
475 | 460 | and |
476 | 461 | .B \efcolorbox |
477 | @@ -4268,11 +4268,11 @@ | |
462 | @@ -4295,11 +4295,11 @@ | |
478 | 463 | and |
479 | 464 | .B \efcolorbox |
480 | 465 | macros; this is not likely to change in the near future. This also |
524 | 509 | .if t .ds LX L\v'-.22m'a\v'.22m'T\h'-.1667m'\v'.22m'E\h'-.125m'\v'-.22m'X |
525 | 510 | -.TH MENDEX L |
526 | 511 | +.TH MENDEX 1 |
527 | .SH ̾¾Î | |
528 | mendex \- 索引整形ツール | |
529 | .SH ╩хмяк║ | |
530 | --- texlive-bin.orig/texk/detex/detex-2.8/detex.man | |
531 | +++ texlive-bin/texk/detex/detex-2.8/detex.man | |
532 | @@ -1,4 +1,4 @@ | |
533 | -.TH DETEX 1L "12 August 1993" "Purdue University" | |
534 | +.TH DETEX 1 "12 August 1993" "Purdue University" | |
535 | .SH NAME | |
536 | detex \- a filter to strip \fITeX\fP commands from a .tex file. | |
537 | .SH SYNOPSIS | |
512 | .SH 名称 | |
513 | mendex \- 索引整形ツール | |
514 | .SH 使用法 |
4 | 4 | 61_path_max.diff |
5 | 5 | fix-manpages |
6 | 6 | #relax-zlib-version-check |
7 | ac-ctie | |
8 | libpng-arm64-neon-fix | |
7 | #ac-ctie | |
8 | #libpng-arm64-neon-fix | |
9 | 9 | mktexlsr-use-mktemp |
10 | 10 | dvihp-use-mktemp |
11 | 11 | remove-libdir-from-kpathsea-pkgconfig |
12 | 12 | # from here on upstream patches |
13 | upstream-svn37801-xobjcect-typo | |
14 | upstream-svn38047-dvipdfmx-fix | |
15 | upstream-svn38053-dvipdfmx-fix | |
16 | upstream-svn38059-dvipdfmx-fix | |
17 | upstream-svn38068-dvipdfmx-fix | |
18 | upstream-svn38091-fix-pltotf-output | |
19 | 13 | fix-format-gcc-errors |
20 | 14 | fix-mktexlsr-bashims |
0 | --- | |
1 | texk/dvipdfm-x/pngimage.c | 4 ++-- | |
2 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
3 | ||
4 | --- texlive-bin.orig/texk/dvipdfm-x/pngimage.c | |
5 | +++ texlive-bin/texk/dvipdfm-x/pngimage.c | |
6 | @@ -972,7 +972,7 @@ | |
7 | smask = pdf_new_stream(STREAM_COMPRESS); | |
8 | dict = pdf_stream_dict(smask); | |
9 | smask_data_ptr = (png_bytep) NEW(width*height, png_byte); | |
10 | - pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObjcect")); | |
11 | + pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObject")); | |
12 | pdf_add_dict(dict, pdf_new_name("Subtype"), pdf_new_name("Image")); | |
13 | pdf_add_dict(dict, pdf_new_name("Width"), pdf_new_number(width)); | |
14 | pdf_add_dict(dict, pdf_new_name("Height"), pdf_new_number(height)); | |
15 | @@ -1016,7 +1016,7 @@ | |
16 | ||
17 | smask = pdf_new_stream(STREAM_COMPRESS); | |
18 | dict = pdf_stream_dict(smask); | |
19 | - pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObjcect")); | |
20 | + pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObject")); | |
21 | pdf_add_dict(dict, pdf_new_name("Subtype"), pdf_new_name("Image")); | |
22 | pdf_add_dict(dict, pdf_new_name("Width"), pdf_new_number(width)); | |
23 | pdf_add_dict(dict, pdf_new_name("Height"), pdf_new_number(height)); |
0 | --- | |
1 | texk/dvipdfm-x/dvi.c | 31 +++++++++++++++++++++++++++++++ | |
2 | 1 file changed, 31 insertions(+) | |
3 | ||
4 | --- texlive-bin.orig/texk/dvipdfm-x/dvi.c | |
5 | +++ texlive-bin/texk/dvipdfm-x/dvi.c | |
6 | @@ -921,6 +921,34 @@ | |
7 | ||
8 | #ifdef XETEX | |
9 | static int | |
10 | +is_notdef_notzero (char *path) | |
11 | +{ | |
12 | + FILE *f; | |
13 | + char buf[2014]; | |
14 | + char cmd[512]; | |
15 | + char *p; | |
16 | + int ret = 0; | |
17 | + | |
18 | + strcpy (cmd, "t1disasm "); | |
19 | + strcat (cmd, path); | |
20 | + f = popen (cmd, "r"); | |
21 | + if (f) { | |
22 | + while ((fgets (buf, 2000, f))) { | |
23 | + p = strstr (buf, "CharStrings"); | |
24 | + if (p) { | |
25 | + fgets (buf, 2000, f); | |
26 | + if (strncmp (buf, "/.notdef", 8) != 0) | |
27 | + ret = 1; | |
28 | + break; | |
29 | + } | |
30 | + } | |
31 | + fclose(f); | |
32 | + } | |
33 | + | |
34 | + return ret; | |
35 | +} | |
36 | + | |
37 | +static int | |
38 | dvi_locate_native_font (const char *filename, uint32_t index, | |
39 | spt_t ptsize, int layout_dir, int extend, int slant, int embolden) | |
40 | { | |
41 | @@ -1000,6 +1028,9 @@ | |
42 | loaded_fonts[cur_id].numGlyphs = cffont->num_glyphs; | |
43 | ||
44 | DPXFCLOSE(fp); | |
45 | + if (loaded_fonts[cur_id].cff_is_standard_encoding) { | |
46 | + loaded_fonts[cur_id].cff_is_standard_encoding = is_notdef_notzero (path); | |
47 | + } | |
48 | } else { | |
49 | if (is_dfont) | |
50 | sfont = dfont_open(fp, index); |
0 | --- | |
1 | texk/dvipdfm-x/dvi.c | 16 ++++++++++------ | |
2 | 1 file changed, 10 insertions(+), 6 deletions(-) | |
3 | ||
4 | --- texlive-bin.orig/texk/dvipdfm-x/dvi.c | |
5 | +++ texlive-bin/texk/dvipdfm-x/dvi.c | |
6 | @@ -924,19 +924,23 @@ | |
7 | is_notdef_notzero (char *path) | |
8 | { | |
9 | FILE *f; | |
10 | - char buf[2014]; | |
11 | - char cmd[512]; | |
12 | + char buf[2048]; | |
13 | + char *cmd; | |
14 | char *p; | |
15 | int ret = 0; | |
16 | ||
17 | - strcpy (cmd, "t1disasm "); | |
18 | - strcat (cmd, path); | |
19 | + p = kpse_var_value("SELFAUTOLOC"); | |
20 | + if (p == NULL) | |
21 | + return ret; | |
22 | + cmd = concat3 (p, "/t1disasm ", path); | |
23 | + free (p); | |
24 | f = popen (cmd, "r"); | |
25 | + free (cmd); | |
26 | if (f) { | |
27 | - while ((fgets (buf, 2000, f))) { | |
28 | + while ((fgets (buf, 2047, f))) { | |
29 | p = strstr (buf, "CharStrings"); | |
30 | if (p) { | |
31 | - fgets (buf, 2000, f); | |
32 | + fgets (buf, 2047, f); | |
33 | if (strncmp (buf, "/.notdef", 8) != 0) | |
34 | ret = 1; | |
35 | break; |
0 | --- | |
1 | texk/dvipdfm-x/dvi.c | 9 ++++++++- | |
2 | 1 file changed, 8 insertions(+), 1 deletion(-) | |
3 | ||
4 | --- texlive-bin.orig/texk/dvipdfm-x/dvi.c | |
5 | +++ texlive-bin/texk/dvipdfm-x/dvi.c | |
6 | @@ -932,7 +932,11 @@ | |
7 | p = kpse_var_value("SELFAUTOLOC"); | |
8 | if (p == NULL) | |
9 | return ret; | |
10 | +#if defined(_WIN32) | |
11 | + cmd = concatn ("\"", p, "/t1disasm.exe\" \"", path, "\"", NULL); | |
12 | +#else | |
13 | cmd = concat3 (p, "/t1disasm ", path); | |
14 | +#endif | |
15 | free (p); | |
16 | f = popen (cmd, "r"); | |
17 | free (cmd); | |
18 | @@ -941,7 +945,10 @@ | |
19 | p = strstr (buf, "CharStrings"); | |
20 | if (p) { | |
21 | fgets (buf, 2047, f); | |
22 | - if (strncmp (buf, "/.notdef", 8) != 0) | |
23 | + p = buf; | |
24 | + while (*p == ' ' || *p == '\t') | |
25 | + p++; | |
26 | + if (strncmp (p, "/.notdef", 8) != 0) | |
27 | ret = 1; | |
28 | break; | |
29 | } |
0 | --- | |
1 | texk/dvipdfm-x/dvi.c | 3 ++- | |
2 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
3 | ||
4 | --- texlive-bin.orig/texk/dvipdfm-x/dvi.c | |
5 | +++ texlive-bin/texk/dvipdfm-x/dvi.c | |
6 | @@ -1025,7 +1025,8 @@ | |
7 | ERROR("Failed to read Type 1 font \"%s\".", filename); | |
8 | ||
9 | loaded_fonts[cur_id].cffont = cffont; | |
10 | - loaded_fonts[cur_id].cff_is_standard_encoding = enc_vec[0] == NULL; | |
11 | + loaded_fonts[cur_id].cff_is_standard_encoding = | |
12 | + (enc_vec[0] == NULL || !strcmp (enc_vec[0], ".notdef")); | |
13 | ||
14 | if (cff_dict_known(cffont->topdict, "FontBBox")) { | |
15 | loaded_fonts[cur_id].ascent = cff_dict_get(cffont->topdict, "FontBBox", 3); |
0 | Upstream svn 38091 | |
1 | fix messed up output of vptovf and pltotf etc | |
2 | --- | |
3 | texk/web2c/ChangeLog | 5 +++++ | |
4 | texk/web2c/omegaware/ChangeLog | 5 +++++ | |
5 | texk/web2c/omegaware/opl2ofm.ch | 1 + | |
6 | texk/web2c/omegaware/ovp2ovf.ch | 1 + | |
7 | texk/web2c/pltotf.ch | 1 + | |
8 | texk/web2c/vptovf.ch | 1 + | |
9 | 6 files changed, 14 insertions(+) | |
10 | ||
11 | --- texlive-bin.orig/texk/web2c/ChangeLog | |
12 | +++ texlive-bin/texk/web2c/ChangeLog | |
13 | @@ -1,3 +1,8 @@ | |
14 | +2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> | |
15 | + | |
16 | + * pltotf.ch, vptovf.ch: Send also real numbers to stderr, | |
17 | + completing the change from 2015-01-09 (report from Norbert). | |
18 | + | |
19 | 2015-05-21 Karl Berry <karl@tug.org> | |
20 | ||
21 | * TL'15. | |
22 | --- texlive-bin.orig/texk/web2c/omegaware/ChangeLog | |
23 | +++ texlive-bin/texk/web2c/omegaware/ChangeLog | |
24 | @@ -1,3 +1,8 @@ | |
25 | +2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> | |
26 | + | |
27 | + * opl2ofm.ch, ovp2ovf.ch: Send also real numbers to stderr, | |
28 | + completing the change from 2015-01-11. | |
29 | + | |
30 | 2015-01-18 Peter Breitenlohner <peb@mppmu.mpg.de> | |
31 | ||
32 | * odvicopy.ch: Drop intcast(). | |
33 | --- texlive-bin.orig/texk/web2c/omegaware/opl2ofm.ch | |
34 | +++ texlive-bin/texk/web2c/omegaware/opl2ofm.ch | |
35 | @@ -39,6 +39,7 @@ | |
36 | @y | |
37 | @d print(#)==write(stderr,#) | |
38 | @d print_ln(#)==write_ln(stderr,#) | |
39 | +@d print_real(#)==fprint_real(stderr,#) | |
40 | @z | |
41 | ||
42 | @x [still 2] No banner unless verbose. | |
43 | --- texlive-bin.orig/texk/web2c/omegaware/ovp2ovf.ch | |
44 | +++ texlive-bin/texk/web2c/omegaware/ovp2ovf.ch | |
45 | @@ -28,6 +28,7 @@ | |
46 | @y | |
47 | @d print(#)==write(stderr,#) | |
48 | @d print_ln(#)==write_ln(stderr,#) | |
49 | +@d print_real(#)==fprint_real(stderr,#) | |
50 | @z | |
51 | ||
52 | @x [2] Print the banner later. | |
53 | --- texlive-bin.orig/texk/web2c/pltotf.ch | |
54 | +++ texlive-bin/texk/web2c/pltotf.ch | |
55 | @@ -32,6 +32,7 @@ | |
56 | @y | |
57 | @d print(#)==write(stderr,#) | |
58 | @d print_ln(#)==write_ln(stderr,#) | |
59 | +@d print_real(#)==fprint_real(stderr,#) | |
60 | @z | |
61 | ||
62 | @x [still 2] No banner unless verbose. | |
63 | --- texlive-bin.orig/texk/web2c/vptovf.ch | |
64 | +++ texlive-bin/texk/web2c/vptovf.ch | |
65 | @@ -21,6 +21,7 @@ | |
66 | @y | |
67 | @d print(#)==write(stderr,#) | |
68 | @d print_ln(#)==write_ln(stderr,#) | |
69 | +@d print_real(#)==fprint_real(stderr,#) | |
70 | @z | |
71 | ||
72 | @x [2] Print the banner later. |