Commit Graph

271 Commits

Author SHA1 Message Date
Bo Peng
f37a03ece9 Scons: check for unused/misspelled command line option, allow rebuild=yes/no/all/none.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14449 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-13 17:52:41 +00:00
Michael Schmitt
94d5cd6c67 * SConstruct: remove xforms relicts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14417 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 19:40:55 +00:00
Abdelrazak Younes
852431e2a6 Add -DQT_NO_KEYWORDS to compiler option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14413 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 17:40:14 +00:00
Bo Peng
7dcf1bdb26 SCons: fix a small bug in scons_utils.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14388 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 22:42:09 +00:00
Bo Peng
1f831d0a99 Scons: fix DESTDIR
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14386 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 21:31:57 +00:00
Michael Schmitt
4eccc22119 remove xforms relicts
* src/frontends/qt3/QPrefs.C:
        * src/frontends/controllers/BCView.tmpl:
        * src/support/package.h: fix/remove comment

        * po/pocheck.pl: no longer check for xforms shortcuts
        * development/Win32/lyx.vcproj: ignore ControlPreamble.[Ch]


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14372 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 09:40:15 +00:00
Angus Leeming
136fc28dae Update Geoffrey Tobin's email address to something that doesn't bounce...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14367 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 16:22:46 +00:00
Angus Leeming
7c0e56ff5d Fix the fix so that it actually works ;-)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14366 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 16:21:45 +00:00
Bo Peng
563c1b6b24 Scons: allow non-exist build_dir option, adjust QTDIR/bin handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14365 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 16:21:10 +00:00
Angus Leeming
0edeef83b7 Fix humiliating typo and update the link to the licence page on the web.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14361 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 15:58:57 +00:00
Angus Leeming
9a88b1d8be * Enable man2ps to work without hard-coding the locations of groff or dpost.
* Re-add whitespace fluff to {dvi,dtl}.doc --- minimize change to original package.
* Enable man2ps (and hence doc) targets in Makefile to build out of the box.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14359 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 14:05:23 +00:00
Bo Peng
fc42d0d4f9 Scons: check system boost version, probe qt3 libs for qt2 frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14354 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 03:08:37 +00:00
Jean-Marc Lasgouttes
2558af85af fix hyphens in man pages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14351 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-06 14:27:46 +00:00
Bo Peng
a54d3e83bd Scons: exclude boost headers only for system boost header files.
* INSTALL.scons: document this change.
	* development/scons/SConstruct: check for included_boost to exclude boost 
	  headers from the dependency tree.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14343 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-05 18:48:59 +00:00
Bo Peng
e85cfec957 Scons: do not build boost dependency tree, use debug/release boost system library, check for boost system header files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14338 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-05 15:33:38 +00:00
Bo Peng
cd443c86ca Scons: fix handling of lib/lyx2lyx/lyx2lyx_version.py.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14325 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 20:57:25 +00:00
Georg Baum
0c0c43b8eb merge booktabs branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14319 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:13:56 +00:00
Bo Peng
62d3cebb29 Scons: polish scons' 1.4.x support.
* INSTALL.scons: add instruction for 1.4.x
	* development/scons/SConstruct: fix a installation bug for 1.4.x, better handling of QTDIR


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14311 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 02:02:11 +00:00
Bo Peng
d4253cbacd Scons: rename option qt_include_path to qt_inc_path (we have extra_inc_path etc.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14307 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 22:09:11 +00:00
Bo Peng
418b9c936d Scons: check the validity of QTDIR, and the existence of uic and moc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14293 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 17:35:14 +00:00
Bo Peng
b2d7d52537 Scons: fix a isdir typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14288 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 03:17:15 +00:00
Bo Peng
b0abcefcc0 Scons: set default qt lib directory under cygwin
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14286 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-02 01:54:44 +00:00
Bo Peng
a5a508bdaa Change the indent level of python code from two to four
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14250 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 21:08:54 +00:00
Bo Peng
e941da3bdf Scons: fix DESTDIR, reloate intl/libintl.h, libgnuintl.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14239 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 03:53:04 +00:00
Bo Peng
de064bd88a Scons: remove pch, add stdlib_debug and profiling options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14188 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-24 03:49:11 +00:00
Bo Peng
b6e42797d4 Scons: fix rebuildTargetOnly for lyx msvs projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14180 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-22 15:46:35 +00:00
Peter Kümmel
bc720fa2df add release option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14167 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-21 10:32:17 +00:00
Bo Peng
fe5c0415a4 Scons: restore fast_start, remove BOOST_USER_CONFIG in boost/config.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14164 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 16:46:35 +00:00
Bo Peng
865e5c25f2 Scons: config.h moves to BUILDDIR/common, boost_config.h moves to BUILDDIR/boost.
Do not use debug libraries for win/mingw.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14163 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 14:44:46 +00:00
Abdelrazak Younes
f032e0af1a revert commit 14159
QtView -> GuiView at the right place this time.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14160 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:56:31 +00:00
Abdelrazak Younes
e2c3e46a25 QtView -> GuiView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14159 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:52:13 +00:00
Peter Kümmel
6aa29e1b9d add qt3 support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14157 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:59:48 +00:00
Peter Kümmel
118cdb2bd3 add qt3 support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14156 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:57:19 +00:00
Abdelrazak Younes
d8ae51dbe1 This is the merging of the GUI API cleanup branch that was developed in svn+ssh://svn.lyx.org/lyx/lyx-devel/branches/personal/younes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14152 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 08:39:16 +00:00
Peter Kümmel
9ae369d22f move uic files into its own folder in the msvc project
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14147 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 15:49:48 +00:00
Jürgen Spitzmüller
54acb900ad The Grand Font Selection Redesign:
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).

        * lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).

        * lib/chkconfig.ltx: Test for newly supported font packages

        * lib/doc/LaTeXConfig.lyx.in: document newly supported font packages

        * lib/doc/UserGuide.lyx: document new UI.

        * lib/doc/Extended.lyx: update PostScript font documentation

        * development/FORMAT: document file format change 246->247.

        * src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans, 
           tex_fonts_monospaced (with GUI equivalents).

        * src/buffer.C: Format up to 247.

        * src/bufferparams.C:
        new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,    
        fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
        (LyXFont const BufferParams::getFont): consider switch of default family.
        (string const BufferParams::loadFonts): new method to get all the LaTeX 
        font stuff done.

        * src/paragraph.C
        (LyXFont const Paragraph::getFont):
        (LyXFont const Paragraph::getLabelFont):
        (LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's 
        default font

        * src/text.C
        (int LyXText::leftMargin):
        (int LyXText::rightMargin): user buffer's not textclass's default font

        * src/text2.C
        (LyXFont LyXText::getFont):
        (LyXFont LyXText::getLayoutFont):
        (LyXFont LyXText::getLabelFont): check if the family of the default document 
        font has been customized.

        * src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).

        * src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM). 

        * src/frontends/qt3/Makefile.dialogs: add new FontModuleBase

        * src/frontends/qt3/ui/FontModuleBase.ui: new File

        * src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets

        * src/frontends/qt3/QDocument.C
        * src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/Makefile.dialogs: add new FontUi

        * src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/ui/FontUi.ui: new File

        * src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets

        * src/frontends/qt4/ui/compile_uic.sh: add new FontUi

        * src/frontends/xforms/FormDocument.[Ch]: implement new font ui

        * src/frontends/xforms/forms/form_document.fd: add new font tab.

        * src/frontends/controllers/ControlDocument.[Ch]
        (char ControlDocument::fontfamilies):
        (char ControlDocument::fontfamilies_gui):
        (bool ControlDocument::isFontAvailable):
        (bool ControlDocument::providesSC):
        (bool ControlDocument::providesOSF):
        (bool ControlDocument::providesScale): new methods, providing font info.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
Bo Peng
dde45f75da Scons: link to qt debug lib in debug mode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14139 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 04:04:23 +00:00
Bo Peng
29431ace2c Scons: imerge SConscript to SConstruct, separate config.h, code cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14133 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-17 04:43:44 +00:00
Peter Kümmel
4e7ca2d6f4 use glob instead of lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14131 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:26:32 +00:00
Peter Kümmel
585b386088 add item for QMAKESPEC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14130 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:02:42 +00:00
Peter Kümmel
82db64c958 use glob instead of lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14129 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 16:43:17 +00:00
Peter Kümmel
330db5cce1 correct svn properties, upadte aspell handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 15:11:25 +00:00
Bo Peng
c287b1330e Scons: bug fix for default_boost_option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 02:45:57 +00:00
Bo Peng
aa460e9217 Scons: improved option handling
* add option: optimization (=-O3 etc)
	* add load_option=opt1,opt2 or load_option=-opt1,opt2: selectively load options
	* CCFLAGS etc will replace default values, but not hardcoded ones.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14107 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 15:13:19 +00:00
Peter Kümmel
34424bb42d add Linux/Win GCC instructions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14097 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 07:49:44 +00:00
Bo Peng
56134789f7 Scons: add qt2 frontend for lyx1.4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14096 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 14:16:54 +00:00
Peter Kümmel
7c00f14cc1 Initial cmake support.
trunk/development/cmake/README.cmake:

Building LyX with CMake

CMake 2.4.2 or CVS version from www.cmake.org


Building Visual C++ 2005 project files:

- install Visual C++ 2005
- install Platform SDK 2005, "Core" and "Web Workshop"
- add include and library paths of the SDK to the IDE search paths,
  menu: Tools->Options->VC++ directories->Library files + Include files
- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib
  or %ProgramFiles%/zlib/include+lib
- create a build directory, e.g. .../trunk/../build
- call in the build directory cmake ..\trunk\development\cmake
- start lyx.sln


To generate other build files call "cmake" 
which shows a list of possibilities.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14071 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 11:57:25 +00:00
Bo Peng
9d229c3f24 Scons: fix typos and minor bugs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14070 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 04:48:22 +00:00
Bo Peng
48ecd44845 Scons: Better MSVS Projects support (now with debug)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14069 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 21:02:11 +00:00
Bo Peng
6daeed854b Scons: ICONV_CONST bug fix, and some code clean-up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14066 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 02:21:28 +00:00