please apply
thanks
john
--
"Faced with the prospect of rereading this book, I would rather have
my brains ripped out by a plastic fork."
- Charles Cooper on "Business at the Speed of Thought"
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.436
diff -u -r1.436 ChangeLog
--- src/ChangeLog 2001/12/05 15:34:41 1.436
+++ src/ChangeLog 2001/12/05 18:20:27
@@ -1,3 +1,8 @@
+2001-12-05 John Levon <[EMAIL PROTECTED]>
+
+ * paragraph_pimpl.h:
+ * paragraph_pimpl.C: isTextAt() doesn't need font param
+
2001-12-05 Juergen Vigna <[EMAIL PROTECTED]>
* CutAndPaste.C (pasteSelection): remove not allowed insets/chars and
Index: src/paragraph_pimpl.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_pimpl.h,v
retrieving revision 1.7
diff -u -r1.7 paragraph_pimpl.h
--- src/paragraph_pimpl.h 2001/11/27 11:57:57 1.7
+++ src/paragraph_pimpl.h 2001/12/05 18:20:27
@@ -148,7 +148,7 @@
ParagraphParameters params;
private:
/// match a string against a particular point in the paragraph
- bool isTextAt(BufferParams const &, LyXFont &,
+ bool isTextAt(BufferParams const &,
string const & str, lyx::pos_type pos);
/// Who owns us?
Index: src/paragraph_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_pimpl.C,v
retrieving revision 1.23
diff -u -r1.23 paragraph_pimpl.C
--- src/paragraph_pimpl.C 2001/11/29 16:29:28 1.23
+++ src/paragraph_pimpl.C 2001/12/05 18:20:28
@@ -256,9 +256,11 @@
}
-bool Paragraph::Pimpl::isTextAt(BufferParams const & bp, LyXFont & font,
+bool Paragraph::Pimpl::isTextAt(BufferParams const & bp,
string const & str, pos_type pos)
{
+ LyXFont const & font = owner_->getFont(bp, pos);
+
for (string::size_type i = 0; i < str.length(); ++i) {
if (pos + static_cast<pos_type>(i) >= size())
return false;
@@ -486,7 +488,7 @@
size_t pnr = 0;
for (; pnr < phrases_nr; ++pnr) {
- if (isTextAt(bparams, font, special_phrases[pnr][0],
i)) {
+ if (isTextAt(bparams, special_phrases[pnr][0], i)) {
os << special_phrases[pnr][1];
i += special_phrases[pnr][0].length() - 1;
column += special_phrases[pnr][1].length() - 1;
