Jean-Marc Lasgouttes wrote:
> Juergen, could it be related to your recent changes?
At least as far as those changes point to an error in InsetSpace. lyxlex does
not read commas, so \InsetSpace \, is misparsed. I wonder why I didn't
encounter this before :-(
I think the best is to rename it \InsetSpace \thinspace{}. Patch is attached.
lyx2lyx-changes still have to be done, if someone would be so kind.
Attached are also document fixes.
OK?
> LColor::getFromLyXName: Unknown color "default"
> LColor::getFromLyXName: Unknown color "default"
These are fixed, too.
Jürgen
> JMarc
Index: development/FORMAT
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/development/FORMAT,v
retrieving revision 1.41
diff -u -r1.41 FORMAT
--- development/FORMAT 29 Jul 2005 09:39:17 -0000 1.41
+++ development/FORMAT 24 Sep 2005 12:57:19 -0000
@@ -1,6 +1,12 @@
LyX file-format changes
-----------------------
+2005-09-24 Jürgen Spitzmüller <[EMAIL PROTECTED]>
+
+ * format incremented to 244. Rename '\InsetSpace \,'
+ to '\InsetSpace \thinspace{}', because the comma was
+ not parsed by lyxlex.
+
2005-07-18 José Matos <[EMAIL PROTECTED]>
* format incremented to 243.
Index: src/insets/insetspace.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspace.C,v
retrieving revision 1.25
diff -u -r1.25 insetspace.C
--- src/insets/insetspace.C 23 Nov 2004 23:04:48 -0000 1.25
+++ src/insets/insetspace.C 24 Sep 2005 12:57:21 -0000
@@ -112,7 +112,7 @@
command = "~";
break;
case THIN:
- command = "\\,";
+ command = "\\thinspace{}";
break;
case QUAD:
command = "\\quad{}";
@@ -134,7 +134,6 @@
}
-// This function will not be necessary when lyx3
void InsetSpace::read(Buffer const &, LyXLex & lex)
{
lex.next();
@@ -144,7 +143,7 @@
kind_ = NORMAL;
else if (command == "~")
kind_ = PROTECTED;
- else if (command == "\\,")
+ else if (command == "\\thinspace{}")
kind_ = THIN;
else if (command == "\\quad{}")
kind_ = QUAD;
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.627
diff -u -r1.627 buffer.C
--- src/buffer.C 18 Jul 2005 14:25:19 -0000 1.627
+++ src/buffer.C 24 Sep 2005 12:57:25 -0000
@@ -144,7 +144,7 @@
namespace {
-int const LYX_FORMAT = 243;
+int const LYX_FORMAT = 244;
} // namespace anon
Index: Extended.lyx
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/Extended.lyx,v
retrieving revision 1.5
diff -u -r1.5 Extended.lyx
--- Extended.lyx 19 Sep 2005 09:52:49 -0000 1.5
+++ Extended.lyx 24 Sep 2005 13:13:00 -0000
@@ -1,5 +1,5 @@
#LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
-\lyxformat 243
+\lyxformat 244
\begin_document
\begin_header
\textclass book
@@ -2078,7 +2078,7 @@
\end_layout
\begin_layout Standard
-Standard BibTeX uses numbers (e.\InsetSpace \,
+Standard BibTeX uses numbers (e.\InsetSpace \thinspace{}
g.\InsetSpace \space
\begin_inset Quotes eld
@@ -2090,7 +2090,7 @@
) to refer to a cited work.
However, in many scientific disciplines, other citation styles are in use.
- The most common one is the author-year style (e.\InsetSpace \,
+ The most common one is the author-year style (e.\InsetSpace \thinspace{}
g.\InsetSpace \space
\begin_inset Quotes eld
@@ -2287,7 +2287,7 @@
\begin_inset Quotes erd
\end_inset
-, you first need to create two bibliographic databases, e.\InsetSpace \,
+, you first need to create two bibliographic databases, e.\InsetSpace \thinspace{}
g.\InsetSpace \space
\family typewriter
@@ -2412,7 +2412,7 @@
\end_layout
\begin_layout Standard
-Multiple bibliographies, e.\InsetSpace \,
+Multiple bibliographies, e.\InsetSpace \thinspace{}
g.\InsetSpace \space
a bibliography for each section or chapter of
the document, are not supported by BibTeX itself.
@@ -2502,7 +2502,7 @@
(those commands have to be inserted as ERT).
The bibliography will contain all references which have been cited in the
current btUnit.
- N.\InsetSpace
+ N.\InsetSpace \thinspace{}
B.: If you are using this approach, then
\emph on
every
@@ -2543,7 +2543,6 @@
\emph default
\bar default
\noun default
-\color default
Outputs\SpecialChar \menuseparator
LaT\SpecialChar \textcompwordmark{}
eX
@@ -2554,7 +2553,6 @@
\emph off
\bar no
\noun off
-\color none
section of the preferences dialog, however, you can customize the index
command, if you prefer an alternative program like
\family typewriter
@@ -2564,7 +2562,7 @@
\emph default
\bar default
\noun default
-\color default
+\color none
xindy
\family roman
\series medium
Index: UserGuide.lyx
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/UserGuide.lyx,v
retrieving revision 1.15
diff -u -r1.15 UserGuide.lyx
--- UserGuide.lyx 19 Sep 2005 09:52:50 -0000 1.15
+++ UserGuide.lyx 24 Sep 2005 13:13:33 -0000
@@ -1,5 +1,5 @@
#LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
-\lyxformat 243
+\lyxformat 244
\begin_document
\begin_header
\textclass scrbook
@@ -12401,7 +12401,7 @@
\end_layout
\begin_layout Itemize
-e.\InsetSpace \,
+e.\InsetSpace \thinspace{}
g.\InsetSpace \space
this is too much space!
\end_layout
@@ -22015,8 +22015,7 @@
\end_layout
\begin_layout Standard
-Some languages (e.\InsetSpace
-\InsetSpace \,
+Some languages (e.\InsetSpace \thinspace{}
g.\InsetSpace \space
English) have the typographical convention to add extra
space after an end-of-sentence punctuation mark, and LyX honors those conventio
@@ -22148,9 +22147,9 @@
\end_layout
\begin_layout Quote
-D.\InsetSpace \,
+D.\InsetSpace \thinspace{}
E.
- Knuth has developped our beloved typesetting program, i.\InsetSpace \,
+ Knuth has developped our beloved typesetting program, i.\InsetSpace \thinspace{}
e.\InsetSpace \space
TeX.
\end_layout
