Small clean-up.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7815 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d8bbe7da5195c340757d346fd6ac44e47542c400..59593dbe4afa01788b662060469a65faa778f481 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-23  Angus Leeming  <leeming@lyx.org>
+
+       * external_templates: split the XfigInput preamble definition into two,
+       renaming the macro called by the user as \inputOrWarn.
+
 2003-09-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * ijmpd.lyx: re-add (it was only present on the 1.2.x branch)

diff --git a/lib/external_templates b/lib/external_templates
index 3dd2a4b1263d25be835527e019d5169ec3680395..25aef4547aa2a12b1587a242f5ba2272a78c296c 100644 (file)
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -1,21 +1,40 @@
-# Basic External Templates for LyX
+#
+# file external_templates
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+#
+# author Asger Alstrup Nielsen
+# author Angus Leeming
+# author Johnathan Burchill
+#
+# Full author contact details are available in file CREDITS.
 
-PreambleDef XFigInput
-       %% This inputs the file if it exists, else prints a warning
-       %% encased in an fbox.
-       \def\stripprefix#1>{}
-       \newcommand*{\xfiginput}[1]{%
-           \edef\tempfilename{#1}%
-           \InputIfFileExists{#1}{}{%
+# This file contains the definitions of those External Templates that are
+# part of the official LyX distribution.
+# Feel free to create your own External Templates, storing them in
+# .lyx/external_templates
+
+
+PreambleDef WarnNotFound
+       %% Print a warning encased in an fbox.
+       \def\lyxstripprefix#1>{}
+       \newcommand{\warnNotFound}[1]{%
+               \def\lyxtempfilename{#1}%
                \fbox{Could not find
-                   \ttfamily\expandafter\stripprefix\meaning\tempfilename!}
-               \typeout{xfiginput: Could not find \tempfilename!}
-           }
+                       \ttfamily\expandafter\lyxstripprefix\meaning\lyxtempfilename!}%
+               \typeout{Could not find \lyxtempfilename!}%
        }
 PreambleDefEnd
 
+
+PreambleDef InputOrWarn
+       %% Input the file if it exists, using \input, else print a warning
+       \newcommand{\inputOrWarn}[1]{%
+               \IfFileExists{#1}{\input{#1}}{\warnNotFound{#1}}}
+PreambleDefEnd
+
 Template XFig
-       GuiName "[XFig: $$Basename]"
+       GuiName "XFig: $$Basename"
        HelpText
                An XFig figure.
                This template uses XFig for editing.
@@ -25,18 +44,20 @@ Template XFig
        EditCommand "xfig $$FName"
        AutomaticProduction true
        Format LaTeX
-               Product "\\xfiginput{$$Basename.pstex_t}"
+               Product "\\inputOrWarn{$$Basename.pstex_t}"
                UpdateFormat pstex
                UpdateResult "$$Basename.pstex_t"
                Requirement "graphicx"
-               Preamble XFigInput
+               Preamble WarnNotFound
+               Preamble InputOrWarn
        FormatEnd
        Format PDFLaTeX
-               Product "\\xfiginput{$$Basename.pdftex_t}"
+               Product "\\inputOrWarn{$$Basename.pdftex_t}"
                UpdateFormat pdftex
                UpdateResult "$$Basename.pdftex_t"
                Requirement "graphicx"  
-               Preamble XFigInput
+               Preamble WarnNotFound
+               Preamble InputOrWarn
        FormatEnd
        Format Ascii
                Product "$$Contents(\"$$Basename.asc\")"
@@ -54,7 +75,7 @@ Template XFig
 TemplateEnd
 
 Template ChessDiagram
-       GuiName "[Chess: $$Basename]"
+       GuiName "Chess: $$Basename"
        HelpText
                A chess position diagram.
                This template will use XBoard to edit the position.
@@ -96,7 +117,7 @@ Template ChessDiagram
 TemplateEnd
 
 Template Date
-       GuiName "[Date]"
+       GuiName "Date"
        HelpText
                Todays date.
                Read 'info date' for more information.