diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/Makefile | 79 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/README | 38 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/combinedgraphics.pdf | bin | 176203 -> 179805 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/Makefile | 24 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.pdf | bin | 42145 -> 43303 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.eps | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.pdf | 14 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.eps | 114 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.pdf | bin | 2345 -> 2345 bytes |
10 files changed, 259 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/Makefile b/Master/texmf-dist/doc/latex/combinedgraphics/Makefile new file mode 100644 index 00000000000..4c2c3299887 --- /dev/null +++ b/Master/texmf-dist/doc/latex/combinedgraphics/Makefile @@ -0,0 +1,79 @@ +# +# Makefile for combinedgraphics package +# +# Copyright 2009,2011 Christian Schneider <software(at)chschneider(dot)eu> +# +# This file is part of combinedgraphics. +# +# combinedgraphics is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by the Free Software Foundation, not any later version. +# +# combinedgraphics is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with combinedgraphics. If not, see <http://www.gnu.org/licenses/>. +# +# WARNING: THIS IS ALPHA SOFTWARE AND MAY CONTAIN SERIOUS BUGS! +# + +export PACKAGE := combinedgraphics + +PDFLATEX := pdflatex +MAKEINDEX := makeindex + +# installation directories +DESTDIR := $(HOME)/.texmf +DOCDIR := $(DESTDIR)/doc/latex/$(PACKAGE) +SRCDIR := $(DESTDIR)/source/latex/$(PACKAGE) +TEXDIR := $(DESTDIR)/tex/latex/$(PACKAGE) + +.PHONY: all pkg doc test install clean distclean force + +all: pkg doc test + +%.sty: %.ins %.dtx + $(RM) $@ + $(PDFLATEX) -interaction=nonstopmode $< + +%.idx %.glo: %.dtx %.sty + $(PDFLATEX) -interaction=nonstopmode $< + +%.ind: %.idx + $(MAKEINDEX) -s gind.ist -o $@ $< + +%.gls: %.glo + $(MAKEINDEX) -s gglo.ist -o $@ $< + +$(PACKAGE).pdf: %.pdf: %.dtx %.sty %.ind %.gls + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + +pkg: $(PACKAGE).sty + +doc: $(PACKAGE).pdf + +test: $(PACKAGE).sty force + $(MAKE) -C test + +install: force + mkdir -p $(DOCDIR) $(SRCDIR) $(TEXDIR) + install -m 644 README COPYING $(PACKAGE).pdf $(DOCDIR) + install -m 644 $(PACKAGE).ins $(PACKAGE).dtx Makefile $(SRCDIR) + install -m 644 $(PACKAGE).sty $(TEXDIR) + $(MAKE) -C test install + mktexlsr $(DESTDIR) + +clean: force + $(RM) *.aux *.glo *.gls *.idx *.ilg *.ind *.log *.toc *~ + $(MAKE) -C test clean + +distclean: clean force + $(RM) $(PACKAGE).sty $(PACKAGE).pdf $(TESTFILE).pdf + $(MAKE) -C test distclean + +force: ; diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/README b/Master/texmf-dist/doc/latex/combinedgraphics/README index 58aa5f82a00..c2696be5d78 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/README +++ b/Master/texmf-dist/doc/latex/combinedgraphics/README @@ -7,15 +7,19 @@ This package provides a macro (|\includecombinedgraphics|) for the inclusion of combined EPS/\LaTeX{} and PDF/\LaTeX{} graphics (an export format of Gnuplot, Xfig, and maybe other programs). Instead of including the graphics with a simple |\input|, the |\includecombinedgraphics| macro -has some comforts: +has some benefits: \begin{itemize} - \item changing the font and color of the text of the \LaTeX{} part + \item changing the font and color of the text of the \LaTeX{} parts \item rescaling the graphics without affecting the font of the \LaTeX{} - part - \item automatic inclusion of the vector graphics part, as far as \LaTeX{} - part does not do it (e.\,g., for files exported from Gnuplot before - version 4.2) + parts + \item automatic inclusion of the vector graphics parts, as far as \LaTeX{} + parts do not do it (e.\,g., for files exported from Gnuplot before + version 4.2 or Xfig) + \item changing the inclusion order of \LaTeX{} and vector graphics + parts (e.\,g., Gnuplot 4.4 exports files in a way that the vector + graphics part overlays the \LaTeX{} part, which means that text may be + hidden under shaded areas) \item rescaling and rotating of complete graphics (similar to |\includegraphics| from \textsf{graphicx} package) \end{itemize} @@ -66,12 +70,30 @@ Optionally you can compile the test file: INSTALLATION ============ -Copy the file `combinedgraphics.sty' to a directory, where LaTeX will find it. +INSTALLATION +============ + +1) Installing with make +----------------------- + +To install the package into a TDS (= TeX directory structure; typically its base +directory is named `texmf' or something similar), run the following command: + $ make DESTDIR=<your TDS> install + +Note: `$(DESTDIR)' defaults to `$(HOME)/.texmf'. + +2) Installing manually +---------------------- + +In principle, you will only habe to copy the file `ionumbers.sty' into a +directory, where LaTeX can find it. If you copy it into a TDS (TeX directory +structure), you will most probably have to run the following command afterwards: + $ mktexlsr <your TDS> LICENSE ======= -Copyright 2009 Christian Schneider <software(at)chschneider(dot)eu> +Copyright 2009,2011 Christian Schneider <software(at)chschneider(dot)eu> ion@addto@macro: identical to l@addto@macro from koma-script bundle v2.9t diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/combinedgraphics.pdf b/Master/texmf-dist/doc/latex/combinedgraphics/combinedgraphics.pdf Binary files differindex 7fe0df80404..4820d52c6f4 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/combinedgraphics.pdf +++ b/Master/texmf-dist/doc/latex/combinedgraphics/combinedgraphics.pdf diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/Makefile b/Master/texmf-dist/doc/latex/combinedgraphics/test/Makefile index 99bffe2c6ea..7be7e0b5207 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/Makefile +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/Makefile @@ -1,7 +1,7 @@ # # Makefile for tests of combinedgraphics package # -# Copyright 2009 Christian Schneider <software(at)chschneider(dot)eu> +# Copyright 2009,2011 Christian Schneider <software(at)chschneider(dot)eu> # # This file is part of combinedgraphics. # @@ -26,6 +26,11 @@ STYFILES := ../combinedgraphics.sty FIGFILES := xfig325.fig PLTFILES := gnuplot42.plt +# installation directories +DESTDIR := $(HOME)/.texmf +DOCDIR := $(DESTDIR)/doc/latex/$(PACKAGE)/test +SRCDIR := $(DESTDIR)/source/latex/$(PACKAGE)/test + # output files PDFFILE := $(patsubst %.tex,%.pdf,$(SRCFILE)) TEXGRAPHICS := $(patsubst %.fig,%.tex,$(FIGFILES)) \ @@ -45,7 +50,7 @@ EPSTOPDF := epstopdf export TEXINPUTS := .:..:$(TEXINPUTS) export TEXPICTS := .:..:$(TEXPICTS) -.PHONY: all test clean distclean +.PHONY: all test install clean distclean force all: test @@ -66,10 +71,19 @@ $(PDFFILE): %.pdf: %.tex $(STYFILES) $(TEXGRAPHICS) $(PDFGRAPHICS) $(PDFLATEX) -interaction=nonstopmode $< $(PDFLATEX) -interaction=nonstopmode $< -test: $(PDFFILE) +test: $(PDFFILE) $(EPSGRAPHICS) + +install: force + mkdir -p $(DOCDIR) $(SRCDIR) + install -m 644 $(TEXGRAPHICS) $(EPSGRAPHICS) $(PDFGRAPHICS) \ + $(PDFFILE) $(DOCDIR) + install -m 644 $(SRCFILE) $(FIGFILES) $(PLTFILES) Makefile $(SRCDIR) -clean: +clean: force $(RM) *.aux *.glo *.gls *.idx *.ilg *.ind *.log *.toc *~ -distclean: clean +distclean: clean force $(RM) $(PDFFILE) $(TEXGRAPHICS) $(EPSGRAPHICS) $(PDFGRAPHICS) + +force: ; + diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.pdf b/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.pdf Binary files differindex 824438ce63b..8426d86e8b3 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.pdf +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.pdf diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.tex b/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.tex index 4b904148c36..76cc1e220ab 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.tex +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/combinedgraphics_test.tex @@ -1,7 +1,7 @@ % % LaTeX test file for combinedgraphics package % -% Copyright 2009 Christian Schneider <software(at)chschneider(dot)eu> +% Copyright 2009,2011 Christian Schneider <software(at)chschneider(dot)eu> % % This file is part of combinedgraphics. % @@ -117,4 +117,11 @@ \fbox{\input{gnuplot42}}\\ \fbox{\includecombinedgraphics[angle=30,scale=0.75,angle=15]{xfig325}}% \fbox{\includecombinedgraphics[angle=30,scale=0.75,angle=15]{gnuplot42}} + + \section*{Test: \texttt{vecfirst=false,vecinclude=overwrite}} + \noindent + \fbox{\combinput{xfig325}}% + \fbox{\input{gnuplot42}}\\ + \fbox{\includecombinedgraphics[vecfirst=false,vecinclude=overwrite]{xfig325}}% + \fbox{\includecombinedgraphics[vecfirst=false,vecinclude=overwrite]{gnuplot42}} \end{document} diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.eps b/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.eps index 22f76ffca32..aac026a067f 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.eps +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: gnuplot42.tex %%Creator: gnuplot 4.2 patchlevel 2 -%%CreationDate: Sun Nov 1 21:23:59 2009 +%%CreationDate: Wed Jun 15 00:40:51 2011 %%DocumentFonts: %%BoundingBox: 50 50 230 176 %%EndComments @@ -48,7 +48,7 @@ SDict begin [ /Author (,,,) % /Producer (gnuplot) % /Keywords () - /CreationDate (Sun Nov 1 21:23:59 2009) + /CreationDate (Wed Jun 15 00:40:51 2011) /DOCINFO pdfmark end } ifelse diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.pdf b/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.pdf index 33f4aaadcdb..b540d53b35c 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.pdf +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/gnuplot42.pdf @@ -44,10 +44,10 @@ endobj <?adobe-xap-filters esc="CRLF"?> <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'> <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> -<rdf:Description rdf:about='09b8c1be-ff41-11e9-0000-93131edb0da5' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.62'/> -<rdf:Description rdf:about='09b8c1be-ff41-11e9-0000-93131edb0da5' xmlns:xap='http://ns.adobe.com/xap/1.0/' xap:ModifyDate='Sun -No-v T 1: 2:1:23::9 ' xap:CreateDate='Sun -No-v T 1: 2:1:23::9 '><xap:CreatorTool>gnuplot 4.2 patchlevel 2 </xap:CreatorTool></rdf:Description> -<rdf:Description rdf:about='09b8c1be-ff41-11e9-0000-93131edb0da5' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='09b8c1be-ff41-11e9-0000-93131edb0da5'/> -<rdf:Description rdf:about='09b8c1be-ff41-11e9-0000-93131edb0da5' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>gnuplot42.tex</rdf:li></rdf:Alt></dc:title><dc:creator><rdf:Seq><rdf:li>,,,</rdf:li></rdf:Seq></dc:creator></rdf:Description> +<rdf:Description rdf:about='e79c34d0-cef3-11eb-0000-93131edb0da5' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.62'/> +<rdf:Description rdf:about='e79c34d0-cef3-11eb-0000-93131edb0da5' xmlns:xap='http://ns.adobe.com/xap/1.0/' xap:ModifyDate='Wed -Ju-n T15: 0:0:40::1 ' xap:CreateDate='Wed -Ju-n T15: 0:0:40::1 '><xap:CreatorTool>gnuplot 4.2 patchlevel 2 </xap:CreatorTool></rdf:Description> +<rdf:Description rdf:about='e79c34d0-cef3-11eb-0000-93131edb0da5' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='e79c34d0-cef3-11eb-0000-93131edb0da5'/> +<rdf:Description rdf:about='e79c34d0-cef3-11eb-0000-93131edb0da5' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>gnuplot42.tex</rdf:li></rdf:Alt></dc:title><dc:creator><rdf:Seq><rdf:li>,,,</rdf:li></rdf:Seq></dc:creator></rdf:Description> </rdf:RDF> </x:xmpmeta> @@ -57,8 +57,8 @@ endstream endobj 2 0 obj <</Producer(GPL Ghostscript 8.62) -/CreationDate(Sun Nov 1 21:23:59 2009) -/ModDate(D:20091101212400+01'00') +/CreationDate(Wed Jun 15 00:40:51 2011) +/ModDate(D:20110615004051+02'00') /Title(gnuplot42.tex) /Subject(gnuplot plot) /Creator(gnuplot 4.2 patchlevel 2 ) @@ -77,7 +77,7 @@ xref 0000001217 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R -/ID [<724334C0C5E93F78CBF3F712CAD83E5B><724334C0C5E93F78CBF3F712CAD83E5B>] +/ID [<403CF5A2B2BEA41D990A665B14EBAC45><403CF5A2B2BEA41D990A665B14EBAC45>] >> startxref 2874 diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.eps b/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.eps new file mode 100644 index 00000000000..7a18fa94253 --- /dev/null +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.eps @@ -0,0 +1,114 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: xfig325.fig +%%Creator: fig2dev Version 3.2 Patchlevel 5 +%%CreationDate: Wed Jun 15 00:40:51 2011 +%%For: chsch@europa (,,,) +%%BoundingBox: 0 0 87 87 +%Magnification: 1.0000 +%%EndComments +%%BeginProlog +/$F2psDict 200 dict def +$F2psDict begin +$F2psDict /mtrx matrix put +/col-1 {0 setgray} bind def +/col0 {0.000 0.000 0.000 srgb} bind def +/col1 {0.000 0.000 1.000 srgb} bind def +/col2 {0.000 1.000 0.000 srgb} bind def +/col3 {0.000 1.000 1.000 srgb} bind def +/col4 {1.000 0.000 0.000 srgb} bind def +/col5 {1.000 0.000 1.000 srgb} bind def +/col6 {1.000 1.000 0.000 srgb} bind def +/col7 {1.000 1.000 1.000 srgb} bind def +/col8 {0.000 0.000 0.560 srgb} bind def +/col9 {0.000 0.000 0.690 srgb} bind def +/col10 {0.000 0.000 0.820 srgb} bind def +/col11 {0.530 0.810 1.000 srgb} bind def +/col12 {0.000 0.560 0.000 srgb} bind def +/col13 {0.000 0.690 0.000 srgb} bind def +/col14 {0.000 0.820 0.000 srgb} bind def +/col15 {0.000 0.560 0.560 srgb} bind def +/col16 {0.000 0.690 0.690 srgb} bind def +/col17 {0.000 0.820 0.820 srgb} bind def +/col18 {0.560 0.000 0.000 srgb} bind def +/col19 {0.690 0.000 0.000 srgb} bind def +/col20 {0.820 0.000 0.000 srgb} bind def +/col21 {0.560 0.000 0.560 srgb} bind def +/col22 {0.690 0.000 0.690 srgb} bind def +/col23 {0.820 0.000 0.820 srgb} bind def +/col24 {0.500 0.190 0.000 srgb} bind def +/col25 {0.630 0.250 0.000 srgb} bind def +/col26 {0.750 0.380 0.000 srgb} bind def +/col27 {1.000 0.500 0.500 srgb} bind def +/col28 {1.000 0.630 0.630 srgb} bind def +/col29 {1.000 0.750 0.750 srgb} bind def +/col30 {1.000 0.880 0.880 srgb} bind def +/col31 {1.000 0.840 0.000 srgb} bind def + +end + +/cp {closepath} bind def +/ef {eofill} bind def +/gr {grestore} bind def +/gs {gsave} bind def +/sa {save} bind def +/rs {restore} bind def +/l {lineto} bind def +/m {moveto} bind def +/rm {rmoveto} bind def +/n {newpath} bind def +/s {stroke} bind def +/sh {show} bind def +/slc {setlinecap} bind def +/slj {setlinejoin} bind def +/slw {setlinewidth} bind def +/srgb {setrgbcolor} bind def +/rot {rotate} bind def +/sc {scale} bind def +/sd {setdash} bind def +/ff {findfont} bind def +/sf {setfont} bind def +/scf {scalefont} bind def +/sw {stringwidth} bind def +/tr {translate} bind def +/tnt {dup dup currentrgbcolor + 4 -2 roll dup 1 exch sub 3 -1 roll mul add + 4 -2 roll dup 1 exch sub 3 -1 roll mul add + 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb} + bind def +/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul + 4 -2 roll mul srgb} bind def +/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def +/$F2psEnd {$F2psEnteredState restore end} def + +/pageheader { +save +newpath 0 87 moveto 0 0 lineto 87 0 lineto 87 87 lineto closepath clip newpath +0.8 85.8 translate +1 -1 scale +$F2psBegin +10 setmiterlimit +0 slj 0 slc + 0.06299 0.06299 sc +} bind def +/pagefooter { +$F2psEnd +restore +} bind def +%%EndProlog +pageheader +% +% Fig objects follow +% +% +% here starts figure with depth 50 +% Polyline +0 slj +0 slc +7.500 slw +n 0 0 m 1350 0 l 1350 1350 l 0 1350 l + cp gs col6 1.00 shd ef gr gs col0 s gr +% here ends figure; +pagefooter +showpage +%%Trailer +%EOF diff --git a/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.pdf b/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.pdf Binary files differindex 430057751e5..93d74696642 100644 --- a/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.pdf +++ b/Master/texmf-dist/doc/latex/combinedgraphics/test/xfig325.pdf |