Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Jean-Marc Lasgouttes
 Martin == Martin Vermeer [EMAIL PROTECTED] writes:

Martin I still want to give that a try later, for 1.4.1 perhaps...
Martin there must be a straightforward way of doing it, mostly
Martin confined to rowpainter. And with special attention to the text
Martin inside insets, as people will want to use big branchinsets.

One idea I had is to do some checksumming of the row content while
breaking paragraphs which allows to know whether a row has been
modified and needs a redraw. Then the rowpainter could more safely
decide not to redraw some parts. I do not know how difficult this
would be, though.

Admitedly this would reduce the number of repaints, not of rebreaks,
but it may be less fragile than tests all over the place to guess what
should be updated.

Martin Currently, with my lyxfunc patch, only the current paragraph
Martin is redrawn for every character insertion. The whole screen
Martin only if paragraph height changes. Now if we have a big
Martin paragraph, that is too much. Logical. Note that if a paragraph
Martin contains an inset (containing one or more paragraphs of its
Martin own), _all of this together_ counts here as current
Martin paragraph.

Martin Do we have now the feeling that we understand this?

Yes, unfortunately. If we decide to drop the issue, we will _have_ to
do something for later 1.4.x versions, I think.

JMarc


Re: The userguide is wrong about un-nestable sectioning commands

2005-12-15 Thread Helge Hafting

Jean-Marc Lasgouttes wrote:


Yes, please a patch against latest cvs would be welcome.
 


A patch for /lib/doc/UserGuide.lyx and a changelog entry.
Testing shows that:
* All the sectioning environments may be nested into other environments.
 Both lyx-1.4 and latex accepts this.  Not all of the sectioning levels 
seems

 useful to nest, but lower levels like section* may be useful when
 one feel like putting a heading inside a (big) list item.  It was 
questions about
 such headings on the user list that got me testing this in the first 
place.


* An abstract may be nested into other environments, and it also accepts
 other environments nested into it.  The latter is clearly useful. 
 I am not so sure about the former.  But it works well, and may perhaps 
be useful
 for creating summaries of items in nested environments. 


* A caption can be nested into other environments.  Trouble-free but odd.
  This must be done inside a float, of course.

Lyx also allows nesting of Title, Date and Author.  Latex accepts this,
but nesting the title makes it disappear, and nesting Date and Author
makes them look just like standard, i.e. they are no longer centered
and the text reverts to normal size.  So I left these as unnestables
because it doesn't work very well at all.

Helge Hafting
? doc-no2nb.diff
? libdoc.diff
? skrot
? tmp.diff
Index: ChangeLog
===
RCS file: /var/cvs/lyx/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.43
diff -u -p -r1.43 ChangeLog
--- ChangeLog   9 Dec 2005 15:54:18 -   1.43
+++ ChangeLog   15 Dec 2005 10:11:00 -
@@ -1,2 +1,13 @@
+2005-12-15  Helge Hafting  [EMAIL PROTECTED]
+   * UserGuide.lyx: Corrected information about nesting:
+ - sections etc can be nested into other environments,
+   so removed information about this being impossible.
+ - An abstract can be nested, and other stuff may be nested
+   into it, removed information about this being impossible
+ - A caption can be nested into other paragraphs, removed
+   the vice versa indicating this being impossible.
+ - Updated the lists in section What You Can and Can't Nest
+   to reflect reality.  
+
 2005-12-09  Jean-Marc Lasgouttes  [EMAIL PROTECTED]
 
Index: UserGuide.lyx
===
RCS file: /var/cvs/lyx/lyx-devel/lib/doc/UserGuide.lyx,v
retrieving revision 1.16
diff -u -p -r1.16 UserGuide.lyx
--- UserGuide.lyx   28 Sep 2005 09:40:47 -  1.16
+++ UserGuide.lyx   15 Dec 2005 10:11:12 -
@@ -1,5 +1,5 @@
 #LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
-\lyxformat 244
+\lyxformat 245
 \begin_document
 \begin_header
 \textclass scrbook
@@ -77,7 +77,6 @@
 \paragraph_separation indent
 \defskip medskip
 \quotes_language english
-\quotes_times 2
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
@@ -5870,7 +5869,7 @@ You can only use inlined math in these e
 \end_layout
 
 \begin_layout Itemize
-You cannot do any nesting with these environments.
+You cannot nest other environments into these environments.
 \end_layout
 
 \begin_layout Itemize
@@ -7326,12 +7325,6 @@ could
 should
 \emph default
  only use it at the beginning of the document, after the title.
- Also, don't bother trying to nest 
-\family sans
-Abstract
-\family default
- in anything else or vice versa.
- It won't work.
  The 
 \family sans
 Abstract
@@ -7752,7 +7745,7 @@ You can't really nest things into a 
 \family sans
 Caption
 \family default
- environment or vice versa.
+ environment.
  Additionally, hitting 
 \family sans
 Return
@@ -8335,172 +8328,172 @@ Unnestable Can't nest them.
 \begin_layout Itemize
 
 \family sans
-Part
+Bibliography
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Chapter
+Title
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Section
-\family default
- 
+Author
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsection
+Date
+\end_layout
+
+\end_deeper
+\begin_layout Description
+Fully\InsetSpace ~
+Nestable You can nest them.
+ You can nest other things into them.
 \end_layout
 
+\begin_deeper
 \begin_layout Itemize
 
 \family sans
-Subsubsection
+Abstract
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Paragraph
-\family default
- 
+Verse
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subparagraph
+Quote
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Part*
+Quotation
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Chapter*
+Itemize
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Section*
+Enumerate
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsection*
+Description
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsubsection*
+List
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Bibliography
+LyX-Code
+\end_layout
+
+\end_deeper
+\begin_layout Description
+Nestable-Inside You can nest them inside of other 

Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Martin Vermeer
On Thu, 2005-12-15 at 10:35 +0100, Jean-Marc Lasgouttes wrote:
  Martin == Martin Vermeer [EMAIL PROTECTED] writes:
 
 Martin I still want to give that a try later, for 1.4.1 perhaps...
 Martin there must be a straightforward way of doing it, mostly
 Martin confined to rowpainter. And with special attention to the text
 Martin inside insets, as people will want to use big branchinsets.
 
 One idea I had is to do some checksumming of the row content while
 breaking paragraphs which allows to know whether a row has been
 modified and needs a redraw. Then the rowpainter could more safely
 decide not to redraw some parts. I do not know how difficult this
 would be, though.

That was more or less what the patch did. It computed a 'signature' of
the row, the expression

rit-endpos() - rit-pos() + y

showing if a row has been changed in a way that necessitates repainting.
This is not a very good signature though, as you can easily see.
Checksum would be better.

 Admitedly this would reduce the number of repaints, not of rebreaks,
 but it may be less fragile than tests all over the place to guess what
 should be updated.
 
 Martin Currently, with my lyxfunc patch, only the current paragraph
 Martin is redrawn for every character insertion. The whole screen
 Martin only if paragraph height changes. Now if we have a big
 Martin paragraph, that is too much. Logical. Note that if a paragraph
 Martin contains an inset (containing one or more paragraphs of its
 Martin own), _all of this together_ counts here as current
 Martin paragraph.
 
 Martin Do we have now the feeling that we understand this?
 
 Yes, unfortunately. If we decide to drop the issue, we will _have_ to
 do something for later 1.4.x versions, I think.

Yes, I am hopeful that I can resurrect the singlerow patch.

- Martin



signature.asc
Description: This is a digitally signed message part


Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Angus Leeming
Martin Vermeer wrote:
 One idea I had is to do some checksumming of the row content while
 breaking paragraphs which allows to know whether a row has been
 modified and needs a redraw. Then the rowpainter could more safely
 decide not to redraw some parts. I do not know how difficult this
 would be, though.

 That was more or less what the patch did. It computed a 'signature' of
 the row, the expression

 Yes, I am hopeful that I can resurrect the singlerow patch.

The obvious question to ask here is: does it cure Bennett's problems?

-- 
Angus



Re: [Patch] lib/doc/Makefile.depend missed the no-nb language transition in 1.4cvs

2005-12-15 Thread Jean-Marc Lasgouttes
 Helge == Helge Hafting [EMAIL PROTECTED] writes:

Helge lib/doc/Makefile.depend still tried to make no_TOC.lyx, when
Helge it was supposed to be nb_TOC.lyx.

Helge Attached a patch that fixes this, including a Changelog entry.

How did you fix it? By running depend.py?

JMarc

JMarc


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Jean-Marc Lasgouttes
 Georg == Georg Baum [EMAIL PROTECTED] writes:

Georg Jean-Marc Lasgouttes wrote:
 Lars == Lars Gullik Bjønnes [EMAIL PROTECTED] writes:

Lars But what is the delay caused by. Not everyone sees it. Is it the
Lars sheer number of fonts, or is it that some fonts are missing?

Georg It seems that a noticeable part of the delay happens if a font
Georg is not found. For example, I had no eufm10.ttf font installed
Georg because of the old bakoma license, and got a delay. I now have
Georg it, and that delay is gone, 

So shall we make a new latex-xft-fonts based on bakoma, or shall we
propose to install mathml-fonts?

Georg but LyX still can't find a symbol font (I have that, but qt
Georg won't find it, because it is in type1 format). Does anybody
Georg know if there is a free version of the standard postscript
Georg symbol font in truetype format? 

From a windows installation?

But do we need the symbol fonts when the other ones are available?

JMarc


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Georg Baum
Jean-Marc Lasgouttes wrote:

 So shall we make a new latex-xft-fonts based on bakoma, or shall we
 propose to install mathml-fonts?

We have that already, see the wiki: http://wiki.lyx.org/pmwiki.php/FAQ/Qt
(although the text is a bit confusing)

 Georg but LyX still can't find a symbol font (I have that, but qt
 Georg won't find it, because it is in type1 format). Does anybody
 Georg know if there is a free version of the standard postscript
 Georg symbol font in truetype format?
 
 From a windows installation?

Probably, but I am not sure if I may use that elsewhere.

 But do we need the symbol fonts when the other ones are available?

Yes, because of this entry in lib/symbols:

textdegree lyxsymbol 176 0 mathord  x

I am sure that a textdgree sign is available in one of the other fonts, but
I don't know how to declare it in lib/symbol so that it works in all
encodings.


Georg



Re: [Patch] lib/doc/Makefile.depend missed the no-nb language transition in 1.4cvs

2005-12-15 Thread Helge Hafting

Jean-Marc Lasgouttes wrote:


Helge == Helge Hafting [EMAIL PROTECTED] writes:
   



Helge lib/doc/Makefile.depend still tried to make no_TOC.lyx, when
Helge it was supposed to be nb_TOC.lyx.

Helge Attached a patch that fixes this, including a Changelog entry.

How did you fix it? By running depend.py?
 


I changed Makefile.depend by editing it.
I see there are some changes in there that I did not do,
but it is only reordering of some files.
I ran make distclean (in lib/doc)  and then autogen.sh, configure,
make, and make install to test that it worked. 


I don't know the build process too well, but Makefile.depend did not
get autogenerated for me, so I got it from cvs and changed it.

Helge Hafting


Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Martin Vermeer
On Thu, 2005-12-15 at 10:31 +, Angus Leeming wrote:
 Martin Vermeer wrote:
  One idea I had is to do some checksumming of the row content while
  breaking paragraphs which allows to know whether a row has been
  modified and needs a redraw. Then the rowpainter could more safely
  decide not to redraw some parts. I do not know how difficult this
  would be, though.
 
  That was more or less what the patch did. It computed a 'signature' of
  the row, the expression
 
  Yes, I am hopeful that I can resurrect the singlerow patch.
 
 The obvious question to ask here is: does it cure Bennett's problems?

Only one way to find out, innit?

- Martin


signature.asc
Description: This is a digitally signed message part


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Lars Gullik Bjønnes
Juergen Spitzmueller [EMAIL PROTECTED] writes:

| Georg Baum wrote:
|  Jean-Marc Lasgouttes wrote:
|   I think that this patch always makes sense, irrespectively of whether
|   we manage to improve this font querying later...
|  
|   I'd propose to apply it.
| 
|  Me too.
| 
| Lars?

This is only moving the math init from lyx startup to the first time
someone uses math, right?

then ok.

-- 
Lgb



Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Juergen Spitzmueller
Lars Gullik Bjønnes wrote:
 This is only moving the math init from lyx startup to the first time
 someone uses math, right?

yes.

 then ok.

thanks.

Jürgen


OT: automake woes

2005-12-15 Thread Angus Leeming
I have a project (http://sourceforge.net/projects/qdvi/)
where I'm porting kdvi to Windows. The thing is pretty well working in my
local tree (the committed stuff does *not*, so don't try it out!) but I
have one Automake stumbling block. Here's the (working) snippet of my
Makefile.am, which

1. Visits the kdelibs subdirectory where it compiles and links
$(CONFIG_COMPILER).
2. Generates prefs.{cpp,h} and kvsprefs.{cpp,h} from those .kcfg files
using this kdelibs/$(CONFIG_COMPILER).
3. Goes on to compile the .cpp files into .$(OBJEXT) ones.

As I say, the Makefile.am works, but it's very fragile because prefs
{cpp,h} and kvsprefs.{cpp,h} must be placed first in my list of sources,
so that they're compiled before anything else which #includes prefs.h or
kvsprefs.h. At least that's what I hope happens, but there's nothing to
guarantee it.

I've tried adding these files to BUILT_SOURCES and to qdvi_nodist_SOURCES
and I've tried to make qdvi_SOURCES dependent on kvsprefs.cpp, but all
that happens is that the build process attempts to build them on the way
*up* the tree, before it's got to kdelibs to compile $(CONFIG_COMPILER). I
want it to build them on the way *down* the tree, after it's visited the
kdelibs subdirectory.

Any ideas on how to do this properly?

(yes, I know I'm abusing my position a little ;-))
Angus


SUBDIRS = kdelibs .
CONFIG_COMPILER =  kdelibs/qdvi_config_compiler$(EXEEXT)
bin_PROGRAMS = qdvi

# prefs.{cpp.h}, kvsprefs.{cpp.h} come first in this list because
# they are generated files and I don't know how else to force
# Automake to create them before it tries to compile these .cpp files
# but after it has visited kdelibs where it creates $(CONFIG_COMPIER)

# Yes, I know it's scrappy.
qdvi_SOURCES = \
prefs.cpp \
prefs.h \
kvsprefs.cpp \
kvsprefs.h \
anchor.h \
bigEndianByteReader.cpp \
bigEndianByteReader.h \
...

kvsprefs.cpp: kviewshell.kcfg kvsprefs.kcfgc
$(CONFIG_COMPILER) $(srcdir)/kviewshell.kcfg $(srcdir)/kvsprefs.kcfgc

prefs.cpp: kdvi.kcfg prefs.kcfgc
$(CONFIG_COMPILER) $(srcdir)/kdvi.kcfg $(srcdir)/prefs.kcfgc




Re: [Patch] lib/doc/Makefile.depend missed the no-nb language transition in 1.4cvs

2005-12-15 Thread Georg Baum
Helge Hafting wrote:

 I changed Makefile.depend by editing it.
 I see there are some changes in there that I did not do,
 but it is only reordering of some files.

The reason is that they are ordered as they are on disk. We should sort
them.

 I ran make distclean (in lib/doc)  and then autogen.sh, configure,
 make, and make install to test that it worked.
 
 I don't know the build process too well, but Makefile.depend did not
 get autogenerated for me, so I got it from cvs and changed it.

It does not get autogenerated, but it is automatically kept up to date (by
running make in lib/doc).

The attached patch fixes the filename sorting and includes the no - nb
change, so that future changes do not contain reordered files.
OK to apply?


GeorgIndex: lib/doc/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.43
diff -u -p -r1.43 ChangeLog
--- lib/doc/ChangeLog	9 Dec 2005 15:54:18 -	1.43
+++ lib/doc/ChangeLog	15 Dec 2005 18:29:25 -
@@ -1,3 +1,8 @@
+2005-12-15  Georg Baum  [EMAIL PROTECTED]
+
+	* depend.py: sort dependencies to reduce clutter from diffs
+	* Makefile.depend: update to include nb_Intro.lyx
+
 2005-12-09  Jean-Marc Lasgouttes  [EMAIL PROTECTED]
 
 	* Makefile.am (docfiles): 
Index: lib/doc/Makefile.depend
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/Makefile.depend,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.depend
--- lib/doc/Makefile.depend	10 Oct 2005 13:22:34 -	1.3
+++ lib/doc/Makefile.depend	15 Dec 2005 18:29:25 -
@@ -13,34 +13,34 @@ cs_TOC.lyx: $(srcdir)/cs_Tutorial.lyx
 da_TOC.lyx: $(srcdir)/da_Intro.lyx
 	python $(srcdir)/doc_toc.py da
 
-de_TOC.lyx: $(srcdir)/de_Customization.lyx $(srcdir)/de_FAQ.lyx $(srcdir)/de_Extended.lyx $(srcdir)/de_UserGuide.lyx $(srcdir)/de_Tutorial.lyx $(srcdir)/de_Intro.lyx
+de_TOC.lyx: $(srcdir)/de_Customization.lyx $(srcdir)/de_Extended.lyx $(srcdir)/de_FAQ.lyx $(srcdir)/de_Intro.lyx $(srcdir)/de_Tutorial.lyx $(srcdir)/de_UserGuide.lyx
 	python $(srcdir)/doc_toc.py de
 
 es_TOC.lyx: $(srcdir)/es_Intro.lyx $(srcdir)/es_Tutorial.lyx
 	python $(srcdir)/doc_toc.py es
 
-eu_TOC.lyx: $(srcdir)/eu_FAQ.lyx $(srcdir)/eu_Intro.lyx $(srcdir)/eu_Extended.lyx $(srcdir)/eu_UserGuide.lyx $(srcdir)/eu_Customization.lyx $(srcdir)/eu_Tutorial.lyx
+eu_TOC.lyx: $(srcdir)/eu_Customization.lyx $(srcdir)/eu_Extended.lyx $(srcdir)/eu_FAQ.lyx $(srcdir)/eu_Intro.lyx $(srcdir)/eu_Tutorial.lyx $(srcdir)/eu_UserGuide.lyx
 	python $(srcdir)/doc_toc.py eu
 
-fr_TOC.lyx: $(srcdir)/fr_FAQ.lyx $(srcdir)/fr_Customization.lyx $(srcdir)/fr_Extended.lyx $(srcdir)/fr_Tutorial.lyx $(srcdir)/fr_UserGuide.lyx $(srcdir)/fr_Intro.lyx
+fr_TOC.lyx: $(srcdir)/fr_Customization.lyx $(srcdir)/fr_Extended.lyx $(srcdir)/fr_FAQ.lyx $(srcdir)/fr_Intro.lyx $(srcdir)/fr_Tutorial.lyx $(srcdir)/fr_UserGuide.lyx
 	python $(srcdir)/doc_toc.py fr
 
-he_TOC.lyx: $(srcdir)/he_Tutorial.lyx $(srcdir)/he_Intro.lyx
+he_TOC.lyx: $(srcdir)/he_Intro.lyx $(srcdir)/he_Tutorial.lyx
 	python $(srcdir)/doc_toc.py he
 
 hu_TOC.lyx: $(srcdir)/hu_Intro.lyx
 	python $(srcdir)/doc_toc.py hu
 
-it_TOC.lyx: $(srcdir)/it_Tutorial.lyx $(srcdir)/it_Customization.lyx $(srcdir)/it_UserGuide.lyx $(srcdir)/it_Intro.lyx
+it_TOC.lyx: $(srcdir)/it_Customization.lyx $(srcdir)/it_Intro.lyx $(srcdir)/it_Tutorial.lyx $(srcdir)/it_UserGuide.lyx
 	python $(srcdir)/doc_toc.py it
 
-nl_TOC.lyx: $(srcdir)/nl_Tutorial.lyx $(srcdir)/nl_Intro.lyx
-	python $(srcdir)/doc_toc.py nl
+nb_TOC.lyx: $(srcdir)/nb_Intro.lyx
+	python $(srcdir)/doc_toc.py nb
 
-no_TOC.lyx: $(srcdir)/no_Intro.lyx
-	python $(srcdir)/doc_toc.py no
+nl_TOC.lyx: $(srcdir)/nl_Intro.lyx $(srcdir)/nl_Tutorial.lyx
+	python $(srcdir)/doc_toc.py nl
 
-pl_TOC.lyx: $(srcdir)/pl_Extended.lyx $(srcdir)/pl_Tutorial.lyx $(srcdir)/pl_Intro.lyx
+pl_TOC.lyx: $(srcdir)/pl_Extended.lyx $(srcdir)/pl_Intro.lyx $(srcdir)/pl_Tutorial.lyx
 	python $(srcdir)/doc_toc.py pl
 
 pt_TOC.lyx: $(srcdir)/pt_Intro.lyx $(srcdir)/pt_Tutorial.lyx
@@ -49,16 +49,16 @@ pt_TOC.lyx: $(srcdir)/pt_Intro.lyx $(src
 ro_TOC.lyx: $(srcdir)/ro_Intro.lyx
 	python $(srcdir)/doc_toc.py ro
 
-ru_TOC.lyx: $(srcdir)/ru_Tutorial.lyx $(srcdir)/ru_FAQ.lyx $(srcdir)/ru_Intro.lyx
+ru_TOC.lyx: $(srcdir)/ru_FAQ.lyx $(srcdir)/ru_Intro.lyx $(srcdir)/ru_Tutorial.lyx
 	python $(srcdir)/doc_toc.py ru
 
-sk_TOC.lyx: $(srcdir)/sk_UserGuide.lyx $(srcdir)/sk_Tutorial.lyx
+sk_TOC.lyx: $(srcdir)/sk_Tutorial.lyx $(srcdir)/sk_UserGuide.lyx
 	python $(srcdir)/doc_toc.py sk
 
-sl_TOC.lyx: $(srcdir)/sl_Tutorial.lyx $(srcdir)/sl_Intro.lyx
+sl_TOC.lyx: $(srcdir)/sl_Intro.lyx $(srcdir)/sl_Tutorial.lyx
 	python $(srcdir)/doc_toc.py sl
 
-sv_TOC.lyx: $(srcdir)/sv_Tutorial.lyx $(srcdir)/sv_Intro.lyx
+sv_TOC.lyx: $(srcdir)/sv_Intro.lyx $(srcdir)/sv_Tutorial.lyx
 	python $(srcdir)/doc_toc.py sv
 
-tocfiles = TOC.lyx cs_TOC.lyx da_TOC.lyx de_TOC.lyx es_TOC.lyx 

Re: lyx137pre5 native on win95, and lyx140pre2 cygwin on win95

2005-12-15 Thread Luis Rivera
Angus Leeming [EMAIL PROTECTED] writes:

 
C:/WINDOWS/TEMPlyx_tempdir-425411a44659
C:/WINDOWS/Application Data/LyXlastfiles
 
 These feel like someone is making paths as
string my_path = foo + bar;
 where foo is expected to be foo/bar/ but is, in fact, foo/bar.
 

I think that's pretty much what I was trying to say in some other thread,
but at the time it seemed that the trouble was the inconsistency in path
construction: that's how you ended up adding a slash at the end of every
path... 

 If that's the case, then you've discovered a bug; we should be creating
 such paths with these APIs:
 
 /// Add a filename to a path. Any path from filename is stripped first.
 string const AddName(string const  path, string const  fname);
 
 /// Append sub-directory(ies) to path in an intelligent way
 string const AddPath(string const  path, string const  path2);
 
 I'm sure it'll be easy enough to track down if you've got the energy 
 

I think I have the energy; I am not sure to have the time: beginning 
Friday, thanks to Christmas, I am taking a long needed vacation... I mean 
A LONG VACATION!!! (I must finish writing a small book, putting LyX to work, 
so to speak)... 

If you have the patience to wait till mid January...

Luis.




Re: lyx137pre5 native on win95, and lyx140pre2 cygwin on win95

2005-12-15 Thread Angus Leeming
Luis Rivera wrote:
 If you have the patience to wait till mid January...

LyX is now 10 years old (http://www.lyx.org/~jamatos/archaeology/). She's
got lots and lots of patience. (But will eventually throw a tantrum if she
doesn't get her own way ;-))

-- 
Angus



[PATCH 1.3] Support tex4ht

2005-12-15 Thread Michael Gerz

Dear Jean-Marc,

enclosed please find a patch for LyX 1.3 that (partially) synchronizes 
./lib/configure.m4 with the main branch. It supports tex4ht as a LaTeX 
to MS Word converter and fixes various typos.


Ok to apply?

Michael
Index: status.13x
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.282
diff -u -r1.1.2.282 status.13x
--- status.13x	12 Dec 2005 10:08:37 -	1.1.2.282
+++ status.13x	16 Dec 2005 00:03:53 -
@@ -37,6 +37,10 @@
 
 - Fix LaTeX output when a bibtex inset is used in a child document.
 
+- Support tex4ht for Tex - MS Word conversion 
+
+- Support the previewers kdvi, kpdf, and kghostview
+
 * User Interface:
 
 - Fix wrong path when drag-and-dropping files on Windows. [Qt only] 
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.133
diff -u -r1.363.2.133 ChangeLog
--- lib/ChangeLog	12 Dec 2005 10:08:38 -	1.363.2.133
+++ lib/ChangeLog	16 Dec 2005 00:04:12 -
@@ -1,3 +1,8 @@
+2005-12-14  Michael Gerz  [EMAIL PROTECTED]
+
+	* configure.m4: fix typos; support tex4ht, kdvi,
+	kpdf and kghostview
+
 2005-12-12  Jean-Marc Lasgouttes  [EMAIL PROTECTED]
 
 	* bind/sciword.bind: include math.bind, not maths.bind.
Index: lib/configure.m4
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.60.2.26
diff -u -r1.60.2.26 configure.m4
--- lib/configure.m4	15 Jul 2005 15:46:36 -	1.60.2.26
+++ lib/configure.m4	16 Dec 2005 00:04:13 -
@@ -254,18 +254,22 @@
 SEARCH_PROG([for a Noweb - LaTeX converter],literate_to_tex_command,noweave)
 test $literate_to_tex_command = noweave  literate_to_tex_command=noweave -delay -index \$\$i  \$\$o
 
-SEARCH_PROG([for a HTML - Latex converter],html_to_latex_command,html2latex)
+SEARCH_PROG([for an HTML - LaTeX converter],html_to_latex_command,html2latex)
 test $html_to_latex_command = html2latex  html_to_latex_command=html2latex \$\$i
 
-SEARCH_PROG([for a MSWord - Latex converter],word_to_latex_command,wvCleanLatex word2x)
+SEARCH_PROG([for an MS Word - LaTeX converter],word_to_latex_command,wvCleanLatex word2x)
 test $word_to_latex_command = wvCleanLatex  word_to_latex_command=wvCleanLatex \$\$i \$\$o
 test $word_to_latex_command = word2x  word_to_latex_command=word2x -f latex \$\$i
 
+# tex4ht generates HTML output that is well-suited for MS Word
+SEARCH_PROG([for a LaTeX - MS Word converter],latex_to_word_command,htlatex)
+test $latex_to_word_command = htlatex  latex_to_word_command=htlatex \$\$i 'html,word' 'symbol/!' '-cvalidate'
+
 SEARCH_PROG([for Image converter],image_command,convert)
 test $image_command = convert  image_command=convert \$\$i \$\$o
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER=$GHOSTVIEW -swap ;;
   *) PS_VIEWER=$GHOSTVIEW;;
@@ -273,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF preview],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
 
 # Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for a HTML previewer],HTML_VIEWER, mozilla file://\$\$p\$\$i netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, mozilla file://\$\$p\$\$i netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, ps2pdf13 \$\$i)
@@ -305,7 +309,7 @@
chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38)
 
 # Search for a spellchecker
-LYXRC_PROG([for a spell-checker], \spell_command, ispell)
+LYXRC_PROG([for a spellchecker], \spell_command, ispell)
 
 # Search for computer algebra systems
 SEARCH_PROG([for Octave],OCTAVE,octave)
@@ -383,9 +387,10 @@
 esac
 LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix)
 
-SEARCH_PROG([for a LaTeX - HTML converter], TOHTML, tth latex2html hevea)
+SEARCH_PROG([for a LaTeX - HTML converter], TOHTML, htlatex tth latex2html hevea)
 latex_to_html_command=$TOHTML
 case $TOHTML in
+htlatex) latex_to_html_command=htlatex \$\$i;;
 	tth) latex_to_html_command=tth -t -e2 -L\$\$b  \$\$i  \$\$o;;
  latex2html) latex_to_html_command=latex2html -no_subdir -split 0 -show_section_numbers \$\$i;;
   hevea) latex_to_html_command=hevea -s \$\$i;;
@@ -559,16 +564,16 @@
 \\Format dvi	  dvi	DVI		D
 \\Format eps	  eps	EPS		
 \\Format fax	  	Fax		
-\\Format fig	  fig	XFig		
-\\Format agr 

Re: plans to integrate lyx to cygwin?

2005-12-15 Thread Bo Peng
On 12/14/05, Angus Leeming [EMAIL PROTECTED] wrote:
 Luis Rivera wrote:
  Are there plans to integrate LyX to the cygwin distribution?

It is of course good to have such an option. However, with the new
all-in-one windows installer, I can not see an urgent need for it.

Bo


1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
Same machine, same configuration, lyx 1.4.0 cvs:



+  checking for ec support in LaTeX format... yes
+checking for document class a0poster [a0poster]... no
+checking for document class a0poster [a0poster]... no
+checking for package a4 [a4]... yes
+checking for package a4wide [a4wide]... yes


lyx-1.3.6

+  checking for ec fonts... yes
+  checking for ec support in LaTeX format... yes
+checking for document class a0poster [a0poster]... no
+checking for document class aastex [aastex]... yes
+checking for document class beamer [beamer]... yes
+checking for document class bioinfo [bioinfo]... no
+checking for document class manual [manual]... yes

For this a0poster, I have a0poster.layout under my ~/.lyx/layouts but
the class files have been removed.

Bo


Re: 1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
 For this a0poster, I have a0poster.layout under my ~/.lyx/layouts but
 the class files have been removed.

After I remove a0poster.layout, reconfiguration stops at aastex, a
regular latex class:

+checking for document class aastex [aastex]... yes
+checking for document class aastex [aastex]... yes
+checking for package a4 [a4]... yes
+checking for package a4wide [a4wide]... yes
...

Bo


Re: 1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
OK. If I use a clean account (does not have .lyx directory created by
lyx 1.3.6), lyx 1.4.0cvs configures fine.

Another problem: instant preview figure misplaced. See attachment.

Bo


ipreview.png
Description: PNG image


Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes:

Martin> I still want to give that a try later, for 1.4.1 perhaps...
Martin> there must be a straightforward way of doing it, mostly
Martin> confined to rowpainter. And with special attention to the text
Martin> inside insets, as people will want to use big branchinsets.

One idea I had is to do some checksumming of the row content while
breaking paragraphs which allows to know whether a row has been
modified and needs a redraw. Then the rowpainter could more safely
decide not to redraw some parts. I do not know how difficult this
would be, though.

Admitedly this would reduce the number of repaints, not of rebreaks,
but it may be less fragile than tests all over the place to guess what
should be updated.

Martin> Currently, with my lyxfunc patch, only the current paragraph
Martin> is redrawn for every character insertion. The whole screen
Martin> only if paragraph height changes. Now if we have a big
Martin> paragraph, that is too much. Logical. Note that if a paragraph
Martin> contains an inset (containing one or more paragraphs of its
Martin> own), _all of this together_ counts here as "current
Martin> paragraph".

Martin> Do we have now the feeling that we understand this?

Yes, unfortunately. If we decide to drop the issue, we will _have_ to
do something for later 1.4.x versions, I think.

JMarc


Re: The userguide is wrong about un-nestable sectioning commands

2005-12-15 Thread Helge Hafting

Jean-Marc Lasgouttes wrote:


Yes, please a patch against latest cvs would be welcome.
 


A patch for /lib/doc/UserGuide.lyx and a changelog entry.
Testing shows that:
* All the sectioning environments may be nested into other environments.
 Both lyx-1.4 and latex accepts this.  Not all of the sectioning levels 
seems

 useful to nest, but lower levels like "section*" may be useful when
 one feel like putting a heading inside a (big) list item.  It was 
questions about
 such headings on the user list that got me testing this in the first 
place.


* An abstract may be nested into other environments, and it also accepts
 other environments nested into it.  The latter is clearly useful. 
 I am not so sure about the former.  But it works well, and may perhaps 
be useful
 for creating summaries of items in nested environments. 


* A caption can be nested into other environments.  Trouble-free but odd.
  This must be done inside a float, of course.

Lyx also allows nesting of Title, Date and Author.  Latex accepts this,
but nesting the title makes it disappear, and nesting Date and Author
makes them look just like "standard", i.e. they are no longer centered
and the text reverts to normal size.  So I left these as "unnestables"
because it doesn't work very well at all.

Helge Hafting
? doc-no2nb.diff
? libdoc.diff
? skrot
? tmp.diff
Index: ChangeLog
===
RCS file: /var/cvs/lyx/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.43
diff -u -p -r1.43 ChangeLog
--- ChangeLog   9 Dec 2005 15:54:18 -   1.43
+++ ChangeLog   15 Dec 2005 10:11:00 -
@@ -1,2 +1,13 @@
+2005-12-15  Helge Hafting  <[EMAIL PROTECTED]>
+   * UserGuide.lyx: Corrected information about nesting:
+ - sections etc can be nested into other environments,
+   so removed information about this being impossible.
+ - An abstract can be nested, and other stuff may be nested
+   into it, removed information about this being impossible
+ - A caption can be nested into other paragraphs, removed
+   the "vice versa" indicating this being impossible.
+ - Updated the lists in section "What You Can and Can't Nest"
+   to reflect reality.  
+
 2005-12-09  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
Index: UserGuide.lyx
===
RCS file: /var/cvs/lyx/lyx-devel/lib/doc/UserGuide.lyx,v
retrieving revision 1.16
diff -u -p -r1.16 UserGuide.lyx
--- UserGuide.lyx   28 Sep 2005 09:40:47 -  1.16
+++ UserGuide.lyx   15 Dec 2005 10:11:12 -
@@ -1,5 +1,5 @@
 #LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
-\lyxformat 244
+\lyxformat 245
 \begin_document
 \begin_header
 \textclass scrbook
@@ -77,7 +77,6 @@
 \paragraph_separation indent
 \defskip medskip
 \quotes_language english
-\quotes_times 2
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
@@ -5870,7 +5869,7 @@ You can only use inlined math in these e
 \end_layout
 
 \begin_layout Itemize
-You cannot do any nesting with these environments.
+You cannot nest other environments into these environments.
 \end_layout
 
 \begin_layout Itemize
@@ -7326,12 +7325,6 @@ could
 should
 \emph default
  only use it at the beginning of the document, after the title.
- Also, don't bother trying to nest 
-\family sans
-Abstract
-\family default
- in anything else or vice versa.
- It won't work.
  The 
 \family sans
 Abstract
@@ -7752,7 +7745,7 @@ You can't really nest things into a 
 \family sans
 Caption
 \family default
- environment or vice versa.
+ environment.
  Additionally, hitting 
 \family sans
 Return
@@ -8335,172 +8328,172 @@ Unnestable Can't nest them.
 \begin_layout Itemize
 
 \family sans
-Part
+Bibliography
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Chapter
+Title
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Section
-\family default
- 
+Author
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsection
+Date
+\end_layout
+
+\end_deeper
+\begin_layout Description
+Fully\InsetSpace ~
+Nestable You can nest them.
+ You can nest other things into them.
 \end_layout
 
+\begin_deeper
 \begin_layout Itemize
 
 \family sans
-Subsubsection
+Abstract
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Paragraph
-\family default
- 
+Verse
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subparagraph
+Quote
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Part*
+Quotation
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Chapter*
+Itemize
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Section*
+Enumerate
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsection*
+Description
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Subsubsection*
+List
 \end_layout
 
 \begin_layout Itemize
 
 \family sans
-Bibliography
+LyX-Code
+\end_layout
+
+\end_deeper
+\begin_layout Description
+Nestable-Inside You can nest them 

Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Martin Vermeer
On Thu, 2005-12-15 at 10:35 +0100, Jean-Marc Lasgouttes wrote:
> > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes:
> 
> Martin> I still want to give that a try later, for 1.4.1 perhaps...
> Martin> there must be a straightforward way of doing it, mostly
> Martin> confined to rowpainter. And with special attention to the text
> Martin> inside insets, as people will want to use big branchinsets.
> 
> One idea I had is to do some checksumming of the row content while
> breaking paragraphs which allows to know whether a row has been
> modified and needs a redraw. Then the rowpainter could more safely
> decide not to redraw some parts. I do not know how difficult this
> would be, though.

That was more or less what the patch did. It computed a 'signature' of
the row, the expression

rit->endpos() - rit->pos() + y

showing if a row has been changed in a way that necessitates repainting.
This is not a very good signature though, as you can easily see.
Checksum would be better.

> Admitedly this would reduce the number of repaints, not of rebreaks,
> but it may be less fragile than tests all over the place to guess what
> should be updated.
> 
> Martin> Currently, with my lyxfunc patch, only the current paragraph
> Martin> is redrawn for every character insertion. The whole screen
> Martin> only if paragraph height changes. Now if we have a big
> Martin> paragraph, that is too much. Logical. Note that if a paragraph
> Martin> contains an inset (containing one or more paragraphs of its
> Martin> own), _all of this together_ counts here as "current
> Martin> paragraph".
> 
> Martin> Do we have now the feeling that we understand this?
> 
> Yes, unfortunately. If we decide to drop the issue, we will _have_ to
> do something for later 1.4.x versions, I think.

Yes, I am hopeful that I can resurrect the singlerow patch.

- Martin



signature.asc
Description: This is a digitally signed message part


Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Angus Leeming
Martin Vermeer wrote:
>> One idea I had is to do some checksumming of the row content while
>> breaking paragraphs which allows to know whether a row has been
>> modified and needs a redraw. Then the rowpainter could more safely
>> decide not to redraw some parts. I do not know how difficult this
>> would be, though.

> That was more or less what the patch did. It computed a 'signature' of
> the row, the expression

> Yes, I am hopeful that I can resurrect the singlerow patch.

The obvious question to ask here is: does it cure Bennett's problems?

-- 
Angus



Re: [Patch] lib/doc/Makefile.depend missed the no->nb language transition in 1.4cvs

2005-12-15 Thread Jean-Marc Lasgouttes
> "Helge" == Helge Hafting <[EMAIL PROTECTED]> writes:

Helge> lib/doc/Makefile.depend still tried to make "no_TOC.lyx", when
Helge> it was supposed to be "nb_TOC.lyx".

Helge> Attached a patch that fixes this, including a Changelog entry.

How did you fix it? By running depend.py?

JMarc

JMarc


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Jean-Marc Lasgouttes
> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:

Georg> Jean-Marc Lasgouttes wrote:
>>> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
>>
Lars> But what is the delay caused by. Not everyone sees it. Is it the
Lars> sheer number of fonts, or is it that some fonts are missing?

Georg> It seems that a noticeable part of the delay happens if a font
Georg> is not found. For example, I had no eufm10.ttf font installed
Georg> because of the old bakoma license, and got a delay. I now have
Georg> it, and that delay is gone, 

So shall we make a new latex-xft-fonts based on bakoma, or shall we
propose to install mathml-fonts?

Georg> but LyX still can't find a symbol font (I have that, but qt
Georg> won't find it, because it is in type1 format). Does anybody
Georg> know if there is a free version of the standard postscript
Georg> symbol font in truetype format? 

>From a windows installation?

But do we need the symbol fonts when the other ones are available?

JMarc


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Georg Baum
Jean-Marc Lasgouttes wrote:

> So shall we make a new latex-xft-fonts based on bakoma, or shall we
> propose to install mathml-fonts?

We have that already, see the wiki: http://wiki.lyx.org/pmwiki.php/FAQ/Qt
(although the text is a bit confusing)

> Georg> but LyX still can't find a symbol font (I have that, but qt
> Georg> won't find it, because it is in type1 format). Does anybody
> Georg> know if there is a free version of the standard postscript
> Georg> symbol font in truetype format?
> 
> From a windows installation?

Probably, but I am not sure if I may use that elsewhere.

> But do we need the symbol fonts when the other ones are available?

Yes, because of this entry in lib/symbols:

textdegree lyxsymbol 176 0 mathord  x

I am sure that a textdgree sign is available in one of the other fonts, but
I don't know how to declare it in lib/symbol so that it works in all
encodings.


Georg



Re: [Patch] lib/doc/Makefile.depend missed the no->nb language transition in 1.4cvs

2005-12-15 Thread Helge Hafting

Jean-Marc Lasgouttes wrote:


"Helge" == Helge Hafting <[EMAIL PROTECTED]> writes:
   



Helge> lib/doc/Makefile.depend still tried to make "no_TOC.lyx", when
Helge> it was supposed to be "nb_TOC.lyx".

Helge> Attached a patch that fixes this, including a Changelog entry.

How did you fix it? By running depend.py?
 


I changed Makefile.depend by editing it.
I see there are some changes in there that I did not do,
but it is only reordering of some files.
I ran "make distclean" (in lib/doc)  and then autogen.sh, configure,
make, and "make install" to test that it worked. 


I don't know the build process too well, but Makefile.depend did not
get autogenerated for me, so I got it from cvs and changed it.

Helge Hafting


Re: [patch] Re: Mac speed, profiling

2005-12-15 Thread Martin Vermeer
On Thu, 2005-12-15 at 10:31 +, Angus Leeming wrote:
> Martin Vermeer wrote:
> >> One idea I had is to do some checksumming of the row content while
> >> breaking paragraphs which allows to know whether a row has been
> >> modified and needs a redraw. Then the rowpainter could more safely
> >> decide not to redraw some parts. I do not know how difficult this
> >> would be, though.
> 
> > That was more or less what the patch did. It computed a 'signature' of
> > the row, the expression
> 
> > Yes, I am hopeful that I can resurrect the singlerow patch.
> 
> The obvious question to ask here is: does it cure Bennett's problems?

Only one way to find out, innit?

- Martin


signature.asc
Description: This is a digitally signed message part


Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Lars Gullik Bjønnes
Juergen Spitzmueller <[EMAIL PROTECTED]> writes:

| Georg Baum wrote:
| > Jean-Marc Lasgouttes wrote:
| > > I think that this patch always makes sense, irrespectively of whether
| > > we manage to improve this font querying later...
| > >
| > > I'd propose to apply it.
| >
| > Me too.
| 
| Lars?

This is only moving the math init from lyx startup to the first time
someone uses math, right?

then ok.

-- 
Lgb



Re: [patch] Re: LyX startup times, was: Re: Forget Windows

2005-12-15 Thread Juergen Spitzmueller
Lars Gullik Bjønnes wrote:
> This is only moving the math init from lyx startup to the first time
> someone uses math, right?

yes.

> then ok.

thanks.

Jürgen


OT: automake woes

2005-12-15 Thread Angus Leeming
I have a project (http://sourceforge.net/projects/qdvi/)
where I'm porting kdvi to Windows. The thing is pretty well working in my
local tree (the committed stuff does *not*, so don't try it out!) but I
have one Automake stumbling block. Here's the (working) snippet of my
Makefile.am, which

1. Visits the kdelibs subdirectory where it compiles and links
$(CONFIG_COMPILER).
2. Generates prefs.{cpp,h} and kvsprefs.{cpp,h} from those .kcfg files
using this kdelibs/$(CONFIG_COMPILER).
3. Goes on to compile the .cpp files into .$(OBJEXT) ones.

As I say, the Makefile.am works, but it's very fragile because prefs
{cpp,h} and kvsprefs.{cpp,h} must be placed first in my list of sources,
so that they're compiled before anything else which #includes prefs.h or
kvsprefs.h. At least that's what I hope happens, but there's nothing to
guarantee it.

I've tried adding these files to BUILT_SOURCES and to qdvi_nodist_SOURCES
and I've tried to make qdvi_SOURCES dependent on kvsprefs.cpp, but all
that happens is that the build process attempts to build them on the way
*up* the tree, before it's got to kdelibs to compile $(CONFIG_COMPILER). I
want it to build them on the way *down* the tree, after it's visited the
kdelibs subdirectory.

Any ideas on how to do this properly?

(yes, I know I'm abusing my position a little ;-))
Angus


SUBDIRS = kdelibs .
CONFIG_COMPILER =  kdelibs/qdvi_config_compiler$(EXEEXT)
bin_PROGRAMS = qdvi

# prefs.{cpp.h}, kvsprefs.{cpp.h} come first in this list because
# they are generated files and I don't know how else to force
# Automake to create them before it tries to compile these .cpp files
# but after it has visited kdelibs where it creates $(CONFIG_COMPIER)

# Yes, I know it's scrappy.
qdvi_SOURCES = \
prefs.cpp \
prefs.h \
kvsprefs.cpp \
kvsprefs.h \
anchor.h \
bigEndianByteReader.cpp \
bigEndianByteReader.h \
...

kvsprefs.cpp: kviewshell.kcfg kvsprefs.kcfgc
$(CONFIG_COMPILER) $(srcdir)/kviewshell.kcfg $(srcdir)/kvsprefs.kcfgc

prefs.cpp: kdvi.kcfg prefs.kcfgc
$(CONFIG_COMPILER) $(srcdir)/kdvi.kcfg $(srcdir)/prefs.kcfgc




Re: [Patch] lib/doc/Makefile.depend missed the no->nb language transition in 1.4cvs

2005-12-15 Thread Georg Baum
Helge Hafting wrote:

> I changed Makefile.depend by editing it.
> I see there are some changes in there that I did not do,
> but it is only reordering of some files.

The reason is that they are ordered as they are on disk. We should sort
them.

> I ran "make distclean" (in lib/doc)  and then autogen.sh, configure,
> make, and "make install" to test that it worked.
> 
> I don't know the build process too well, but Makefile.depend did not
> get autogenerated for me, so I got it from cvs and changed it.

It does not get autogenerated, but it is automatically kept up to date (by
running make in lib/doc).

The attached patch fixes the filename sorting and includes the no -> nb
change, so that future changes do not contain reordered files.
OK to apply?


GeorgIndex: lib/doc/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.43
diff -u -p -r1.43 ChangeLog
--- lib/doc/ChangeLog	9 Dec 2005 15:54:18 -	1.43
+++ lib/doc/ChangeLog	15 Dec 2005 18:29:25 -
@@ -1,3 +1,8 @@
+2005-12-15  Georg Baum  <[EMAIL PROTECTED]>
+
+	* depend.py: sort dependencies to reduce clutter from diffs
+	* Makefile.depend: update to include nb_Intro.lyx
+
 2005-12-09  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* Makefile.am (docfiles): 
Index: lib/doc/Makefile.depend
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/Makefile.depend,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.depend
--- lib/doc/Makefile.depend	10 Oct 2005 13:22:34 -	1.3
+++ lib/doc/Makefile.depend	15 Dec 2005 18:29:25 -
@@ -13,34 +13,34 @@ cs_TOC.lyx: $(srcdir)/cs_Tutorial.lyx
 da_TOC.lyx: $(srcdir)/da_Intro.lyx
 	python $(srcdir)/doc_toc.py da
 
-de_TOC.lyx: $(srcdir)/de_Customization.lyx $(srcdir)/de_FAQ.lyx $(srcdir)/de_Extended.lyx $(srcdir)/de_UserGuide.lyx $(srcdir)/de_Tutorial.lyx $(srcdir)/de_Intro.lyx
+de_TOC.lyx: $(srcdir)/de_Customization.lyx $(srcdir)/de_Extended.lyx $(srcdir)/de_FAQ.lyx $(srcdir)/de_Intro.lyx $(srcdir)/de_Tutorial.lyx $(srcdir)/de_UserGuide.lyx
 	python $(srcdir)/doc_toc.py de
 
 es_TOC.lyx: $(srcdir)/es_Intro.lyx $(srcdir)/es_Tutorial.lyx
 	python $(srcdir)/doc_toc.py es
 
-eu_TOC.lyx: $(srcdir)/eu_FAQ.lyx $(srcdir)/eu_Intro.lyx $(srcdir)/eu_Extended.lyx $(srcdir)/eu_UserGuide.lyx $(srcdir)/eu_Customization.lyx $(srcdir)/eu_Tutorial.lyx
+eu_TOC.lyx: $(srcdir)/eu_Customization.lyx $(srcdir)/eu_Extended.lyx $(srcdir)/eu_FAQ.lyx $(srcdir)/eu_Intro.lyx $(srcdir)/eu_Tutorial.lyx $(srcdir)/eu_UserGuide.lyx
 	python $(srcdir)/doc_toc.py eu
 
-fr_TOC.lyx: $(srcdir)/fr_FAQ.lyx $(srcdir)/fr_Customization.lyx $(srcdir)/fr_Extended.lyx $(srcdir)/fr_Tutorial.lyx $(srcdir)/fr_UserGuide.lyx $(srcdir)/fr_Intro.lyx
+fr_TOC.lyx: $(srcdir)/fr_Customization.lyx $(srcdir)/fr_Extended.lyx $(srcdir)/fr_FAQ.lyx $(srcdir)/fr_Intro.lyx $(srcdir)/fr_Tutorial.lyx $(srcdir)/fr_UserGuide.lyx
 	python $(srcdir)/doc_toc.py fr
 
-he_TOC.lyx: $(srcdir)/he_Tutorial.lyx $(srcdir)/he_Intro.lyx
+he_TOC.lyx: $(srcdir)/he_Intro.lyx $(srcdir)/he_Tutorial.lyx
 	python $(srcdir)/doc_toc.py he
 
 hu_TOC.lyx: $(srcdir)/hu_Intro.lyx
 	python $(srcdir)/doc_toc.py hu
 
-it_TOC.lyx: $(srcdir)/it_Tutorial.lyx $(srcdir)/it_Customization.lyx $(srcdir)/it_UserGuide.lyx $(srcdir)/it_Intro.lyx
+it_TOC.lyx: $(srcdir)/it_Customization.lyx $(srcdir)/it_Intro.lyx $(srcdir)/it_Tutorial.lyx $(srcdir)/it_UserGuide.lyx
 	python $(srcdir)/doc_toc.py it
 
-nl_TOC.lyx: $(srcdir)/nl_Tutorial.lyx $(srcdir)/nl_Intro.lyx
-	python $(srcdir)/doc_toc.py nl
+nb_TOC.lyx: $(srcdir)/nb_Intro.lyx
+	python $(srcdir)/doc_toc.py nb
 
-no_TOC.lyx: $(srcdir)/no_Intro.lyx
-	python $(srcdir)/doc_toc.py no
+nl_TOC.lyx: $(srcdir)/nl_Intro.lyx $(srcdir)/nl_Tutorial.lyx
+	python $(srcdir)/doc_toc.py nl
 
-pl_TOC.lyx: $(srcdir)/pl_Extended.lyx $(srcdir)/pl_Tutorial.lyx $(srcdir)/pl_Intro.lyx
+pl_TOC.lyx: $(srcdir)/pl_Extended.lyx $(srcdir)/pl_Intro.lyx $(srcdir)/pl_Tutorial.lyx
 	python $(srcdir)/doc_toc.py pl
 
 pt_TOC.lyx: $(srcdir)/pt_Intro.lyx $(srcdir)/pt_Tutorial.lyx
@@ -49,16 +49,16 @@ pt_TOC.lyx: $(srcdir)/pt_Intro.lyx $(src
 ro_TOC.lyx: $(srcdir)/ro_Intro.lyx
 	python $(srcdir)/doc_toc.py ro
 
-ru_TOC.lyx: $(srcdir)/ru_Tutorial.lyx $(srcdir)/ru_FAQ.lyx $(srcdir)/ru_Intro.lyx
+ru_TOC.lyx: $(srcdir)/ru_FAQ.lyx $(srcdir)/ru_Intro.lyx $(srcdir)/ru_Tutorial.lyx
 	python $(srcdir)/doc_toc.py ru
 
-sk_TOC.lyx: $(srcdir)/sk_UserGuide.lyx $(srcdir)/sk_Tutorial.lyx
+sk_TOC.lyx: $(srcdir)/sk_Tutorial.lyx $(srcdir)/sk_UserGuide.lyx
 	python $(srcdir)/doc_toc.py sk
 
-sl_TOC.lyx: $(srcdir)/sl_Tutorial.lyx $(srcdir)/sl_Intro.lyx
+sl_TOC.lyx: $(srcdir)/sl_Intro.lyx $(srcdir)/sl_Tutorial.lyx
 	python $(srcdir)/doc_toc.py sl
 
-sv_TOC.lyx: $(srcdir)/sv_Tutorial.lyx $(srcdir)/sv_Intro.lyx
+sv_TOC.lyx: $(srcdir)/sv_Intro.lyx $(srcdir)/sv_Tutorial.lyx
 	python $(srcdir)/doc_toc.py sv
 
-tocfiles = TOC.lyx cs_TOC.lyx da_TOC.lyx de_TOC.lyx 

Re: lyx137pre5 native on win95, and lyx140pre2 cygwin on win95

2005-12-15 Thread Luis Rivera
Angus Leeming <[EMAIL PROTECTED]> writes:

> 
>C:/WINDOWS/TEMPlyx_tempdir-425411a44659
>C:/WINDOWS/Application Data/LyXlastfiles
> 
> These "feel" like someone is making paths as
>string my_path = foo + bar;
> where foo is expected to be "foo/bar/" but is, in fact, "foo/bar".
> 

I think that's pretty much what I was trying to say in some other thread,
but at the time it seemed that the trouble was the inconsistency in path
construction: that's how you ended up adding a slash at the end of every
path... 

> If that's the case, then you've discovered a bug; we should be creating
> such paths with these APIs:
> 
> /// Add a filename to a path. Any path from filename is stripped first.
> string const AddName(string const & path, string const & fname);
> 
> /// Append sub-directory(ies) to path in an intelligent way
> string const AddPath(string const & path, string const & path2);
> 
> I'm sure it'll be easy enough to track down if you've got the energy 
> 

I think I have the energy; I am not sure to have the time: beginning 
Friday, thanks to Christmas, I am taking a long needed vacation... I mean 
A LONG VACATION!!! (I must finish writing a small book, putting LyX to work, 
so to speak)... 

If you have the patience to wait till mid January...

Luis.




Re: lyx137pre5 native on win95, and lyx140pre2 cygwin on win95

2005-12-15 Thread Angus Leeming
Luis Rivera wrote:
> If you have the patience to wait till mid January...

LyX is now 10 years old (http://www.lyx.org/~jamatos/archaeology/). She's
got lots and lots of patience. (But will eventually throw a tantrum if she
doesn't get her own way ;-))

-- 
Angus



[PATCH 1.3] Support tex4ht

2005-12-15 Thread Michael Gerz

Dear Jean-Marc,

enclosed please find a patch for LyX 1.3 that (partially) synchronizes 
./lib/configure.m4 with the main branch. It supports tex4ht as a LaTeX 
to MS Word converter and fixes various typos.


Ok to apply?

Michael
Index: status.13x
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.282
diff -u -r1.1.2.282 status.13x
--- status.13x	12 Dec 2005 10:08:37 -	1.1.2.282
+++ status.13x	16 Dec 2005 00:03:53 -
@@ -37,6 +37,10 @@
 
 - Fix LaTeX output when a bibtex inset is used in a child document.
 
+- Support tex4ht for Tex -> MS Word conversion 
+
+- Support the previewers kdvi, kpdf, and kghostview
+
 * User Interface:
 
 - Fix wrong path when drag-and-dropping files on Windows. [Qt only] 
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.133
diff -u -r1.363.2.133 ChangeLog
--- lib/ChangeLog	12 Dec 2005 10:08:38 -	1.363.2.133
+++ lib/ChangeLog	16 Dec 2005 00:04:12 -
@@ -1,3 +1,8 @@
+2005-12-14  Michael Gerz  <[EMAIL PROTECTED]>
+
+	* configure.m4: fix typos; support tex4ht, kdvi,
+	kpdf and kghostview
+
 2005-12-12  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* bind/sciword.bind: include math.bind, not maths.bind.
Index: lib/configure.m4
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.60.2.26
diff -u -r1.60.2.26 configure.m4
--- lib/configure.m4	15 Jul 2005 15:46:36 -	1.60.2.26
+++ lib/configure.m4	16 Dec 2005 00:04:13 -
@@ -254,18 +254,22 @@
 SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave)
 test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$i > \$\$o"
 
-SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command,html2latex)
+SEARCH_PROG([for an HTML -> LaTeX converter],html_to_latex_command,html2latex)
 test $html_to_latex_command = "html2latex" && html_to_latex_command="html2latex \$\$i"
 
-SEARCH_PROG([for a MSWord -> Latex converter],word_to_latex_command,wvCleanLatex word2x)
+SEARCH_PROG([for an MS Word -> LaTeX converter],word_to_latex_command,wvCleanLatex word2x)
 test "$word_to_latex_command" = "wvCleanLatex" && word_to_latex_command="wvCleanLatex \$\$i \$\$o"
 test "$word_to_latex_command" = "word2x" && word_to_latex_command="word2x -f latex \$\$i"
 
+# tex4ht generates HTML output that is well-suited for MS Word
+SEARCH_PROG([for a LaTeX -> MS Word converter],latex_to_word_command,htlatex)
+test "$latex_to_word_command" = "htlatex" && latex_to_word_command="htlatex \$\$i 'html,word' 'symbol/!' '-cvalidate'"
+
 SEARCH_PROG([for Image converter],image_command,convert)
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -273,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF preview],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
 
 # Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
@@ -305,7 +309,7 @@
"chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38")
 
 # Search for a spellchecker
-LYXRC_PROG([for a spell-checker], \spell_command, ispell)
+LYXRC_PROG([for a spellchecker], \spell_command, ispell)
 
 # Search for computer algebra systems
 SEARCH_PROG([for Octave],OCTAVE,octave)
@@ -383,9 +387,10 @@
 esac
 LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix)
 
-SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea)
+SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, htlatex tth latex2html hevea)
 latex_to_html_command=$TOHTML
 case $TOHTML in
+htlatex) latex_to_html_command="htlatex \$\$i";;
 	tth) latex_to_html_command="tth -t -e2 -L\$\$b < \$\$i > \$\$o";;
  latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$i";;
   hevea) latex_to_html_command="hevea -s \$\$i";;
@@ -559,16 +564,16 @@
 \\Format dvi	  dvi	DVI		D
 \\Format 

Re: plans to integrate lyx to cygwin?

2005-12-15 Thread Bo Peng
On 12/14/05, Angus Leeming <[EMAIL PROTECTED]> wrote:
> Luis Rivera wrote:
> > Are there plans to integrate LyX to the cygwin distribution?

It is of course good to have such an option. However, with the new
all-in-one windows installer, I can not see an urgent need for it.

Bo


1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
Same machine, same configuration, lyx 1.4.0 cvs:



+  checking for ec support in LaTeX format... yes
+checking for document class a0poster [a0poster]... no
+checking for document class a0poster [a0poster]... no
+checking for package a4 [a4]... yes
+checking for package a4wide [a4wide]... yes


lyx-1.3.6

+  checking for ec fonts... yes
+  checking for ec support in LaTeX format... yes
+checking for document class a0poster [a0poster]... no
+checking for document class aastex [aastex]... yes
+checking for document class beamer [beamer]... yes
+checking for document class bioinfo [bioinfo]... no
+checking for document class manual [manual]... yes

For this a0poster, I have a0poster.layout under my ~/.lyx/layouts but
the class files have been removed.

Bo


Re: 1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
> For this a0poster, I have a0poster.layout under my ~/.lyx/layouts but
> the class files have been removed.

After I remove a0poster.layout, reconfiguration stops at aastex, a
regular latex class:

+checking for document class aastex [aastex]... yes
+checking for document class aastex [aastex]... yes
+checking for package a4 [a4]... yes
+checking for package a4wide [a4wide]... yes
...

Bo


Re: 1.4.0cvs reconfigure can not detect my latex classes

2005-12-15 Thread Bo Peng
OK. If I use a clean account (does not have .lyx directory created by
lyx 1.3.6), lyx 1.4.0cvs configures fine.

Another problem: instant preview figure misplaced. See attachment.

Bo


ipreview.png
Description: PNG image