When --with-qt-dir has been specified, programs like "moc" in the Qt
directory are unlikely to have a qualified name like moc-qt4.
Therefore, such qualified names are only considered when the base
version has not been found.
In particular, lilypond-book is just a python script. On windows,
we need to call the python interpreter, using the full path to
the script while being wary of spaces in the path.
- revert the previous layout change where inputenc was mentioned. This was not wrong but too intrusive for a change in branch
- mention that the aa class loads natbib to avoid compilation errors
- aa_sample.lyx: the aa package contains an outdated an customized version of natbib.sty. This file only woks with aa, but breaks the compilation of many other files on your system, therefore remove the bibliography and replace it by BibTeX; also clean up the preamble and add a note about the encoding
- aa.lyx: add a note about the encoding and set it in the document settings
A lot of this involves removing toclevel tags. They got introduced
by the automatic update of some layout files to format 19.
(cherry picked from commit b9f48eb945)
Conflicts:
lib/layouts/beamer.layout
lib/layouts/memoir.layout
lib/layouts/scrartcl.layout
lib/layouts/stdsections.inc
Move the handling of branch-(de)activate(master) to Buffer. This code was moved to Bufferview in [3a03e71c/lyxgit] because a cursor was necessary to call Undo::recordUndoFullDocument(). However, it turns out that the undo code is already prepared to handle an empty cursor (and do nothing in this case).
Therefore we do that and move the branch code to Buffer where it belongs.
Note that there was a bug in the previous code that broke undo support: recordUndo should always be called _before_ doing any change.
Using Cursor::setCursor or even BufferView::setCursor is often a bad
idea since it does not run DEPM. In this case (and other cases in
f&replace code) it is better to use BufferView::mouseSetCursor (which
should maybe be renamed...).
src/TextClass.h
src/insets/InsetTabular.h
Overloaded virtual method missing the 'const' qualifier
src/insets/InsetCommandParams.h
Missing constructor (breaks compilation with llvm/clang)
src/frontends/qt4/GuiWorkArea.cpp
Missing parenthesis: `+' has priority over `?:' (I do not know
whether this has a visible effect).
src/mathed/InsetMathFont.cpp
Use of == instead of = in mathmlize()
Uwe says that this fixes#8425.
This has been in trunk for two weeks without problems. Hopefully,
that means it is safe.
(cherry picked from commit e2155d3d58)
Conflicts:
src/Buffer.cpp
