Commit Graph

708 Commits

Author SHA1 Message Date
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
Pavel Sanda
42785e6219 Bug #7095: Support fix-cm.sty
Patch from Patrick Atamaniuk.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg165122.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37342 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 10:04:52 +00:00
Jean-Marc Lasgouttes
8a84eeb27a forbid spellchecking in code layouts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37324 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-25 14:17:07 +00:00
Richard Heck
924ac8a5a1 Fix several layout related problems revealed by -dbg tclass.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37265 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-20 16:28:42 +00:00
Pavel Sanda
9d76ec23d5 Add comment to sweave
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37219 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-15 20:11:02 +00:00
Richard Heck
1b98ec3e99 Don't need these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37212 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 18:25:00 +00:00
Richard Heck
874e867953 Update all layouts to format 31.
Should have done this first!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37196 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:20:07 +00:00
Richard Heck
a9411446ee Add NoCounter to layouts that need it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37195 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:19:02 +00:00
Richard Heck
d32ed4ff4e Add NoCounter lines to inc files that need them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37194 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:12:28 +00:00
Pavel Sanda
2e3953cb03 Update enumitem module and add documentation for it.
From Guenter Milde.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 10:12:14 +00:00
Richard Heck
47ca44e296 Record and use equation numbers. This is towards getting equation
numbering in XHTML output, but it's just as easy to fix this in the LyX
display.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37177 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 19:35:52 +00:00
Pavel Sanda
23ac011dc8 Enumitem's "Labeling/LyX-List" should not change the original layout.
Patch from Guenter.
http://www.mail-archive.com/lyx-users@lists.lyx.org/msg84689.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37150 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 22:18:43 +00:00
Jürgen Spitzmüller
0a34b1e047 fix some typos. Patch by Yuri Chornoivan.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37039 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 16:57:04 +00:00
Pavel Sanda
1caa7670d2 Missing dot.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36992 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-22 23:20:15 +00:00
Jürgen Spitzmüller
84e3417caf * scrclass.inc: \addpart, \addchap and \addsec have an optional argument.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36903 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-16 08:59:22 +00:00
Richard Heck
78f84fe020 The letter class supports quote, quotation, and verse, and surely the ---Separator--- might be wanted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36891 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-15 15:30:25 +00:00
Richard Heck
d1e0a0e4ed Allow customization of label string for note insets. We actually had
strings in the layout file, but they were not used.

Question: Should we just remove InsetNote::setButtonLabel() now? The
only purpose it is serving is to provide a backup in case no label is
defined.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36884 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 23:16:19 +00:00
Jean-Marc Lasgouttes
425f46bea5 * add an extra parameter to lyxsweave.py that tells the document directory
and use it to be able to read data files in there (bug #6623). It is probably possible to use sweave hooks instead of the module preamble. Moreover, I want to investigate the use of prefix.string argument of sweave to make sure that the output files end up in the tmp dir.
  * be more subtle in the way to change default encoding to handle the case where a data file that is read does not use the same encoding as the .rnw file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 21:25:57 +00:00
Richard Heck
6fd0260f0f MultiPar before these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36707 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 21:57:32 +00:00
Richard Heck
023db84004 Fix #7129: No multipars in phantoms.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36698 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 20:21:02 +00:00
Richard Heck
ac67d37f75 Improve the XHTML display of Labeling a bit.
I don't see any reasonable way to make this look the way it does in LyX.
Anyone else have an idea? (Tables are definitely out here.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36669 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-02 21:42:04 +00:00
Enrico Forestieri
42fe3fdbc3 Use single quotes because double ones are skipped instead of being properly
escaped in po-files, thus thwarting translations. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36624 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 11:36:03 +00:00
Uwe Stöhr
04e6f69a42 enumitem.module: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36570 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 04:24:06 +00:00
Georg Baum
36698a933c Add fixltx2e module which simply loads fixltx2e.sty.
This module can be used instead of \usepackage{fixltx2e} in the preamble
to avoid duplicate definitions of \textsubscript.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36550 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 10:46:47 +00:00
Jürgen Spitzmüller
6d67f264aa * enumitem.module: refer to mirror CTAN address, not to DANTE.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36534 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 10:43:55 +00:00
Richard Heck
7f8b868f4a Fix bug #2607.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36520 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:21:17 +00:00
Pavel Sanda
58805a5132 Kill literate programming strings
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg163726.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 23:17:44 +00:00
Pavel Sanda
276170fd6f Synchronize naming of modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36488 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:40:28 +00:00
Vincent van Ravesteijn
66ddf9e74d Correct eol style again. Now correctly set svn:eol-style instead of eol-style. Fixes the wrong revision 36406.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36435 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-22 13:34:05 +00:00
Georg Baum
dea050cb93 fix bug 3008: Add subscript/superscript inset for text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 17:00:12 +00:00
Uwe Stöhr
64495f2500 enumitem.module: typo: we use the American English variant (with "z") in all other strings in LyX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36417 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 04:10:03 +00:00
Jürgen Spitzmüller
d710d3a3e1 * lettre.layout: fix from Jean-Pierre.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36410 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 14:58:23 +00:00
Vincent van Ravesteijn
1095d89442 Fix eol-style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36406 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 12:29:46 +00:00
Richard Heck
d748a0a6f1 Don't need \makeat*.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36384 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 21:41:51 +00:00
Richard Heck
0c93d1150c LyX already wraps the preamble in \makeatletter and \makeatother.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36383 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 21:39:43 +00:00
Richard Heck
2d40278670 Update to format 30.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36350 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 20:44:34 +00:00
Richard Heck
20dbfe40b3 New enumitem module, from Gunter Milde.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36349 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 20:41:31 +00:00
Jürgen Spitzmüller
2afa7eabd0 * revert r36189, since there is no consensus for this change.
Happy Friday, everybody!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36257 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 09:31:55 +00:00
Richard Heck
6f76593069 Fix a bug in getFormattedReference().
Also, change from using the "cha" prefix for chapters, a la prettyref,
to the "chap" prefix, a la refstyle. We alias \pr@chap to \pr@cha for
prettyref users.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36238 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 16:45:55 +00:00
Uwe Stöhr
e94a9732b1 stdinsets.inc, InsetERT.cpp: change "ERT" to "TeX" to be consistent - the documentation and all other menus use consequently since LyX 1.6.0 "TeX-code" because it turned out that ERT is a meaningless abbreviation for new users
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36189 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 15:31:05 +00:00
Jean-Marc Lasgouttes
b9b619641b This patch implements proper ERT behaviour for normal layouts.
In particular, it makes paragraph breaks generate single \n in latex output
when ParbreakIsNewline is true

This means that it is not necessary anymore to use newlines to break lines. 
Plain paragraph breaks can be used instead, like is done now in ERT/Listings. 
This is mainly aimed at sweave support.

lyx2lyx support courtesy of Richard Heck



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 15:06:19 +00:00
Vincent van Ravesteijn
6b81613f9c Fix bug #7016: Cannot read theorems-ams-bytype.inc.
The old format tag was never deleted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36115 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:12:04 +00:00
Richard Heck
189bad70ac Add module for named theorems. Thanks to John Perry. Fixes bug #6279.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36004 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 20:17:07 +00:00
Richard Heck
94acc0aaf6 There is no way of handling alternate class file names in layout files.
This can be restored if someone wants to introduce one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35982 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:42:39 +00:00
Jürgen Spitzmüller
5b81341335 typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35744 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-21 10:33:46 +00:00
Uwe Stöhr
a88e2efd53 lettre: some adjustments to overcome a limitation of the lettre document class
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35645 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-14 01:58:49 +00:00
Richard Heck
69b1ea0ecf Update layouts to format 30.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35629 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 16:54:57 +00:00
Uwe Stöhr
eaf7c6c6eb lettre: new layout and template file to write French letters, patch from Jean-Pierre Chretien
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35620 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 03:23:51 +00:00
Richard Heck
5142d1c86a Now update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35614 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 15:41:55 +00:00
Richard Heck
de815f594e Revert update of formats. There is more to be done first.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35612 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 15:11:04 +00:00