Jürgen Spitzmüller wrote:
> The attached patch adds rudimental support via the external inset.

There was a typo in the patch. Corrected one attached.

Jürgen
Index: lib/external_templates
===================================================================
--- lib/external_templates	(Revision 24162)
+++ lib/external_templates	(Arbeitskopie)
@@ -244,7 +244,57 @@
 	FormatEnd
 TemplateEnd
 
+Template PDFPages
+	GuiName "PDF pages: $$AbsOrRelPathParent$$Basename"
+	HelpText
+		Includes PDF documents, using the 'pdfpages' package.
+		
+		To include multiple pages, use the "pages"-option,
+		which must be inserted to "Options" (Format "PDFLaTeX").
+		Examples:
+		    * pages={x-y} (for a range of pages)
+		    * pages={x,y,z} (for specific pages)
+		    * pages=- (to include all pages)
+		
+		Read the documentation of the pdfpages package
+		for further options and details.
+	HelpTextEnd
+	InputFormat "PDF"
+	FileFilter "*.pdf"
+	Transform Rotate
+	Transform Resize
+	Transform Extra
+	Format LaTeX
+		TransformOption Rotate RotationLatexOption
+		TransformOption Resize ResizeLatexOption
+		TransformOption Extra  ExtraOption
+		Option Arg "[$$Extra,$$Rotate,$$Resize]"
+		Product "\\includepdf$$Arg{$$AbsOrRelPathMaster$$Basename}"
+		UpdateFormat pdf
+		UpdateResult "$$AbsPath$$Basename.pdf"
+		Requirement "pdfpages"
+		ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
+	FormatEnd
+	Format PDFLaTeX
+		TransformOption Rotate RotationLatexOption
+		TransformOption Resize ResizeLatexOption
+		TransformOption Extra  ExtraOption
+		Option Arg "[$$Extra,$$Rotate,$$Resize]"
+		Product "\\includepdf$$Arg{$$AbsOrRelPathMaster$$Basename}"
+		UpdateFormat pdf
+		UpdateResult "$$AbsPath$$Basename.pdf"
+		Requirement "pdfpages"
+		ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
+	FormatEnd
+	Format Ascii
+		Product "[PDFPages: $$FName]"
+	FormatEnd
+	Format DocBook
+		Product "[PDFPages: $$FName]"
+	FormatEnd
+TemplateEnd
 
+
 Template Date
 	GuiName "Date"
 	HelpText
Index: lib/chkconfig.ltx
===================================================================
--- lib/chkconfig.ltx	(Revision 24162)
+++ lib/chkconfig.ltx	(Arbeitskopie)
@@ -246,6 +246,7 @@
 \TestPackage{nicefrac}
 \TestPackage{nomencl}
 \TestPackage{pdfcolmk}
+\TestPackage{pdfpages}
 \TestPackage{prettyref}
 \TestPackage{preview}
 \TestPackage{rotating}
Index: lib/doc/LaTeXConfig.lyx
===================================================================
--- lib/doc/LaTeXConfig.lyx	(Revision 24162)
+++ lib/doc/LaTeXConfig.lyx	(Arbeitskopie)
@@ -1,5 +1,5 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 318
+\lyxformat 325
 \begin_document
 \begin_header
 \textclass article
@@ -94,7 +94,7 @@
 \begin_inset Foot
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 The participating hosts in the Comprehensive TeX Archive Network are:
 \end_layout
 
@@ -110,7 +110,7 @@
 ftp://ftp.tex.ac.uk/tex-archive
 \end_layout
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 There are also a zillion mirror sites which are listed at the three primary
  sites.
 \end_layout
@@ -178,7 +178,7 @@
 \begin_inset Foot
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 or, if you want to change the system-wide settings, issue the command 
 \family typewriter
 ./configure
@@ -245,7 +245,7 @@
 \begin_inset Foot
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 In case it is not clear to you, this number is the date at which the version
  has been released.
 \end_layout
@@ -1004,8 +1004,11 @@
 \family sans
 foils
 \family default
- instead if it is available (see\InsetSpace ~
+ instead if it is available (see
+\begin_inset Space ~
+\end_inset
 
+
 \begin_inset CommandInset ref
 LatexCommand ref
 reference "ssec:foils"
@@ -1287,7 +1290,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 ftp://ftp.springer.de/pub/tex/latex/compsc/proc/author
 \end_layout
@@ -1356,7 +1359,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.sgmltools.org
 \end_layout
@@ -1423,7 +1426,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.dante.de
 \end_layout
@@ -1514,7 +1517,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://math.tulane.edu/~entcs/
 \end_layout
@@ -1845,7 +1848,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.ieee.org
 \end_layout
@@ -1906,7 +1909,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.worldscinet.com/ijmpc/mkt/guidelines.shtml
 \end_layout
@@ -1949,7 +1952,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.worldscinet.com/ijmpd/mkt/guidelines.shtml
 \end_layout
@@ -1992,7 +1995,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 ftp://ftp.iop.org/pub/journals/latex2e
 \end_layout
@@ -2193,7 +2196,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.wkap.nl/kaphtml.htm/STYLEFILES
 \end_layout
@@ -2217,7 +2220,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.wkap.nl/jrnllist.htm/JRNLHOME
 \end_layout
@@ -2462,12 +2465,14 @@
 .
  LaTeX documents are available from Springer's ftp site on the following
  URL:
-\newline
+\begin_inset Newline newline
+\end_inset
 
+
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 ftp://trick.ntp.springer.de/pub/tex/latex/llncs/latex2e
 \end_layout
@@ -2665,7 +2670,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://public.lanl.gov/kmh/spie/
 \end_layout
@@ -2686,7 +2691,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://spie.org/app/Publications/index.cfm?fuseaction=authinfo&type=proceedings
 \end_layout
@@ -2768,7 +2773,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://publish.aps.org/revtex4/
 \end_layout
@@ -2879,7 +2884,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.springeronline.com
 \end_layout
@@ -2954,7 +2959,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.springeronline.com
 \end_layout
@@ -3007,7 +3012,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.springeronline.com
 \end_layout
@@ -3075,7 +3080,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.tug.org
 \end_layout
@@ -3116,7 +3121,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.photogrammetry.ethz.ch/tarasp_workshop/isprs.cls
 \end_layout
@@ -3460,7 +3465,7 @@
 \begin_inset Foot
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 Here, a value of 
 \begin_inset Quotes eld
 \end_inset
@@ -4111,7 +4116,7 @@
 \begin_inset Flex URL
 status collapsed
 
-\begin_layout PlainLayout
+\begin_layout Plain Layout
 
 http://www.jurabib.org
 \end_layout
@@ -4257,6 +4262,40 @@
 \end_layout
 
 \begin_layout Subsection
+pdfpages
+\end_layout
+
+\begin_layout Description
+Found: 
+\begin_inset Info
+type  "package"
+arg   "pdfpages"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+CTAN: 
+\family typewriter
+macros/latex/contrib/pdfpages
+\end_layout
+
+\begin_layout Description
+Notes: The package 
+\family typewriter
+pdfpages
+\family default
+ is used by LyX to include multi-page PDF files via 
+\family sans
+Insert\SpecialChar \menuseparator
+File\SpecialChar \menuseparator
+External Material
+\family default
+.
+\end_layout
+
+\begin_layout Subsection
 prettyref
 \end_layout
 
@@ -4410,7 +4449,10 @@
 \family sans
 subfig
 \family default
- is used by LyX to produce subfloats (i.\InsetSpace \thinspace{}
+ is used by LyX to produce subfloats (i.
+\begin_inset Space \thinspace{}
+\end_inset
+
 e., subfigures, subtables, etc.).
  Subfloats are floats that are embedded inside other floats and that can
  have individual subcaptions.
Index: lib/configure.py
===================================================================
--- lib/configure.py	(Revision 24162)
+++ lib/configure.py	(Arbeitskopie)
@@ -409,7 +409,7 @@
     checkProg('a PDF to PS converter', ['pdf2ps $$i $$o', 'pdftops $$i $$o'],
         rc_entry = [ r'\converter pdf         ps        "%%"	""' ])
     #
-    checkProg('a PDF to EPS converter', ['pdftops -eps $$i $$o'],
+    checkProg('a PDF to EPS converter', ['pdftops -eps -f 1 -l 1 $$i $$o'],
         rc_entry = [ r'\converter pdf         eps        "%%"	""' ])
     #
     checkProg('a DVI to TXT converter', ['catdvi $$i > $$o'],
Index: src/LaTeXFeatures.cpp
===================================================================
--- src/LaTeXFeatures.cpp	(Revision 24162)
+++ src/LaTeXFeatures.cpp	(Arbeitskopie)
@@ -450,7 +450,8 @@
 	"ifthen",
 	"amsthm",
 	"listings",
-	"bm"
+	"bm",
+	"pdfpages"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);

Reply via email to