From 97271643a9599982bba2bff33c8fc23b41ec6866 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 24 Nov 2017 16:05:14 +0100 Subject: [PATCH] Fixed 3 tests (dvips -> pdftex). --- required/babel/testfiles/support/foo.pdf | Bin 0 -> 1005 bytes required/babel/testfiles/support/test2eb.tex | 85 +++++++++++++++++++ required/babel/testfiles/tlb1347.lvt | 6 +- required/babel/testfiles/tlb1347.tlg | 15 ++-- required/babel/testfiles/tlb3523.lvt | 2 +- required/babel/testfiles/tlb3523.tlg | 31 ++++--- required/babel/testfiles/tlb3976.lvt | 2 +- required/babel/testfiles/tlb3976.tlg | 16 ++-- 8 files changed, 124 insertions(+), 33 deletions(-) create mode 100644 required/babel/testfiles/support/foo.pdf create mode 100644 required/babel/testfiles/support/test2eb.tex diff --git a/required/babel/testfiles/support/foo.pdf b/required/babel/testfiles/support/foo.pdf new file mode 100644 index 0000000000000000000000000000000000000000..242b6b0353cb623882850ac6ee891fe225c908b5 GIT binary patch literal 1005 zcma)5OK1~O6h);_2ehSK6m{W+5^RuWKAFkKhCq`v!5_w?E=0O`PF|9cI4`_;kyLOi zXrZ$xiAa zO9?#wzW!SYg9hyK6(x}X^$c|@q6#KL1qA@qtWy(|<6a|zW~j|dR7oZkPjE`ED$SJ( zi_-`9o*zvAT)8_od}wp%mEIa`9a}sy_U+H;%jKh=*OwmM9~${!KARkV@}~7`bYtI_ zh0W&j)YItNkMgal+hZTC!?pZ+Z2#=Vx5)?N@!ab>#*Ng&)unp_3z>I`o8y%iYa6Xk zTU!T4{^lC*zn+?UzUTOAa6qAMsY3$4Bz?(Q?#Nm<40$h4Mo*kCXQnA~MS)Tvk&pl` zm1uYXH9ZYFs5Zej3d9S1+v|u`H^Yn3Jmo?TF~xyjGW!xl`VypZ zAOzzuVH1Zl&_lW&GGL-AME!({ZAGxcNxkaWUWoBZFzA=bb5?5DIAH%Dw(Uu@uY8+- zng~*3m3C_M$LqMV9n<8rtY{EZwBCYdzcYMu{$tL$M)>N3?1ii z2Nu?1yD%%ZJ64WJFII5k)F}7=%A#|fB4s(O1;zwO;q7rb>6RHt8+>0qLAdZ0MkA&Y K2+W+zD*pgdY8c4? literal 0 HcmV?d00001 diff --git a/required/babel/testfiles/support/test2eb.tex b/required/babel/testfiles/support/test2eb.tex new file mode 100644 index 000000000..aa6596eab --- /dev/null +++ b/required/babel/testfiles/support/test2eb.tex @@ -0,0 +1,85 @@ + +% ============================= +% \TestEngine +% - +% \Show % non-stopping \show +% \ShowThe % non-stopping \show\the +% - +% \TestBox{htext} % box dimensions +% \TestWd{htext} % Only width - redundant, but one-liner +% \TestSavePos{label} % label only for reference - requires .aux +% (\TestAuxMessage - auxiliary for the previous - defined only if used) +% \TestNum{a=b} % or with < > - result is True o False +% \TestPdf{label}{text} +% \CHECKPDF{pattern|pattern} % in preample, with regex'es for resources + +\chardef\TestEngine=% + \ifx\directlua\@undefined + \ifx\XeTeXinputencoding\@undefined + \z@ + \else + \tw@ + \fi + \else + \@ne + \fi + +%---- +\def\Show#1{{% + {\edef\Test@Temp{\meaning#1}% use csname ??? + \message{^^J\string#1 \string= \Test@Temp^^J}}}} + +%---- +\def\ShowThe#1{\message{^^J\string#1 \string= \the#1^^J}} + +%---- +\def\TestBox#1{% + \def\Test@Temp{#1}% + \texttt{\expandafter\strip@prefix\meaning\Test@Temp} = {#1}% + \setbox0\hbox{#1}% + \message{^^J\expandafter\strip@prefix\meaning\Test@Temp + \space\string= \the\wd0, \the\ht0, \the\dp0}} + +%---- +\def\TestWd#1{\setbox0\hbox{#1}\ShowThe{\wd0}\relax#1} + +%---- +\def\TestPos#1{% + \def\TestAuxMessage##1{\message{^^JTIMO^^J##1^^JOMIT^^J}}% + \pdfsavepos + \protected@write\@mainaux{}% + {\protect\TestAuxMessage{#1 \string= \noexpand\the\pdflastxpos, + \noexpand\the\pdflastypos}}} +\def\TestAuxMessage#1{} +\let\TestSavePos\TestPos % Just a synon + +\ifx\pdfsavepos\@undefined + \ifx\savepos\@undefined\else + \let\pdfsavepos\savepos + \let\pdflastxpos\lastxpos + \let\pdflastypos\lastypos + \fi +\fi + +%---- +\def\TestNum#1{% + \def\Test@Temp{#1}% + \message{^^J\expandafter\strip@prefix\meaning\Test@Temp + \space\string= \ifnum#1 True\else False\fi}} + +%---- + +\def\TestPdf#1{% + \def\Test@Temp{== #1 ==}% + \pdfliteral direct {% + \@percentchar TIMO \expandafter\strip@prefix\meaning\Test@Temp}% + #1% + \pdfliteral direct {\@percentchar OMIT}} + +% In preamble: +\def\CHECKPDF#1{% + \pdfcompresslevel=\z@ + \pdfobjcompresslevel=\z@ + \typeout{CHECKPDF #1}} + +\endinput \ No newline at end of file diff --git a/required/babel/testfiles/tlb1347.lvt b/required/babel/testfiles/tlb1347.lvt index 9bc82a917..a06b398bc 100644 --- a/required/babel/testfiles/tlb1347.lvt +++ b/required/babel/testfiles/tlb1347.lvt @@ -15,12 +15,12 @@ \CLASS{report} \PACKAGE[francais]{babel} \PACKAGE{array} -\PACKAGE[dvips]{graphicx} +\PACKAGE{graphicx} \OMIT \usepackage[francais]{babel} \usepackage{array} -\usepackage[dvips]{graphicx} +\usepackage{graphicx} \begin{document} \TIMO @@ -32,7 +32,7 @@ un & deux \\ trois & quatre \\ \end{tabular} -\includegraphics[width=0.5\linewidth, angle=-90]{eye.ps} +\includegraphics[width=0.5\linewidth, angle=-90]{foo.pdf} test! test ! diff --git a/required/babel/testfiles/tlb1347.tlg b/required/babel/testfiles/tlb1347.tlg index 22c3f9203..fbfdb61d1 100644 --- a/required/babel/testfiles/tlb1347.tlg +++ b/required/babel/testfiles/tlb1347.tlg @@ -7,14 +7,15 @@ Package: babel Options: francais Package: array Package: graphicx - Options: dvips LaTeX Font Info: External font `cmex10' loaded for size (Font) <7> on input line .... LaTeX Font Info: External font `cmex10' loaded for size (Font) <5> on input line .... -File: eye.ps Graphic file (type eps) - [1 -Non-PDF special ignored! -Non-PDF special ignored! -Non-PDF special ignored! -Non-PDF special ignored!] (.aux) + +File: foo.pdf Graphic file (type pdf) + +Package pdftex.def Info: foo.pdf used on input line .... +(pdftex.def) Requested size: 172.5pt x 185.06145pt. + [1 + <./foo.pdf>] +(.aux) diff --git a/required/babel/testfiles/tlb3523.lvt b/required/babel/testfiles/tlb3523.lvt index 9ac30831c..e69c06caf 100644 --- a/required/babel/testfiles/tlb3523.lvt +++ b/required/babel/testfiles/tlb3523.lvt @@ -51,7 +51,7 @@ l.6 \includegraphics[width=\linewidth]{example1} > \begin{document} \TIMO -\testit{\includegraphics[width=\linewidth]{example1}} +\testit{\includegraphics[width=\linewidth]{foo.pdf}} \end{document} \endinput diff --git a/required/babel/testfiles/tlb3523.tlg b/required/babel/testfiles/tlb3523.tlg index 94a837b81..e670bae9d 100644 --- a/required/babel/testfiles/tlb3523.tlg +++ b/required/babel/testfiles/tlb3523.tlg @@ -6,17 +6,26 @@ Package: babel Options: latin,english Main Class: article Package: graphicx -! LaTeX Error: File `example1' not found. -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... -l. ......cludegraphics[width=\linewidth]{example1}} -I could not locate the file with any of these extensions: -.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,.eps -Try typing to proceed. -If that doesn't work, type X to quit. + +File: foo.pdf Graphic file (type pdf) + +Package pdftex.def Info: foo.pdf used on input line .... +(pdftex.def) Requested size: 345.0pt x 370.25217pt. > \box0= -\hbox(0.0+0.0)x0.0 +\hbox(370.25217+0.0)x345.0 +.\hbox(370.25217+0.0)x345.0 +..\hbox(370.25323+0.0)x345.15129 +...\hbox(370.25323+0.0)x345.15129 +....\hbox(370.25323+0.0)x0.0 +.....\pdfsave +.....\pdfsetmatrix{7.7365 0 0 7.7365} +.....\hbox(47.858+0.0)x0.0, glue set - 44.61339fil +......\hbox(47.858+0.0)x44.61339 +.......\pdfrefximage(47.858+0.0)x44.61339 +......\glue 0.0 plus 1.0fil minus 1.0fil +.....\pdfrestore +....\kern 345.15129 +....\glue 0.0 plus 1.0fil minus 1.0fil ! OK. -l. ......cludegraphics[width=\linewidth]{example1}} +l. ......ncludegraphics[width=\linewidth]{foo.pdf}} (.aux) diff --git a/required/babel/testfiles/tlb3976.lvt b/required/babel/testfiles/tlb3976.lvt index cb5f62f8a..095abc6d4 100644 --- a/required/babel/testfiles/tlb3976.lvt +++ b/required/babel/testfiles/tlb3976.lvt @@ -31,7 +31,7 @@ When the babel package is loaded with the latin option, parameters passed to the \begin{document} \TIMO \selectlanguage{UKenglish} -\includegraphics[width=10cm]{graphics/billard} +\includegraphics[width=10cm]{foo.pdf} \selectlanguage{latin} \showthe\catcode`\^ \LatinMarksOn diff --git a/required/babel/testfiles/tlb3976.tlg b/required/babel/testfiles/tlb3976.tlg index eb7925d2c..4609f9a78 100644 --- a/required/babel/testfiles/tlb3976.tlg +++ b/required/babel/testfiles/tlb3976.tlg @@ -10,19 +10,15 @@ Package: graphicx l. ...\showthe\catcode`\^ > 12. l. ...\showthe\catcode`\= -! LaTeX Error: File `graphics/billard' not found. -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... -l. ......ludegraphics[width=10cm]{graphics/billard} -I could not locate the file with any of these extensions: -.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,.eps -Try typing to proceed. -If that doesn't work, type X to quit. + +File: foo.pdf Graphic file (type pdf) + +Package pdftex.def Info: foo.pdf used on input line .... +(pdftex.def) Requested size: 284.52756pt x 305.35385pt. > 7. l. ...\showthe\catcode`\^ > 13. l. ...\showthe\catcode`\^ > 12. l. ...\showthe\catcode`\^ -[1] +[1 <./foo.pdf>]