src/CutAndPaste.C
src/debug.C
src/exporter.C
src/CutAndPaste.C
src/debug.C
src/exporter.C
src/FloatList.C
src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h
src/FloatList.C
src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h
src/mathed/math_cursor.C
src/mathed/ref_inset.C
src/MenuBackend.C
src/mathed/math_cursor.C
src/mathed/ref_inset.C
src/MenuBackend.C
src/paragraph.C
src/support/filetools.C
src/tabular.C
src/paragraph.C
src/support/filetools.C
src/tabular.C
void BufferView::Pimpl::workAreaResize()
{
static int work_area_width;
void BufferView::Pimpl::workAreaResize()
{
static int work_area_width;
- static unsigned int work_area_height;
+ static int work_area_height;
bool const widthChange = workarea().workWidth() != work_area_width;
bool const heightChange = workarea().workHeight() != work_area_height;
bool const widthChange = workarea().workWidth() != work_area_width;
bool const heightChange = workarea().workHeight() != work_area_height;
+2002-07-01 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
+
+ * paragraph.C (startTeXParParams):
+ (endTeXParParams): add \protect when necessary
+
+2002-06-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
+
+ * BufferView_pimpl.C (workAreaExpose): remove warning
+
2002-06-27 Angus Leeming <leeming@lyx.org>
* Makefile.am: add lyxlayout_ptr_fwd.h.
2002-06-27 Angus Leeming <leeming@lyx.org>
* Makefile.am: add lyxlayout_ptr_fwd.h.
+2002-07-01 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
+
+ * GraphicsConverter.C (convert): do not use ChangeExtension
+ because to_file_base may contain a dot.
+
2002-06-28 Angus Leeming <leeming@lyx.org>
* GraphicsCacheItem.[Ch]: refactor some of the more convoluted logic
2002-06-28 Angus Leeming <leeming@lyx.org>
* GraphicsCacheItem.[Ch]: refactor some of the more convoluted logic
fs.close();
// The converted image is to be stored in this file
fs.close();
// The converted image is to be stored in this file
- to_file_ = ChangeExtension(to_file_base, formats.extension(to_format));
+ // We do not use ChangeExtension here because this is a
+ // basename, which may nevertheless contain a dot
+ to_file_ = to_file_base + '.' + formats.extension(to_format);
// The command needed to run the conversion process
// We create a dummy command for ease of understanding of the
// The command needed to run the conversion process
// We create a dummy command for ease of understanding of the
// This could go to ParagraphParameters if we want to
int Paragraph::startTeXParParams(BufferParams const & bparams,
// This could go to ParagraphParameters if we want to
int Paragraph::startTeXParParams(BufferParams const & bparams,
+ ostream & os, bool moving_arg) const
+ switch (params().align()) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL:
+ break;
+ case LYX_ALIGN_LEFT:
+ case LYX_ALIGN_RIGHT:
+ case LYX_ALIGN_CENTER:
+ if (moving_arg) {
+ os << "\\protect";
+ column = 8;
+ }
+ break;
+ }
+
switch (params().align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
switch (params().align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
// This could go to ParagraphParameters if we want to
int Paragraph::endTeXParParams(BufferParams const & bparams,
// This could go to ParagraphParameters if we want to
int Paragraph::endTeXParParams(BufferParams const & bparams,
+ ostream & os, bool moving_arg) const
+ switch (params().align()) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL:
+ break;
+ case LYX_ALIGN_LEFT:
+ case LYX_ALIGN_RIGHT:
+ case LYX_ALIGN_CENTER:
+ if (moving_arg) {
+ os << "\\protect";
+ column = 8;
+ }
+ break;
+ }
+
switch (params().align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
switch (params().align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
++column;
}
if (!asdefault)
++column;
}
if (!asdefault)
- column += startTeXParParams(bparams, os);
+ column += startTeXParParams(bparams, os, moving_arg);
- column += startTeXParParams(bparams, os);
+ column += startTeXParParams(bparams, os,
+ moving_arg);
}
value_type c = getChar(i);
}
value_type c = getChar(i);
- column += endTeXParParams(bparams, os);
+ column += endTeXParParams(bparams, os, moving_arg);
}
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
}
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
- int startTeXParParams(BufferParams const &, std::ostream &) const;
+ int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
- int endTeXParParams(BufferParams const &, std::ostream &) const;
+ int endTeXParParams(BufferParams const &, std::ostream &, bool) const;