Commit Graph

454 Commits

Author SHA1 Message Date
Richard Heck
b5ce6e4bda Fix space inset lyx2lyx.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25031 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 01:28:31 +00:00
Richard Heck
2a47858dda Fix remaining issues with InsetSpace. The identifier "Space" used in the .lyx
file has been changed to "space" to match the identifier used for the inset in
Inset.cpp and for the dialog in GuiView.cpp.

In future, we will want to get a similar uniformity elsewhere: The identifier
used in the LyX file should match the one used as inset identifier. The easy
way to do this, in the code, is to have insets write themselves this way:
	os << insetName(lyxCode()) << " ";
rather than at present:
	os << "space ";
Similar things could then happen elsewhere. E.g., if the dialog names are in
sync with the inset names, then we could do something like:
	hideDialogs(insetName(lyxCode()), this);
rather than
	hideDialogs("space", this);
and perhaps even put that into the Inset destructor rather than have specific
versions in each inset---with a test for whether there is such a dialog, of
course.

But this is all for later.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25016 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-30 15:38:43 +00:00
Uwe Stöhr
b2b4cb1fe3 BufferParams.cpp: fix the order for page sizes, fileformat change is needed, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4868
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24792 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 22:54:13 +00:00
Jürgen Spitzmüller
4144ef2223 * lib/lyx2lyx/lyx_1_6.py:
- more work on InsetIndex reversion. Now InsetSpecialChar and font switches are
	  handled (within limits)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24716 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-11 08:17:14 +00:00
Jürgen Spitzmüller
27ac72bfa9 * lib/lyx2lyx/lyx_1_6.py:
- more work on InsetIndex reversion. Still lots left to do.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24711 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-10 17:19:26 +00:00
Jürgen Spitzmüller
e2ed743c23 * lib/lyx2lyx/lyx_1_6.py:
- partial fix of bug 4838 (reversion of new index inset to 1.5)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24697 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-09 10:53:08 +00:00
Jürgen Spitzmüller
7d5fd32778 * lib/layouts/apa.layout:
- Use styleguide-conforming headings in the APA layout (bug 4827).

* src/Buffer.cpp:
	- file format change to 333.

* lib/lyx2lyx/lyx_1_6.py:
	- convert obsoleted layouts.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24694 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-09 08:57:32 +00:00
José Matox
999889716a No need to change LyX.py everytime there is a file format change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24684 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 10:01:38 +00:00
Jürgen Spitzmüller
7bf20758b5 fix bug 4837.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24682 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 09:43:27 +00:00
Pavel Sanda
13e42a8c73 Introduce groups for graphics insets. That includes:
- GuiGraphics dialog field for setup new groups.
- Graphics context menu for assigning to certain group.
- Fileformat change for groupId field in Graphics inset.
- Undo mechanism added to inset-apply, for catching changes
  in preference dialog.
- Qt designer 4.4 used now.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24644 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 21:13:09 +00:00
Jürgen Spitzmüller
98b51ebfbc * lyx2lyx/lyx_1_6.py (revert_rotfloat, revert_widesideways, revert_subfig):
- when searching \begin_inset Float, exclude \begin_inset FloatList (bug 4824)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24608 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-05 06:37:25 +00:00
Edwin Leuven
832bbc4329 fix: http://bugzilla.lyx.org/show_bug.cgi?id=4688
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24598 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-04 07:51:50 +00:00
Jürgen Spitzmüller
a8d19aeff5 whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24568 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 20:16:37 +00:00
Jürgen Spitzmüller
95767b840b support for rightarrowfill, leftarrowfill, upbracefill, downbracefill, by Helge Hafting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24567 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 20:11:57 +00:00
Jürgen Spitzmüller
764b5cf859 support for default master document.
file format change.

This is the last feature for today. Promised.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24540 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 16:38:56 +00:00
Richard Heck
63f7d0318c We don't need to report this. Sometimes this will be absent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24391 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 16:35:33 +00:00
José Matox
b749e175c6 Fix calls to find_default_layout (guarentee arguments consistency)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24371 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 21:29:44 +00:00
Jürgen Spitzmüller
a125dab7fd * lyx_1_6.py:
- fix typo in new helper function.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24366 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 17:03:21 +00:00
Bo Peng
76d272da30 Embedding: revert embedding options and extra_embedded_files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24328 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-18 17:06:03 +00:00
Edwin Leuven
448bc037a0 fix index problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24319 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-17 21:12:24 +00:00
Uwe Stöhr
7fa7e2a9d9 languages: support for Mexican Spanish as discussed in http://bugzilla.lyx.org/show_bug.cgi?id=4736
fileformat change

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24288 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-16 00:25:08 +00:00
Richard Heck
58d58dfe55 Try to fix the PlainLayout issue a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24276 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 17:59:01 +00:00
Richard Heck
27dd040f6d PlainLayout is now Plain Layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24272 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 15:53:35 +00:00
Richard Heck
fa9959fd41 Check for Plain Layout as well as for Standard in these cases. We should always do this in the 1.6.x lyx2lyx.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24270 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 15:52:01 +00:00
Richard Heck
5ae2f40671 Fix bug 4737.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24269 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 15:41:14 +00:00
Jürgen Spitzmüller
0fab956f4a * lib/lyx2lyx/lyx_1_6.py:
- fix reversion when hyperref is _not_ selected.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24259 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 14:02:42 +00:00
Uwe Stöhr
17c3888d25 lyx2lyx: lyx2lyx: lyx_1_6.py, parser_tools.py:
add some comments


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24246 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-12 13:54:30 +00:00
Uwe Stöhr
c594c4d561 lyx2lyx: lyx_1_6.py, parser_tools.py:
add a conversion routine for the PDF options, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4612

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24245 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-12 13:48:17 +00:00
Jürgen Spitzmüller
345be8a6d0 * lib/lyx2lyx/lyx_1_6.py:
- put in a reversion for the embed tag of InsetExternal as close as possible to the
	  actual change. This fixes the reversion of documents with external insets to 1.5,
	  but still leaves a range of invalid file formats.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24239 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-11 17:20:59 +00:00
Jürgen Spitzmüller
5997d41b38 ** support pdfpages via external inset **
* development/FORMAT:
* src/Buffer.cpp:
	- format incremented to 326

* src/LaTeXFeatures.cpp:
* lib/chkconfig.ltx:
* lib/doc/LaTeXConfig.lyx:
	- support pdfpages

* lib/external_templates:
	- add template for pdfpages

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- add reversion routine.

* lib/configure.py:
	- fix call to "pdftops --eps"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24237 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-11 14:07:25 +00:00
José Matox
bfdee3f1cd Fix invalid mix of int and strings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24092 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-02 12:03:09 +00:00
Uwe Stöhr
30663a8019 Fileformat change.
Provide only one Japanese language that is encoding independent, patch partly by Koji Yokata.
This fixes http://bugzilla.lyx.org/show_bug.cgi?id=4597

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24053 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-29 23:25:40 +00:00
Jürgen Spitzmüller
c876a2e7c7 Merge the two linebreak insets into one.
* src/Buffer.cpp:
	- file format change to 324
* development/FORMAT:
	- document file format change

* src/insets/InsetNewline.{cpp,h}:
	- the former two separate derivates are now merged into one inset
	  with proper Params and Mailer. This simplifies the structure and allows for
	  switching between the two kinds.

* src/Text3.cpp:
	- The newline insets are now being generated with 
	   newline-insert [newline|linebreak]

* src/factory.cpp:
* src/Text.cpp:
	- Newline inset is now a proper inset with opening and closing tag.

* src/FuncCode.h:
* src/LyXAction.cpp:
* src/Text3.cpp:
* src/insets/InsetCollapsable.cpp:
* src/insets/InsetTabular.cpp:
* src/mathed/InsetMathGrid.cpp:
* src/mathed/InsetMathHull.cpp:
	- remove LFUN_NEW_LINE, LFUN_LINE_BREAK,
	  add LFUN_NEWLINE_INSERT

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion and reversion routines for newline insets.

* lib/ui/stdmenus.inc:
* lib/ui/stdcontext.inc
	- adapt menu and add context menu to switch between newpage variants.

* lib/bind/*.bind:
	- adapt to new lfuns.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-26 08:10:01 +00:00
Jürgen Spitzmüller
e8ffafef99 * lyx_1_6.py: attempt to fix the make install problem.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23953 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 19:10:04 +00:00
Jürgen Spitzmüller
d2a4c97ab8 Merge the diverse newpage insets into one.
* src/Buffer.cpp:
	- file format change to 323
* development/FORMAT:
	- document file format change

* src/insets/InsetNewpage.cpp:
	- the former four separate derivates are now merged into one inset
	  with proper Params and Mailer. This simplifies the structure and allows for
	  switching between the various kinds.

* factory.cpp:
	- The newpage insets are now being generated with 
	   newpage-insert [newpage|pagebreak|clearpage|cleardoublepage]

* src/Text.cpp:
	- Newpage inset is now a proper inset with opening and closing tag.

* src/FuncCode.h:
* src/LyXAction.cpp:
* src/Text3.cpp:
* src/insets/InsetCollapsable.cpp:
	- remove LFUN_PAGEBREAK_INSERT, LFUN_CLEARPAGE_INSERT
	  and LFUN_CLEARDOUBLEPAGE_INSERT

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion and reversion routines for newpage insets.

* lib/ui/stdmenus.inc:
	- adapt menu and add context menu to switch between newpage variants.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23942 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 09:26:03 +00:00
Richard Heck
700af7e701 Add support for document-local layout information. GUI is to follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23913 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 12:31:07 +00:00
José Matox
7535cabd60 Normalize the begining of Tabular insets (+ cosmetics: remove spaces at the end of lines)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23823 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-19 09:40:24 +00:00
Edwin Leuven
57041a9b84 take care of superfluous space in 1.3 tabular format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23821 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-19 08:41:44 +00:00
José Matox
6c57005797 fix bug 4639
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23813 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 19:41:50 +00:00
Edwin Leuven
e01e14872d Free line setting in tabulars. FILE FORMAT CHANGE.
- gets rid of the M_TOGGLE_LINE_... functions
- allows arbitrary clines without multicol
- sets arbitrary vertical lines through multicol 
- drop row/col line properties, everything is now stored at the cell level

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23812 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 18:08:32 +00:00
Jürgen Spitzmüller
18101eea7b ** add support for protected horizontal fill. FILE FORMAT CHANGE. **
* src/Buffer.cpp:
	- increment file format to 320.

* src/insets(InsetSpace.{cpp, h}:
	- add HFILL_PROTECTED, a protected horizontal fill
	  (LaTeX: \hspace*{\fill})

* src/factory.cpp:
* src/frontends/qt4/GuiHSpace.{cpp, h}:
	- handle the new space type.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- reversion routine for protected hfill.

* development/FORMAT:
	- document file format change

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23805 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 12:11:28 +00:00
Jürgen Spitzmüller
66afc03a54 * lib/lyx2lyx/lyx_1_6.py:
- fix convert_spaceinset routine.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23794 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 14:35:03 +00:00
Jürgen Spitzmüller
e14f384a2c * lib/lyx2lyx/lyx_1_6.py:
- fix error in convert_subfig triggered by the User Guide.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23792 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 14:12:42 +00:00
Jürgen Spitzmüller
f2e8cd3cd9 *** File Format Change: UI and enhancement for InsetSpace ***
* src/insets/InsetSpace.{cpp,h}:
	- merge in HFill inset, add support for dotfill, hrulefill,
	  hspace and hspace*
* src/insets/InsetHFill.{cpp,h}:
	- remove

* src/frontends/qt4/GuiHSpace.{cpp,h}:
* src/frontends/qt4/ui/HSpaceUi.ui:
* src/frontends/qt4/GuiView:
	- new GUI for Space insets.

* src/insets/Inset.{cpp,h}:
* src/insets/InsetCode.h:
* src/insets/InsetCollapsable.cpp:
* src/insets/InsetCommandParams.cpp:
	- remove HFILL_CODE and LFUN_HFILL_INSERT, add SPACE_CODE where necessary,
	  new Inset member isStretchableSpace() to indicate HFill and friends.

* Buffer.cpp: 
	- increase format to 319
* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion/reversion routines
* development/FORMAT:
	- document file format change

* src/Makefile.am:
* src/frontends/qt4/Makefile.am:
* development/scons/scons_manifest.py:
	- deal with UI changes.

* src/LyXAction.cpp:
	- remove LFUN_HFILL_INSERT

* src/LyXFunc.cpp:
	- handle space dialog.

* src/factory.cpp:
* src/Paragraph.cpp (isHFill):
* src/Text.cpp:
* src/Text3.cpp:
* src/TextMetrics.cpp:
	- adapt to changes

* lib/ui/classic.ui:
* lib/ui/stdmenus.ui:
	- add HSpace dialog, remove HFill.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23787 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 09:23:43 +00:00
Bo Peng
932998494b Embedding: add option \extra_embedded_files to buffer params. This increase
LyX file format to 318. The Embedded files panel of document settings has
been simplied, with working add and remove buttons. Note that bease BufferParams
lacks buffer path information, extraEmbeddedFiles are vector<string>, instead
of EmbeddedFileList (as previously planned).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23606 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-09 23:04:14 +00:00
Uwe Stöhr
3db3b9930a fileformat incremented to 317:
support for floating placement settings for wrap floats

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23394 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 17:12:22 +00:00
Uwe Stöhr
eb1b57f0f5 lyx_1_6.py: fix fileformat number
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23391 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 16:51:53 +00:00
Jürgen Spitzmüller
ac1977018b ** subfig support **
* src/Buffer.cpp:
* development/FORMAT:
	- bump format to 316.

* src/insets/InsetFloat.{cpp, h}:
	- let nested floats be subfloats
	  NOTE: docbook support is missing.
* src/insets/InsetCaption.{cpp, h}:
	- handle subfigure captions
* src/insets/InsetGraphics.cpp:
* src/insets/InsetGraphicsParams.{cpp, h}:
	- remove old subfigure support

* lib/chkconfig.ltx:
* lib/doc/LaTeXConfig.lyx:
	- check for subfig instead of subfigure.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion/reversion routines for subfig -> subfloats
	  NOTE: the reversion routine still has bugs.

* src/Counters.{cpp, h}: 
	- add identifiers for subfloats

* src/LaTeXFeatures.{cpp, h}:
	- support for subfig

* src/TextClass.cpp:
	- set up subfloat counter for all custom floats.

* src/frontends/qt4/GuiGraphics.cpp:
* src/frontends/qt4/ui/GrahicsUi.ui:
	- remove subfigure UI.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23381 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 11:30:50 +00:00
Jürgen Spitzmüller
ca6246e4da * lib/lyx2lyx/lyx_1_5.py:
- implement wrapper around normalize that handles specific cases
	  that must not be normalized (rest of bug 3313).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23227 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:32:08 +00:00
Richard Heck
4ab6f265e9 Add support for column separation in page margins. Fixes bug 3337.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23059 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-19 05:24:48 +00:00