From: Jean-Marc Lasgouttes Date: Tue, 10 Sep 2002 16:04:10 +0000 (+0000) Subject: fix extension problem for filenames with dots X-Git-Tag: 1.6.10~18319 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0bd9a0a81e664bae636822de34d094db11141c7a;p=features.git fix extension problem for filenames with dots git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5254 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/po/POTFILES.in b/po/POTFILES.in index ca6ca71010..aff2b7b794 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,18 +1,21 @@ +src/BufferView.C +src/BufferView_pimpl.C +src/Chktex.C +src/CutAndPaste.C +src/FloatList.C +src/LColor.C +src/LaTeX.C +src/LyXAction.C +src/MenuBackend.C src/buffer.C src/bufferlist.C -src/BufferView2.C src/bufferview_funcs.C -src/BufferView_pimpl.C -src/Chktex.C src/converter.C -src/CutAndPaste.C src/debug.C src/exporter.C src/ext_l10n.h -src/FloatList.C -src/frontends/controllers/biblio.C +src/frontends/LyXView.C src/frontends/controllers/ButtonController.h -src/frontends/controllers/character.C src/frontends/controllers/ControlAboutlyx.C src/frontends/controllers/ControlBibtex.C src/frontends/controllers/ControlCharacter.C @@ -26,13 +29,13 @@ src/frontends/controllers/ControlSearch.C src/frontends/controllers/ControlSpellchecker.C src/frontends/controllers/ControlThesaurus.C src/frontends/controllers/ControlVCLog.C +src/frontends/controllers/biblio.C +src/frontends/controllers/character.C src/frontends/controllers/frnt_lang.C src/frontends/controllers/helper_funcs.C src/frontends/gnome/GLog.C -src/frontends/LyXView.C src/frontends/qt2/Alert_pimpl.C src/frontends/qt2/FileDialog.C -src/frontends/qt2/lengthcombo.C src/frontends/qt2/QAbout.C src/frontends/qt2/QBibitem.C src/frontends/qt2/QBibtex.C @@ -42,8 +45,8 @@ src/frontends/qt2/QCitation.C src/frontends/qt2/QCitationDialog.C src/frontends/qt2/QCommandBuffer.C src/frontends/qt2/QDocument.C -src/frontends/qt2/QError.C src/frontends/qt2/QERT.C +src/frontends/qt2/QError.C src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QFloat.C @@ -67,9 +70,9 @@ src/frontends/qt2/QThesaurus.C src/frontends/qt2/QToc.C src/frontends/qt2/QURL.C src/frontends/qt2/QVCLog.C +src/frontends/qt2/lengthcombo.C src/frontends/xforms/Alert_pimpl.C src/frontends/xforms/ColorHandler.C -src/frontends/xforms/combox.C src/frontends/xforms/FeedbackController.C src/frontends/xforms/FileDialog.C src/frontends/xforms/FormAboutlyx.C @@ -78,8 +81,8 @@ src/frontends/xforms/FormBibtex.C src/frontends/xforms/FormCharacter.C src/frontends/xforms/FormCitation.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/FormError.C src/frontends/xforms/FormERT.C +src/frontends/xforms/FormError.C src/frontends/xforms/FormExternal.C src/frontends/xforms/FormFiledialog.C src/frontends/xforms/FormFloat.C @@ -111,14 +114,16 @@ src/frontends/xforms/FormThesaurus.C src/frontends/xforms/FormToc.C src/frontends/xforms/FormUrl.C src/frontends/xforms/FormVCLog.C -src/frontends/xforms/input_validators.C +src/frontends/xforms/FormWrap.C src/frontends/xforms/Menubar_pimpl.C -src/frontends/xforms/xforms_helpers.C src/frontends/xforms/XMiniBuffer.C +src/frontends/xforms/combox.C +src/frontends/xforms/input_validators.C +src/frontends/xforms/xforms_helpers.C src/gettext.h src/importer.C -src/insets/insetbib.C src/insets/inset.C +src/insets/insetbib.C src/insets/insetcaption.C src/insets/inseterror.C src/insets/insetert.C @@ -142,16 +147,14 @@ src/insets/insettext.C src/insets/insettheorem.C src/insets/insettoc.C src/insets/inseturl.C +src/insets/insetwrap.C src/kbsequence.C src/language.C -src/LaTeX.C -src/LColor.C -src/LyXAction.C src/lyx_cb.C +src/lyx_main.C src/lyxfind.C src/lyxfont.C src/lyxfunc.C -src/lyx_main.C src/lyxrc.C src/lyxtextclasslist.C src/lyxvc.C @@ -161,11 +164,10 @@ src/mathed/math_cursor.C src/mathed/math_hullinset.C src/mathed/math_parboxinset.C src/mathed/ref_inset.C -src/MenuBackend.C src/paragraph.C src/support/filetools.C src/tabular.C +src/text.C src/text2.C src/text3.C -src/text.C src/ext_l10n.h diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 854dd73d90..bed487bb76 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,9 @@ +2002-09-10 Jean-Marc Lasgouttes + + * GraphicsConverter.C (build_script): do not use ChangeExtension + on a base name + (Impl): ditto + 2002-09-05 Angus Leeming * all files: modify the headers as discussed on the list. diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C index dd851246c6..7f32d30ffc 100644 --- a/src/graphics/GraphicsConverter.C +++ b/src/graphics/GraphicsConverter.C @@ -136,8 +136,10 @@ Converter::Impl::Impl(string const & from_file, string const & to_file_base, << "\n\tfrom_format: " << from_format << "\n\tto_format: " << to_format << endl; - // The converted image is to be stored in this file - to_file_ = ChangeExtension(to_file_base, formats.extension(to_format)); + // The converted image is to be stored in this file (we do not + // use ChangeExtension because this is a basename which may + // nevertheless contain a '.') + to_file_ = to_file_base + '.' + formats.extension(to_format); // The conversion commands are stored in a stringstream ostringstream script; @@ -263,8 +265,10 @@ bool build_script(string const & from_file, lyxerr[Debug::GRAPHICS] << "build_script ... "; typedef Converters::EdgePath EdgePath; - string const to_file = ChangeExtension(to_file_base, - formats.extension(to_format)); + // we do not use ChangeExtension because this is a basename + // which may nevertheless contain a '.' + string const to_file = to_file_base + '.' + + formats.extension(to_format); if (from_format == to_format) { script << move_file(QuoteName(from_file), QuoteName(to_file));