Jean-Marc Lasgouttes wrote:
> When loading the UserGuide, I get:
>
> Unknown token, size_type, skipping.
> Unknown token, 0, skipping.
> Unknown token, lyxsize_type, skipping.
> Unknown token, 0, skipping.
...
> Certainly this is not intended?
no, it's a problem now from the long wait ...
anyway, my fault!
revert the whole last patch or try the attached
Herbert
--
http://www.lyx.org/help/
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.472
diff -u -r1.472 ChangeLog
--- src/insets/ChangeLog 22 Jul 2002 12:36:41 -0000 1.472
+++ src/insets/ChangeLog 22 Jul 2002 21:33:50 -0000
@@ -1,5 +1,9 @@
2002-07-22 Herbert Voss <[EMAIL PROTECTED]>
+ * insetgraphicsParams.[Ch]: support size_type for old docs
+
+2002-07-22 Herbert Voss <[EMAIL PROTECTED]>
+
* insetgraphics.C:
* insetgraphicsParams.[Ch]: change size_type to size_kind and
other small changes
Index: src/insets/insetgraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.C,v
retrieving revision 1.45
diff -u -r1.45 insetgraphicsParams.C
--- src/insets/insetgraphicsParams.C 22 Jul 2002 12:36:41 -0000 1.45
+++ src/insets/insetgraphicsParams.C 22 Jul 2002 21:33:51 -0000
@@ -276,9 +276,23 @@
subcaptionText = lex.getString();
} else if (token == "noUnzip") {
noUnzip = true;
- } else if (token == "size_kind") {
+ } else if (token == "size_kind") {
lex.next();
size_kind = getSizeKind(lex.getString());
+ // compatibility-stuff 1.20->1.3.0
+ } else if (token == "size_type") {
+ lex.next();
+ switch (lex.getInteger()) {
+ case 0:
+ size_kind = DEFAULT_SIZE;
+ break;
+ case 1:
+ size_kind = WH;
+ break;
+ case 2:
+ size_kind = SCALE;
+ break;
+ }
} else if (token == "width") {
lex.next();
width = LyXLength(lex.getString());
