diff --git a/lib/external_templates b/lib/external_templates index e3d4927806..6f11c71fe3 100644 --- a/lib/external_templates +++ b/lib/external_templates @@ -41,7 +41,7 @@ Template RasterImage In the parameters box, you can provide optional parameters for the ImageMagick convert program. E.g., use `-border 10x10 -bordercolor black' - to surround the picture with a black border + to surround the picture with a black border when you export to LaTeX. When you export to Ascii, you can provide a number describing how many columns the picture @@ -62,7 +62,7 @@ Template RasterImage Product "\\includegraphics{$$Basename}" UpdateFormat png UpdateResult "$$Basename.png" - Requirement "graphicx" + Requirement "graphicx" FormatEnd Format Ascii Product "$$Contents(\"$$Basename.asc\")" @@ -102,7 +102,7 @@ Template XFig Product "\\inputOrWarn{$$Basename.pdftex_t}" UpdateFormat pdftex UpdateResult "$$Basename.pdftex_t" - Requirement "graphicx" + Requirement "graphicx" Preamble WarnNotFound Preamble InputOrWarn FormatEnd @@ -127,7 +127,7 @@ Template ChessDiagram HelpText A chess position diagram. This template will use XBoard to edit the position. - Use the 'File->Save Position' in XBoard to save + Use the 'File->Save Position' in XBoard to save the position that you want to display. Make sure to give it a '.fen' extension and remember to type in a relative path @@ -136,7 +136,7 @@ Template ChessDiagram to enable general editing of the board. You might also check out the 'Options->Test legality' option, and - remember to middle and right click to + remember to middle and right click to insert new material in the board. In order for this to work, you have to put the bundled lyxskak.sty in a place @@ -195,4 +195,3 @@ Template Date UpdateResult "$$Tempname" FormatEnd TemplateEnd - diff --git a/po/POTFILES.in b/po/POTFILES.in index ef9083a9b7..15400946d3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -188,7 +188,6 @@ src/mathed/ref_inset.C src/paragraph.C src/paragraph_funcs.C src/rowpainter.C -src/support/path_defines.C src/text.C src/text2.C src/text3.C diff --git a/src/ChangeLog b/src/ChangeLog index 2115e58c11..2af780c6c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-10-07 Angus Leeming + + * factory.C (createInset): InsetExternal::Params -> InsetExternalParams + 2003-10-07 Jürgen Spitzmüller * aspell.C: diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index e05682d5bf..0ee4f47405 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,17 @@ +2003-10-07 Angus Leeming + + * ExternalSupport.[Ch]: new files, moving the private member functions + and namespace anon functions out of insetexternal.C to here, so making + it easier to understand what is going on in insetexternal itself. + + * Makefile.am: add new files. + + * insetexternal.[Ch]: InsetExternal::Params -> InsetExternalParams, + allowing the class to be forward declared. (Also consistent with + all other Params classes.) + (write): moved out of the class. Move this function and those in + namespace anon to ExternalSupport.[Ch]. + 2003-10-07 Angus Leeming * ExternalTemplate.[Ch] (TemplateManager::getTemplates): remove @@ -139,7 +153,7 @@ 2003-09-16 Lars Gullik Bjønnes - * insetgraphics.C: + * insetgraphics.C: * insetbibtex.C: use namespace alias for lyx::support::os 2003-09-16 Angus Leeming diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C index 0ae746b574..a2c9340f13 100644 --- a/src/insets/ExternalSupport.C +++ b/src/insets/ExternalSupport.C @@ -29,12 +29,12 @@ #include "support/std_ostream.h" - namespace support = lyx::support; using std::endl; -using std::string; + using std::ostream; +using std::string; namespace lyx { @@ -49,11 +49,10 @@ Template const * getTemplatePtr(InsetExternalParams const & params) void editExternal(InsetExternalParams const & params, Buffer const & buffer) { - external::Template const * const et_ptr = - external::getTemplatePtr(params); + Template const * const et_ptr = getTemplatePtr(params); if (!et_ptr) return; - external::Template const & et = *et_ptr; + Template const & et = *et_ptr; if (et.editCommand.empty()) return; @@ -118,21 +117,19 @@ void updateExternal(InsetExternalParams const & params, Buffer const & buffer, bool external_in_tmpdir) { - external::Template const * const et_ptr = - external::getTemplatePtr(params); + Template const * const et_ptr = getTemplatePtr(params); if (!et_ptr) return; // FAILURE - external::Template const & et = *et_ptr; + Template const & et = *et_ptr; if (!et.automaticProduction) return; // NOT_NEEDED - external::Template::Formats::const_iterator cit = - et.formats.find(format); + Template::Formats::const_iterator cit = et.formats.find(format); if (cit == et.formats.end()) return; // FAILURE - external::Template::Format const & outputFormat = cit->second; + Template::Format const & outputFormat = cit->second; if (outputFormat.updateResult.empty()) return; // NOT_NEEDED @@ -158,7 +155,7 @@ void updateExternal(InsetExternalParams const & params, if (!converters.isReachable(from_format, to_format)) { lyxerr[Debug::EXTERNAL] - << "InsetExternal::updateExternal. " + << "external::updateExternal. " << "Unable to convert from " << from_format << " to " << to_format << endl; return; // FAILURE @@ -208,14 +205,12 @@ int writeExternal(InsetExternalParams const & params, Buffer const & buffer, ostream & os, bool external_in_tmpdir) { - external::Template const * const et_ptr = - external::getTemplatePtr(params); + Template const * const et_ptr = getTemplatePtr(params); if (!et_ptr) return 0; - external::Template const & et = *et_ptr; + Template const & et = *et_ptr; - external::Template::Formats::const_iterator cit = - et.formats.find(format); + Template::Formats::const_iterator cit = et.formats.find(format); if (cit == et.formats.end()) { lyxerr[Debug::EXTERNAL] << "External template format '" << format