anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Forgotten ChangeLogs, whitespace and some unnecessary namespace stuff removed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7875 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-10-07 21:44:59 +00:00
parent 1e8ce61177
commit fbd9df3dbb
5 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/external_templates
View File

@ -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

1
po/POTFILES.in
View File

@ -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

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-10-07 Angus Leeming <leeming@lyx.org>
* factory.C (createInset): InsetExternal::Params -> InsetExternalParams
2003-10-07 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* aspell.C:

16
src/insets/ChangeLog
View File

@ -1,3 +1,17 @@
2003-10-07 Angus Leeming <leeming@lyx.org>
* 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 <leeming@lyx.org>
* ExternalTemplate.[Ch] (TemplateManager::getTemplates): remove
@ -139,7 +153,7 @@
2003-09-16 Lars Gullik Bjønnes <larsbj@gullik.net>
* insetgraphics.C:
* insetgraphics.C:
* insetbibtex.C: use namespace alias for lyx::support::os
2003-09-16 Angus Leeming <leeming@lyx.org>

29
src/insets/ExternalSupport.C
View File

@ -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