bug fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2707 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-09-07 15:41:36 +00:00
parent ef1a996e2f
commit 9359baacf8
15 changed files with 91 additions and 40 deletions

View File

@ -1,3 +1,7 @@
2001-09-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* boost/crc.hpp (detail): re-apply the cxx patch from 2001-06-07.
2001-07-07 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-07-07 Lars Gullik Bjønnes <larsbj@birdstep.com>
* boost/config.hpp: update * boost/config.hpp: update

View File

@ -280,10 +280,15 @@ namespace detail
typedef typename base_type::least least; typedef typename base_type::least least;
typedef typename base_type::fast fast; typedef typename base_type::fast fast;
#ifdef __DECCXX
static const least high_bit = 1ul << (Bits - 1u);
static const fast high_bit_fast = 1ul << (Bits - 1u);
#else
BOOST_STATIC_CONSTANT( least, high_bit = (least( 1u ) << ( Bits BOOST_STATIC_CONSTANT( least, high_bit = (least( 1u ) << ( Bits
- 1u )) ); - 1u )) );
BOOST_STATIC_CONSTANT( fast, high_bit_fast = (fast( 1u ) << ( Bits BOOST_STATIC_CONSTANT( fast, high_bit_fast = (fast( 1u ) << ( Bits
- 1u )) ); - 1u )) );
#endif
}; // boost::detail::high_uint_t }; // boost::detail::high_uint_t
@ -340,7 +345,11 @@ namespace detail
BOOST_STATIC_CONSTANT( fast, high_bit_fast = base_type::high_bit_fast ); BOOST_STATIC_CONSTANT( fast, high_bit_fast = base_type::high_bit_fast );
#endif #endif
#ifdef __DECCXX
static const least sig_bits = (~( ~(0ul) << Bits));
#else
BOOST_STATIC_CONSTANT( least, sig_bits = (~( ~(least( 0u )) << Bits )) ); BOOST_STATIC_CONSTANT( least, sig_bits = (~( ~(least( 0u )) << Bits )) );
#endif
BOOST_STATIC_CONSTANT( fast, sig_bits_fast = fast(sig_bits) ); BOOST_STATIC_CONSTANT( fast, sig_bits_fast = fast(sig_bits) );
}; // boost::detail::mask_uint_t }; // boost::detail::mask_uint_t

View File

@ -1,3 +1,11 @@
2001-09-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* layouts/dinbrief.layout:
* layouts/egs.layout:
* layouts/iletter.layout:
* layouts/stdletter.inc: remove bogus use of the now defunct Latex
tag
2001-09-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-09-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* examples/da_splash.lyx: new translation from Claus Hindsgaul * examples/da_splash.lyx: new translation from Claus Hindsgaul

View File

@ -54,7 +54,6 @@ Style Opening
Shape Italic Shape Italic
Size Small Size Small
Color blue Color blue
Latex no_latex
EndFont EndFont
End End
@ -68,7 +67,6 @@ Style Signature
Shape Italic Shape Italic
Size Small Size Small
Color blue Color blue
Latex no_latex
EndFont EndFont
End End
@ -82,7 +80,6 @@ Style Closing
Shape Italic Shape Italic
Size Small Size Small
Color blue Color blue
Latex no_latex
EndFont EndFont
End End

View File

@ -353,7 +353,7 @@ Style Author
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -379,7 +379,7 @@ Style Affil
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -405,7 +405,7 @@ Style Journal
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -432,7 +432,7 @@ Style msnumber
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -459,7 +459,7 @@ Style FirstAuthor
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -485,7 +485,7 @@ Style Received
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -511,7 +511,7 @@ Style Accepted
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -539,7 +539,7 @@ Style Offsets
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -738,7 +738,7 @@ Style LaTeX
# standard font definition # standard font definition
Font Font
Latex Latex Color red
EndFont EndFont
End End

View File

@ -62,7 +62,7 @@ Style Oggetto
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -84,7 +84,7 @@ Style Citta
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -106,6 +106,6 @@ Style Data
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End

View File

@ -75,7 +75,7 @@ Style Opening
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -98,7 +98,7 @@ Style Signature
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End
@ -121,7 +121,7 @@ Style Closing
LabelFont LabelFont
Series Bold Series Bold
Shape Italic Shape Italic
Latex Latex Color red
EndFont EndFont
End End

View File

@ -1,3 +1,11 @@
2001-09-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxfont.h (isSymbolFont): shut off warning
* text.C (setHeightOfRow):
(getVisibleRow): fix crash with empty paragraphs which have a
bottom line
2001-09-07 Rob Lahaye <lahaye@users.sourceforge.net> 2001-09-07 Rob Lahaye <lahaye@users.sourceforge.net>
* lyxrc.[Ch]: added dialogs_iconify_with_main variable and associated * lyxrc.[Ch]: added dialogs_iconify_with_main variable and associated

View File

@ -1,3 +1,9 @@
2001-09-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* Toolbar_pimpl.C (setLayout):
(layoutSelected): make them work even when gettext has been
translating the interface.
2001-09-07 Angus Leeming <a.leeming@ic.ac.uk> 2001-09-07 Angus Leeming <a.leeming@ic.ac.uk>
* FormPreferences.C (build): Fix bug: if you start LyX and open the * FormPreferences.C (build): Fix bug: if you start LyX and open the

View File

@ -145,21 +145,6 @@ extern "C" int C_Toolbar_BubblePost(FL_OBJECT * ob, int event,
} // namespace anon } // namespace anon
// this one is not "C" because combox callbacks are really C++ %-|
void Toolbar::Pimpl::layoutSelectedCB(int, void * arg, Combox *)
{
Toolbar::Pimpl * tb = reinterpret_cast<Toolbar::Pimpl *>(arg);
tb->layoutSelected();
}
void Toolbar::Pimpl::layoutSelected()
{
owner->getLyXFunc()->dispatch(LFUN_LAYOUT, combox->getline());
}
void Toolbar::Pimpl::activate() void Toolbar::Pimpl::activate()
{ {
ToolbarList::const_iterator p = toollist.begin(); ToolbarList::const_iterator p = toollist.begin();
@ -216,12 +201,41 @@ void Toolbar::Pimpl::update()
} }
// this one is not "C" because combox callbacks are really C++ %-|
void Toolbar::Pimpl::layoutSelectedCB(int, void * arg, Combox *)
{
Toolbar::Pimpl * tb = reinterpret_cast<Toolbar::Pimpl *>(arg);
tb->layoutSelected();
}
void Toolbar::Pimpl::layoutSelected()
{
string const & layoutguiname = combox->getline();
LyXTextClass const & tc =
textclasslist.TextClass(owner->buffer()->
params.textclass);
LyXTextClass::const_iterator end = tc.end();
for (LyXTextClass::const_iterator cit = tc.begin();
cit != end; ++cit) {
if (_(cit->name()) == layoutguiname) {
owner->getLyXFunc()->dispatch(LFUN_LAYOUT, cit->name());
return;
}
}
lyxerr << "ERROR (Toolbar::Pimpl::layoutSelected): layout not found!"
<< endl;
}
void Toolbar::Pimpl::setLayout(int layout) { void Toolbar::Pimpl::setLayout(int layout) {
if (combox) { if (combox) {
LyXTextClass const & tc = LyXTextClass const & tc =
textclasslist.TextClass(owner->buffer()-> textclasslist.TextClass(owner->buffer()->
params.textclass); params.textclass);
combox->select(tc[layout].name()); combox->select(_(tc[layout].name()));
} }
} }

View File

@ -1,3 +1,8 @@
2001-09-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* insetquotes.C (InsetQuotes): when trying to decide the side of
the quote, choose `left' only after a space or '('
2001-09-04 José Matos <jamatos@fep.up.pt> 2001-09-04 José Matos <jamatos@fep.up.pt>
* figinset.C * figinset.C
* figinset.h * figinset.h

View File

@ -85,7 +85,7 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
{ {
// Decide whether left or right // Decide whether left or right
switch (c) { switch (c) {
case ' ': case '(': case '{': case '[': case '-': case ':': case ' ': case '(':
case Paragraph::META_HFILL: case Paragraph::META_HFILL:
case Paragraph::META_NEWLINE: case Paragraph::META_NEWLINE:
side_ = LeftQ; // left quote side_ = LeftQ; // left quote

View File

@ -434,7 +434,6 @@ bool LyXFont::isSymbolFont() const
default: default:
return false; return false;
} }
return false;
} }
/// ///

View File

@ -537,7 +537,7 @@ Inset * Paragraph::getInset(Paragraph::size_type pos)
if (it != insetlist.end() && it->pos == pos) if (it != insetlist.end() && it->pos == pos)
return it->inset; return it->inset;
lyxerr << "ERROR (Paragraph::GetInset): " lyxerr << "ERROR (Paragraph::getInset): "
"Inset does not exist: " << pos << endl; "Inset does not exist: " << pos << endl;
//::raise(SIGSTOP); //::raise(SIGSTOP);

View File

@ -1429,7 +1429,8 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const
if (firstpar->params().lineBottom()) if (firstpar->params().lineBottom())
maxdesc += 2 * lyxfont::ascent('x', maxdesc += 2 * lyxfont::ascent('x',
getFont(bview->buffer(), getFont(bview->buffer(),
par, par->size() - 1)); par,
max(Paragraph::size_type(0), par->size() - 1)));
// and now the pagebreaks // and now the pagebreaks
if (firstpar->params().pagebreakBottom()) if (firstpar->params().pagebreakBottom())
@ -3423,7 +3424,7 @@ void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset,
y_bottom -= lyxfont::ascent('x', y_bottom -= lyxfont::ascent('x',
getFont(bview->buffer(), getFont(bview->buffer(),
par, par,
par->size() - 1)); max(Paragraph::size_type(0), par->size() - 1)));
int const w = (inset_owner ? int const w = (inset_owner ?
inset_owner->width(bview, font) : ww); inset_owner->width(bview, font) : ww);
int const xp = static_cast<int>(inset_owner ? x : 0); int const xp = static_cast<int>(inset_owner ? x : 0);
@ -3434,7 +3435,7 @@ void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset,
y_bottom -= lyxfont::ascent('x', y_bottom -= lyxfont::ascent('x',
getFont(bview->buffer(), getFont(bview->buffer(),
par, par,
par->size() - 1)); max(Paragraph::size_type(0), par->size() - 1)));
} }
// draw an endlabel // draw an endlabel