Commit Graph

86 Commits

Author SHA1 Message Date
Richard Heck
2ebd679192 Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28450 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 17:16:05 +00:00
Georg Baum
030e249d91 fix potential problems detected by gcc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27956 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-22 18:18:47 +00:00
Jürgen Spitzmüller
17e11a930d * output_latex:cpp:
- fix some CJK nesting issues.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27665 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-22 16:40:39 +00:00
Abdelrazak Younes
4209cbc631 Tommaso patch, part 5, lots of thing to cleanup still but I'll do that afterwards.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27521 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 00:12:21 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Jürgen Spitzmüller
043c362dab * output_latex.cpp:
- slightly change FIXME comment. This only applies to the newly added condition.
	  The other conditions should be left untouched, even if we find a way to access the TeXRow.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27237 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-03 13:43:33 +00:00
Richard Heck
ff9d8584f9 Fix bug 5436, at least for the time being.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27236 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-03 13:07:30 +00:00
Richard Heck
fe25e93e92 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27222 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-01 14:45:39 +00:00
Richard Heck
87dbdca653 Add some constness and remove some useless code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27220 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 23:32:52 +00:00
Richard Heck
3f4cab9808 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27218 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 16:41:52 +00:00
Richard Heck
bd9cdad48f Clarify comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27217 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 15:37:34 +00:00
Richard Heck
ae9ef7c30f If we're doing this test elsewhere, we should also do it here.
(All of these commits, by the way, are just stuff I'm stumbling
across while trying to deal with the newline bug.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 15:36:08 +00:00
Richard Heck
ce379265a6 Some FIXMEs for later, and a little constness.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27215 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 15:33:48 +00:00
Uwe Stöhr
e47d4dee70 output_latex.cpp: revert last commit as it is too risky so short before the release
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27206 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-31 01:26:11 +00:00
Uwe Stöhr
1a4e481111 output_latex.cpp: fix regression, reported here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145738.html
I tested it carefully but in case this makes problems, please revert this immediately.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27205 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-30 23:19:21 +00:00
Jürgen Spitzmüller
9c432a9935 * output_latex.cpp:
- fix CJK nesting in child documents (bug 5358).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27014 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-21 17:03:49 +00:00
Jean-Marc Lasgouttes
03ec50ac4d speed up _a_lot_ switchEncoding() by avoiding an object copy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26896 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 13:06:47 +00:00
Pavel Sanda
792ece8130 Fix whitespaces so the diff between branches is not so huge.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26881 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-13 11:25:37 +00:00
Enrico Forestieri
5ca3be4d67 In mathmode, treat nonascii chars with diacritical marks as an input method
for entering math accents, such that an umlauted A is translated as \ddot{A},
for example.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26577 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-26 15:53:15 +00:00
Enrico Forestieri
b5dcdbc960 When in mathmode, always use the mathcommand replacement from the
unicodesymbols file. Also take into account that a unicode symbol
may appear in both mathmode and textmode and thus both the mathmode
and textmode features may be required. As a side effect, the problem
that the \lyxmathsym definition is added to the preamble even when
a unicode symbol appears only in textmode is solved.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26548 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-25 18:38:25 +00:00
Jürgen Spitzmüller
81d02909cf Fix bug 448:
* src/OutputParams.{cpp,h}:
	- new param isLastPar, indicating if the current paragraph is the last in a given inset/buffer
* src/output_latex.cpp:
	- set isLastPar
* src/Paragraph.cpp:
	- noTrivlistCentering also in tabular cells
	- in the last par, use alignment switch instead of environment

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26443 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 14:51:16 +00:00
Jürgen Spitzmüller
9bfc1c9d46 final final touch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26208 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-19 07:51:40 +00:00
Jürgen Spitzmüller
a2906cb877 ** proper implementation of pLaTeX by Tetsuya Makimura and me, fixes many remaining problems and bugs with language "japanese" (bugs 4863, 4290, 4700 and partially 4697) **
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26200 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-18 17:26:09 +00:00
Richard Heck
cca78e3c8a Change the "empty layout" to the "plain layout", to try to avoid confusion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26025 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-01 20:57:27 +00:00
Jürgen Spitzmüller
af9305f4ac *** sanitize listing's encoding handling ***
* src/Encoding.h:
	- new member hasFixedWidth()
* src/output_latex.{cpp,h} (switchEncoding):
	- add option to force encoding switch
* src/insets/InsetListing.cpp (latex):
	- force encoding switch only in multibyte context, switch the encoding properly,
	  and add some error messages.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25730 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-20 17:14:10 +00:00
Richard Heck
780bce0f96 Rename empty layout stuff to plain layout stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25541 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 17:41:52 +00:00
Jürgen Spitzmüller
612e52b093 Back to CJK sanity I: Fix bug 4698 and 4696.
* lib/encodings:
* src/support/docstream.h:
	- JIS is not a valid iconv name. Rename to ISO-2022-JP

* src/output_latex.cpp:
	- fix wrong encoding switch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25510 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-09 07:21:02 +00:00
Pavel Sanda
20b9e0ba93 Remove InsetEnvironment. This is unfinished decade old stuff.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg141609.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25479 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 16:34:55 +00:00
Jürgen Spitzmüller
35e14de706 * src/output_latex.cpp:
- no blank lines before environments (bug 4993).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25416 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-02 08:34:55 +00:00
Jürgen Spitzmüller
d7eaaba900 ** support for CJK font argument. File Format change **
* src/BufferParams.{cpp,h}:
	- new param fontsCJK (font_cjk).

* src/output_latex.cpp:
	- use fontsCJK param.

* src/Buffer.cpp:
	- increase file format

* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/FontUi.ui:
	- GUI for the CJK font param

* lib/lyx2lyx/lyx_1_6.py:
	- remove font_cjk param on reversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25135 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 06:18:34 +00:00
Jürgen Spitzmüller
b607d70eb4 * src/output_latex.cpp:
- handle CJK nesting correctly with nested insets (bug 4913).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25093 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 07:51:14 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
Richard Heck
2b77c5d4af Now fix the cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24455 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-22 18:33:07 +00:00
Richard Heck
4b33a37c97 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24454 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-22 18:32:00 +00:00
Richard Heck
8c99d7227e Fix bug 4576. Bug was mixed up with Empty Layout stuff. It was not always easy for me to know then which test I needed to do, but if there are more of these, they'll be similar. Anyway, the right test here would have been:
if (!par->forceEmptyLayout())
but in fact things can be simplified more.

Cosmetics will follow. This patch makes the action more obvious.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24453 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-22 18:30:43 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
Enrico Forestieri
958b6b7069 Fix bug 4665:
http://bugzilla.lyx.org/show_bug.cgi?id=4665


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23989 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-26 22:38:41 +00:00
André Pönitz
62d5a54ae7 small optimization
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23893 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 22:51:36 +00:00
Richard Heck
a01cb111a0 Change the interface to a paragraph's layout. We still store a LayoutPtr, but now privately, and make a Layout const & available to clients.
The need for a LayoutPtr arises from the fact that (a) we do not want to give our clients a Layout &, since we do not want them to be able to change our Layout; but (b) we also need to be able to change which layout is ours. So we cannot store a Layout const &. Or so it seems to the compiler.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23522 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:31:27 +00:00
Richard Heck
f401ce5d29 Changes LayoutList from a vector<LayoutPtr> to a vector<Layout>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23519 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 20:01:30 +00:00
Richard Heck
d8a6b5bfd0 Remove TextClassPtr without losing the type safety it provided.
See these threads:
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136112.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136062.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg135997.html
for some background.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23299 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 01:42:02 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Richard Heck
c7afa2d658 More cleanup from Andre.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23194 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:44:11 +00:00
Richard Heck
0362c6aae7 Andre's s/getTextClass/textClass/ cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23190 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:06:35 +00:00
Richard Heck
2e7d1199df Revert 23154.
Sorry, Andre, but this broke not only the modules stuff but the general handling of TextClasses. I'm not opposed to doing this sort of thing, but it's going to be a little more complicated. I'll do it when I get a bit of time, or I can explain what the issue is here if you want to do it.

I'll separately re-commit some of the cleanup here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23189 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 14:59:23 +00:00
André Pönitz
b306e9a2e1 Replace the text class shared ptr by good old index-into-global-list.
Also a few cosmetical changes where I xould not resist.

Would be nice if the 'modules people' could verify that their baby 
is strill alive... 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23154 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 11:36:15 +00:00
Abdelrazak Younes
2bf1c09376 header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23049 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-18 07:14:42 +00:00
Richard Heck
040f3431e7 Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.

The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization(). 
A lot of the changes just adapt to this change.

The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.

There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
Jürgen Spitzmüller
cbf599b911 ** Fix language switch issue introduced by the CJK patch **
* src/output_latex.{cpp,h}:
	- (latexParagraphs, TeXEnvironment, TeXOnePar, TeXDeeper): pass Text element 
	   instead of ParagraphList. This is necessary to detect whether we are in the main text.
	- check if we are in the main text for language switches, if needed.
* src/Buffer.cpp:
* src/insets/InsetEnvironment.cpp:
* src/insets/InsetText.cpp:
* src/mathed/InsetMathMBox.cpp:
	- adapt to new latexParagraphs definition.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22666 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-25 13:27:08 +00:00
Jean-Marc Lasgouttes
3d8828fa14 * src/Spacing.cpp (writeBeginEnv, writeEndEnv): add a bool parameter
directing to use memoir's capitalized latex macros.
	* src/LaTeXFeatures.cpp (getPackages): act on feature "SetSpace".
	* src/output_latex.cpp (TeXOnePar): ditto

	* lib/layouts/memoir.layout: provide feature SetSpace, indicating that
	memoir provides the setspace functionality, but with a different syntax.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22551 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-14 14:53:29 +00:00