1 1999-11-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
3 * lib/doc/LaTeXConfig.lyx.in,
4 lib/chkconfig.ltx: remove the test for linuxdoc-sgml.sty.
6 * src/buffer.C (writeFile): Do not add a comment on top of .lyx
7 file saying who created them and when this heppened; this is
8 useless and annoys tools like cvs.
10 * lib/layouts/g-brief-{en,de}.layout,
11 lib/templates/g-brief-{en,de}.lyx: new versions of the textclass
12 from Thomas Hartkens <thomas@hartkens.de>.
14 * src/{insets,mathed}/Makefile.am: do not declare an empty
15 LDFLAGS, so that it can be set at configure time (useful on Irix
18 * lib/reLyX/configure.in: make sure that the prefix is set
21 1999-11-18 Andre' Poenitz <poenitz@mathematik.tu-chemnitz.de>
23 * src/commandtags.h: introduction of a new tag 'LFUN_SEQUENCE' to
24 be used by 'command-sequence' this allows to bind a key to a
25 sequence of LyX-commands
26 (Example: 'command-sequence math-insert alpha; math-insert beta;")
28 * src/LyXAction.C: add "command-sequence"
30 * src/LyXFunction.C: handling of "command-sequence"
32 * src/LyXFunction.[hC] changed LyXFunc::Dispatch(string const
33 &cmd, string const &arg) to LyXFunc::Dispatch(string const& s)
35 * src/lyxserver.C, src/minibuffer.C: Use this new interface
37 1999-11-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
39 * src/buffer.C (writeFile): Do not output a comment givinf user
40 and date at the beginning of a .lyx file. This is useless and
41 annoys cvs anyway; update version number to 1.1.
43 * src/Makefile.am (LYX_DIR): add this definition, so that a
44 default path is hardcoded in LyX.
46 * configure.in: Use LYX_GNU_GETTEXT.
48 * acinclude.m4 (LYX_GNU_GETTEXT): new macro, essentially a copy of
49 AM_GNU_GETTEXT with a bug fixed.
51 * src/lyx_cb.C (RunLinuxDoc): add a cast to please dec cxx.
53 * src/chset.C: add "using std::ifstream;" to please dec cxx.
55 * src/lyx_main.C (init), INSTALL.OS2: the environment variable
56 which is used to point to LyX data is now LYX_DIR_11x.
58 * lyx.man: convert to a unix text file; small updates.
60 1999-11-15 Lars Gullik Bjønnes <larsbj@lyx.org>
62 * src/support/LSubstring.[Ch]: made the second arg of most of the
63 constructors be a const reference.
65 * src/mathed/math_parser.C (LexInitCodes): small bug introduced by
68 * src/support/lyxstring.[Ch] (swap): added missing member function
69 and specialization of swap(str, str);
71 * src/menus.C (ShowBufferMenu): to use the new BufferStorage
73 * src/bufferlist.[Ch]: use the new BufferStorage class and remove all
76 * src/undo.[Ch]: made the undostack use std::list to store undo's in
77 put the member definitions in undo.C.
79 * src/lyxparagraph.h, src/paragraph.C + a lot of files: removed
80 NEW_TEXT and have now only code that was included when this was
83 * src/intl.C (LCombo): use static_cast
85 (DispatchCallback): ditto
87 * src/definitions.h: removed whole file
89 * src/commandtags.h: comment out LFUN_INSERT_INSET_LATEX
91 * src/chset.[Ch]: a lot rewritten, does not use lyxlex for cdef
92 parsing and stores in a std:map. a regex defines the file format.
93 removed unneeded members.
95 * src/bufferparams.h: added several enums from definitions.h here.
96 Removed unsused destructor. Changed some types to use proper enum
97 types. use block to have the temp_bullets and user_defined_bullets
98 and to make the whole class assignable.
100 * src/bufferparams.C (Copy): removed this functions, use a default
103 * src/buffer.h: made isLatex, isLinuxDoc, isDocBook, isSGML and
106 * src/buffer.C (readLyXformat2): commend out all that have with
107 oldpapersize to do. also comment out all that hve to do with
108 insetlatex and insetlatexdel.
109 (setOldPaperStuff): commented out
111 * src/Makefile.am (lyx_SOURCES): remove definitions.h, add undo.C
113 * src/LyXAction.C: remove use of inset-latex-insert
115 * src/mathed/math_panel.C (button_cb): use static_cast
117 * src/insets/Makefile.am (insets_o_SOURCES): removed
120 * src/support/lyxstring.C (helper): use the unsigned long
121 specifier, UL, instead of a static_cast.
123 * src/support/Makefile.am (libsupport_a_SOURCES): added block.h
125 * src/support/block.h: new file. to be used as a c-style array in
126 classes, so that the class can be assignable.
128 1999-11-15 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
130 * src/lyx_gui_misc.C (askForText): when fl_show_input() returns
131 NULL, make sure to return an empty string (it is not possible to
132 set a string to NULL).
134 1999-11-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
136 * src/support/LRegex.C: use regex_t instead of re_pattern_buffer.
138 * src/support/lyxstring.C (helper): fix bogus cast in assertion.
140 * src/{mathed,insets}/Makefile.am (CXXLINK): add $(LDFLAGS) to the
141 link line, so that Irix users (for example) can set it explicitely to
144 * src/Makefile.am (lyx_LDADD): use LYX_LIB as a variable, so that
145 it can be overidden at make time (static or dynamic link, for
148 * src/vc-backend.C, src/LaTeXFeatures.h,
149 src/support/LRegex.C, src/support/LRegex.h: add a few "using"
150 statements to bring templates to global namespace.
152 1999-11-10 Lars Gullik Bjønnes <larsbj@lyx.org>
154 * src/support/lyxstring.C (operator[] const): make it standard
157 * src/minibuffer.C (Init): changed to reflect that more
158 information is given from the lyxvc and need not be provided here.
160 * src/lyxvc.[Ch]: rewrote to use the vc-backend.
162 * src/Makefile.am (lyx_SOURCES): add vc-backend.[Ch]
164 * src/LyXView.C (UpdateTimerCB): use static_cast
165 (KeyPressMask_raw_callback): ditto
167 * src/BufferView.[Ch]: name change _owner -> owner_ and _buffer ->
168 buffer_, a lot of changes because of this. currentBuffer() ->
169 buffer(), setBuffer(...) -> buffer(...), getOwner() -> owner(),
170 also changes to other files because of this.
172 1999-11-09 Lars Gullik Bjønnes <larsbj@lyx.org>
174 * src/vc-backend.[Ch]: new files. The backends for vc handling,
175 have no support for RCS and partial support for CVS, will be
178 * src/insets/ several files: changes because of function name
179 changes in Bufferview and LyXView.
181 * src/mathed/math_symbols.C (math_insert_symbol): use static_cast
183 * src/support/LSubstring.[Ch]: new files. These implement a
184 Substring that can be very convenient to use. i.e. is this
186 string a = "Mary had a little sheep";
187 Substring(a, "sheep") = "lamb";
188 a is now "Mary has a little lamb".
190 * src/support/LRegex.[Ch]: a regex class that can be used to pick
191 out patterns and subpatterns of strings. It is used by LSubstring
192 and also by vc-backend.C
194 * src/support/lyxstring.C: went over all the assertions used and
195 tried to correct the wrong ones and flag which of them is required
196 by the standard. some bugs found because of this. Also removed a
197 couple of assertions.
199 * src/support/Makefile.am (libsupport_a_SOURCES): added
200 LSubstring.[Ch] and LRegex.[Ch]
202 * src/support/FileInfo.h: have struct stat buf as an object and
203 not a pointer to one, some changes because of this.
205 * src/LaTeXFeatures.C (getTClassPreamble): also use the
206 information in layout when addint he layouts preamble to the
209 * src/LaTeXFeatures.h: use a vector<bool> to store the layout
212 * configure.in (CPPFLAGS): use AC_CHECK_FUNCS to check for XOpenIM
213 because of bug in OS/2.
215 1999-11-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
217 * lib/layouts/lyxmacros.inc (lyxcode): set the font with
218 \verbatim@font instead of \ttfamily, so that it can be redefined.
220 * src/BackStack.h, src/DepTable.C, src/DepTable.h, src/LaTeX.C,
221 src/LaTeX.h, src/lastfiles.C, src/lastfiles.h, src/layout.C,
222 src/layout.h, src/text2.C: add 'using' directive to bring the
223 STL templates we need from the std:: namespace to the global one.
224 Needed by DEC cxx in strict ansi mode.
226 * src/support/LIstream.h,src/support/LOstream.h,
227 src/support/lyxstring.h,src/table.h,
228 src/lyxlookup.h: do not include <config.h> in header
229 files. This should be done in the .C files only.
231 * development/lyx.spec.in: WHATSNEW has been renamed to NEWS
235 1999-11-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
237 * config/lib_configure.m4,lib/configure,lib/lyxrc.example: update
238 from Kayvan to fix the tth invokation.
240 * development/lyx.spec.in: updates from Kayvan to reflect the
241 changes of file names.
243 1999-11-05 Lars Gullik Bjønnes <larsbj@lyx.org>
245 * src/text2.C (InsertStringB): use std::copy
246 (InsertStringA): use std::copy
248 * src/bufferlist.C: use a vector to store the buffers in. This is
249 an internal change and should not affect any other thing.
251 * src/BufferView.C (waitForX): use XSync instead of the lengthy
254 * src/text.C (Fill): fix potential bug, one off bug.
256 1999-11-04 Lars Gullik Bjønnes <larsbj@lyx.org>
258 * src/Makefile.am (lyx_main.o): add more files it depends on.
260 * src/lyx_cb.C (addNewlineAndDepth): parameters in wrong order.
262 * src/support/lyxstring.C: use size_t for the reference count,
263 size, reserved memory and xtra.
264 (internal_compare): new private member function. Now the compare
265 functions should work for std::strings that have embedded '\0'
267 (compare): all compare functions rewritten to use
270 1999-11-03 Lars Gullik Bjønnes <larsbj@lyx.org>
272 * src/support/lyxstring.C (compare): pass c_str()
273 (compare): pass c_str
274 (compare): pass c_str
276 1999-11-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
278 * src/support/DebugStream.C: <config.h> was not included correctly.
280 * lib/configure: forgot to re-generate it :( I'll make this file
283 1999-11-03 Lars Gullik Bjønnes <larsbj@lyx.org>
285 * acinclude.m4 (cross_compiling): add -fpermissive when gcc 2.95.x
288 * src/support/lyxstring.C: some changes from length() to rep->sz.
289 avoids a function call.
291 * src/support/filetools.C (SpaceLess): yet another version of the
292 algorithm...now per Jean-Marc's suggestions.
294 1999-11-02 Lars Gullik Bjønnes <larsbj@lyx.org>
296 * src/layout.C (less_textclass_desc): functor for use in sorting
298 (LyXTextClass::Read): sort the textclasses after reading.
300 * src/support/filetools.C (SpaceLess): new version of the
301 SpaceLess functions. What problems does this one give? Please
304 * images/banner_bw.xbm: made the arrays unsigned char *
306 1999-11-02 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
308 * src/support/lyxstring.C (find): remove bogus assertion in the
309 two versions of find where this has not been done yet.
311 * src/support/lyxlib.h: add missing int return type to
314 * src/menus.C (ShowFileMenu): disable exporting to html if no
315 html export command is present.
317 * config/lib_configure.m4: add a test for an HTML converter. The
318 programs checked for are, in this order: tth, latex2html and
321 * lib/configure: generated from config/lib_configure.m4.
323 * src/lyxfunc.C (Dispatch): update and improve the execution of an
324 html converter. The parameters are now passed through $$FName and
325 $$OutName, instead of standard input/output.
327 * src/lyxrc.{C,h}: rename \tth_command to \html_command.
329 * lib/lyxrc.example: update description of \html_command.
330 add "quotes" around \screen_font_xxx font setting examples to help
331 people who use fonts with spaces in their names.
333 1999-11-02 Lars Gullik Bjønnes <larsbj@lyx.org>
335 * Distribution files: updates for v1.1.2
337 * src/support/lyxstring.C (find): remove bogus assert and return
338 npos for the same condition.
340 1999-11-01 Lars Gullik Bjønnes <larsbj@lyx.org>
342 * added patch for OS/2 from SMiyata.
344 1999-10-29 Lars Gullik Bjønnes <larsbj@lyx.org>
346 * src/text2.C (CutSelection): make space_wrapped a bool
347 (CutSelection): dont declare int i until we have to.
348 (alphaCounter): return a char const *.
350 1999-10-28 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
352 * src/support/syscall.C (Systemcalls::kill):
353 src/support/filetools.C (PutEnv, PutEnvPath):
354 src/lyx_cb.C (addNewlineAndDepth):
355 src/FontInfo.C (FontInfo::resize): condition some #warning
356 directives with WITH_WARNINGS.
359 1999-10-28 Lars Gullik Bjønnes <larsbj@lyx.org>
361 * src/layout.[Ch] + several files: access to class variables
362 limited and made accessor functions instead a lot of code changed
363 becuase of this. Also instead of returning pointers often a const
364 reference is returned instead.
366 * src/form1.C (create_form_Figure): added a couple fo "no-c-format"
368 * src/Makefile.am (dist-hook): added used to remove the CVS from
369 cheaders upon creating a dist
370 (EXTRA_DIST): added cheaders
372 * src/support/lstrings.C (tostr(char)): fix it to handle param as
373 a character not as a small integer.
375 * src/support/lyxstring.C (find): removed Assert and added i >=
376 rep->sz to the first if.
378 1999-10-27 Lars Gullik Bjønnes <larsbj@lyx.org>
380 * src/layout.[Ch] src/BufferView.C src/LaTeXFeatures.C
381 src/LyXView.C src/buffer.C src/bufferparams.C
382 src/lyx_cb.C src/lyxfunc.C src/paragraph.C src/text.C
383 src/text2.C src/insets/insetinclude.C:
384 lyxlayout renamed to textclasslist.
386 * src/layout.C: some lyxerr changes.
388 * src/layout.[Ch] (LyXLayout::Read): changed second paramter to
389 LyXTextClass. rewrote LT_COPYSTYLE, rewrote LT_OBSOLETEDBY
390 (LyXLayoutList): removed all traces of this class.
391 (LyXTextClass::Read): rewrote LT_STYLE
392 (LyXTextClass::hasLayout): new function
393 (LyXTextClass::GetLayout): rewritten to return an iterator + has
394 both const and nonconst version.
395 (LyXTextClass::delete_layout): new function.
396 (LyXTextClassList::Style): bug fix. do the right thing if layout
398 (LyXTextClassList::NumberOfLayout): new acces to layoutlist.
399 (LyXTextClassList::NameOfLayout): ditto
400 (LyXTextClassList::Load): ditto
402 * src/buffer.C (makeLaTeXFile): new access to layoutlist
404 * src/LaTeXFeatures.C (getTClassPreamble): new access to layoutlist
406 * src/LyXAction.C (LookupFunc): added a workaround for sun
407 compiler, on the other hand...we don't know if the current code
408 compiles on sun at all...
410 * src/support/filetools.C (CleanupPath): subst fix
412 * src/insets/insetbib.C (delDatabase): subst fix, this looks
415 * src/support/filetools.C (PutEnvPath): subst fix, how come nobody
416 complained about this one?
418 * src/insets/insetinclude.C (Latex): subst fix
420 * src/insets/insetbib.C (getKeys): subst fix
422 * src/LyXSendto.C (SendtoApplyCB): subst fix
424 * src/lyx_main.C (init): subst fix
426 * src/layout.C (Read): subst fix
428 * src/lyx_sendfax_main.C (button_send): subst fix
430 * src/buffer.C (RoffAsciiTable): subst fix
432 * src/lyx_cb.C (MenuFax): subst fix
433 (PrintApplyCB): subst fix
435 1999-10-26 Juergen Vigna <jug@sad.it>
437 * src/table.C (TexEndOfCell) + (DocBookEndOfCell): removed some #if 0
439 (Read): Cleaned up this code so now we read only format vestion >= 5
441 1999-10-26 Lars Gullik Bjønnes <larsbj@lyx.org>
443 * src/support/filetools.C (PutEnvPath): subst fix for EMX, how
444 come nobody has complained about this one?
446 * src/insets/insetinclude.C (Latex): subst fix
448 * src/insets/insetbib.C (getKeys): subst fix
450 * src/lyx_main.C (init): subst fix
452 * src/layout.C (Read): subst fix
454 * src/buffer.C (RoffAsciiTable): subst fix
456 * src/lyx_cb.C (MenuFax): subst fix.
458 * src/layout.[hC] + some other files: rewrote to use
459 std::container to store textclasses and layouts in.
460 Simplified, removed a lot of code. Make all classes
461 assignable. Further simplifications and review of type
464 * src/menus.C (ShowFileMenu/ShowFileMenu2): Use the iterators from
465 lastfiles to create the lastfiles partr of the menu.
467 * src/lastfiles.[Ch]: rewritten to use deque to store the
468 lastfiles in. Uses fstream for reading and writing. Simplifies
471 * src/support/syscall.C: remove explicit cast.
473 * src/BufferView.C (CursorToggleCB): removed code snippets that
475 use explicat C++ style casts instead of C style casts. also use
476 u_vdata instea of passing pointers in longs.
478 * src/PaperLayout.C: removed code snippets that were commented out.
480 * src/lyx_gui_misc.C: removed code snippets that were commented out.
482 * src/lyx_main.C: removed code snippets that wer commented out.
484 * src/paragraph.C: removed code snippets that were commented out.
486 * src/lyxvc.C (logClose): use static_cast
488 (viewLog): remove explicit cast to void*
489 (showLog): removed old commented code
491 * src/menus.C: use static_cast instead of C style casts. use
492 u_vdata instead of u_ldata. remove explicit cast to (long) for
493 pointers. Removed old code that was commented out.
495 * src/insets/inset.C: removed old commented func
497 * src/insets/insetref.C (InsetRef): removed old code that had been
498 commented out for a long time.
500 (escape): removed C style cast
502 * src/insets/insetlatexaccent.C (Draw): removed old commented code
504 * src/insets/insetlatex.C (Draw): removed old commented code
505 (Read): rewritten to use string
507 * src/insets/insetlabel.C (escape): removed C style cast
509 * src/insets/insetindex.h: removed vdata and ldata from FD_index_form
511 * src/insets/insetindex.C: use static_cast and u_vdata, removed
514 * src/insets/insetinclude.h: removed a couple of stupid bools
516 * src/insets/insetinclude.C (include_cb): use static_cast and u_data.
517 (Clone): remove C style cast
518 (getKeys): changed list to lst because of std::list
520 * src/insets/inseterror.C (Draw): removed som old commented code.
522 * src/insets/insetcommand.C (Draw): removed some old commented code.
524 * src/insets/insetbib.C (bibitem_cb): removed code that has been
525 commented out forever.
526 (bibitem_cb): use static_cast instead of C style cast
527 use of vdata changed to u_vdata.
529 * src/insets/inseturl.C (C_InsetUrl_CloseUrlCB): forward the data
531 (CloseUrlCB): use static_cast instead of C style cast.
532 (CloseUrlCB): added a fl_free form...it seemed to be missing.
534 * src/insets/insetinfo.C (Edit): pass object in u_vdata instead
535 (C_InsetInfo_CloseInfoCB): forward the ob parameter
536 (CloseInfoCB): static_cast from ob->u_vdata instead.
537 (Edit): removed bogus arg from fl_set_object_shortcut, set to 1
540 * src/insets/inseterror.C (Edit): pass object in u_vdata instead
541 (C_InsetError_CloseErrorCB): forward the ob parameter
542 (CloseErrorCB): static_cast from ob->u_vdata instead.
544 * src/vspace.h: include LString.h since we use string in this class.
546 * src/vspace.C (lyx_advance): changed name from advance because of
547 nameclash with stl. And since we cannot use namespaces yet...I
548 used a lyx_ prefix instead. Expect this to change when we begin
551 * src/BufferView.[Ch] (BufferView::~BufferView): removed
553 * src/BackStack.h: rewrote to use std::stack. made BackStackItem
554 and removed now defunct constructor and deconstructor.
556 * src/BufferView.h: have backstack as a object not as a pointer.
557 removed initialization from constructor. added include for BackStack
559 * development/lyx.spec.in (%build): add CFLAGS also.
561 * src/screen.C (drawFrame): removed another warning.
563 1999-10-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
565 * renamed WHATSNEW to NEWS (usual GNU style), CHANGES to
566 OLD-CHANGES (not used anymore) and modified INSTALL, INSTALL.OS2,
567 README and ANNOUNCE a bit for the next release. More work is
570 * src/paragraph.C (SimpleTeXBlanks): spaces are automatically made
571 unbreakable if we are in freespacing mode (LyX-Code), but not in
574 1999-10-25 Lars Gullik Bjønnes <larsbj@lyx.org>
576 * src/BackStack.h: fixed initialization order in constructor
578 * Makefile.am (MAINTAINERCLEANFILES): removed po/POTFILES.in
580 * acinclude.m4 (VERSION): new rules for when a version is
581 development, added also a variable for prerelease.
582 (warnings): we set with_warnings=yes for prereleases
583 (lyx_opt): prereleases compile with same optimization as development
584 (CXXFLAGS): only use pedantic if we are a development version
586 * src/BufferView.C (restorePosition): don't do anything if the
589 * src/BackStack.h: added member empty, use this to test if there
590 is anything to pop...
592 1999-10-25 Juergen Vigna <jug@sad.it>
595 * forms/layout_forms.fd +
596 * forms/latexoptions.fd +
597 * lyx.fd: changed for various form resize issues
599 * src/mathed/math_panel.C +
600 * src/insets/inseterror.C +
601 * src/insets/insetinfo.C +
602 * src/insets/inseturl.C +
603 * src/insets/inseturl.h +
606 * src/PaperLayout.C +
607 * src/ParagraphExtra.C +
608 * src/TableLayout.C +
610 * src/layout_forms.C +
617 * src/menus.C: fixed various resize issues. So now forms can be
618 resized savely or not be resized at all.
620 * forms/form_url.fd +
621 * src/insets/form_url.[Ch]: added because it's cleaner and easier
624 * src/insets/Makefile.am: added files form_url.[Ch]
626 1999-10-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
628 * INSTALL: it is now possible to compile LyX with digital C++ 6.1
629 (and presumably 6.2).
631 * src/{BufferView,LyXView,combox,filedlg,intl,lyxserver,lyxvc,
632 menus,minibuffer,toolbar}.{C,h}: added C_xxx wrappers around
633 remaining static member callbacks.
635 * src/lyxfunc.C (Dispatch): Use _() instead of N_() fot minibuffer
638 * src/support/lyxstring.h: declare struct Srep as friend of
639 lyxstring, since DEC cxx complains otherwise.
641 1999-10-24 Lars Gullik Bjønnes <larsbj@lyx.org>
643 1999-10-24 Lars Gullik Bjønnes <larsbj@lyx.org>
645 * src/LaTeX.C (run): made run_bibtex also depend on files with
647 (runBibTeX): added scans for "\\bibstyle", now also ".bst" files
648 are put into the dependency file.
650 * src/spellchecker.C (create_ispell_pipe): removed old #warning,
651 the code has shown itself to work
652 (create_ispell_pipe): removed another warning, added a comment
655 * src/minibuffer.C (ExecutingCB): removed code that has been
656 commented out a long time
658 * src/lyxfunc.C (processKeyEvent): removed some very old commented
659 out code + a warning.
661 * src/support/lyxstring.h: comment out the three private
662 operators, when compiling with string ansi conforming compilers
665 * src/mathed/math_symbols.C (AddBitmap): change 6th arg to be
667 (pixmapFromBitmapData): change type of bdata to be unsigned char *
668 (pixmapFromBitmapData): add a reinterpret_cast in the call to
671 * src/mathed/math_panel.h: change 6th arg to AddBitmap to be
674 * src/mathed/math_panel.C (create_math_panel): remove explicit
677 * src/bmtable.h: change last paramter to fl_set_bmtable_data to be
680 * src/bmtable.C (struct BMTABLE_SPEC): make bdata unsigned char *
681 (draw_bitmaptable): add a reinterpret_cast to sp->bdata in the call
682 to XCreatePixmapFromBitmapData
683 (fl_set_bmtable_data): change the last argument to be unsigned
685 (fl_set_bmtable_file): change bdata to unsinged char *, change bw
686 and bh to be unsigned int, remove explicit casts in call to
689 * images/arrows.xbm: made the arrays unsigned char *
690 * images/varsz.xbm: ditto
691 * images/misc.xbm: ditto
692 * images/greek.xbm: ditto
693 * images/dots.xbm: ditto
694 * images/brel.xbm: ditto
695 * images/bop.xbm: ditto
697 * Makefile.am (MAINTAINERCLEANFILES): added po/POTFILES.in
699 * acinclude.m4 (LYX_GXX_STRENGHT_REDUCE): removed.
700 (LYX_PROG_CXX): added -pedantic to g++ compile options when
701 with-warnings, removed the __STRING_ANSI__ hack, seems to not be
703 (LYX_CXX_CHEADERS): added <clocale> to the test.
705 1999-10-23 Lars Gullik Bjønnes <larsbj@lyx.org>
707 * src/lyx_cb.C (addNewlineAndDepth): changed to use string::append.
709 * src/support/lyxstring.C (append): fixed something that must be a
710 bug, rep->assign was used instead of rep->append.
712 * src/support/Makefile.am (libsupport_a_SOURCES): added LIstream.h
715 * src/lyxfunc.C (processKeyEvent): removed faulty line that made
716 lyx insert double chars. Fix spotted by Kayvan.
718 1999-10-23 Asger Alstrup Nielsen <alstrup@alstrup.galaxy.dk>
720 * Fixed the tth support. I messed up with the Emacs patch apply feature
721 and omitted the changes in lyxrc.C.
723 1999-10-22 Juergen Vigna <jug@sad.it>
725 * src/insets/figinset.C (CallbackFig): Just changed the defines a bit.
727 * src/lyx_cb.C (MenuInsertRef) +
728 * src/lyx_gui.C (create_forms): Inserted fl_set_form_minsize so that
729 the form cannot be resized under it limits (fixes a segfault)
731 * src/lyx.C (create_form_form_ref) +
732 * forms/lyx.fd: Changed Gravity on name input field so that it is
735 1999-10-22 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
737 * configure.in: use LYX_CXX_STL_MODERN_STREAMS; check for headers
738 <ostream> and <istream>.
740 * acinclude.m4 (LYX_CXX_STL_MODERN_STREAMS): new test. Checks
741 whether <fstream> provides the latest standard features, or if we
742 have an oldstyle library (like in egcs).
743 (LYX_CXX_STL_STRING): fix the test.
745 * src/support/DebugStream.{C,h}: use L{I,O}stream.h and condition the
746 code on MODERN_STL_STREAM.
748 * src/support/lyxstring.h: use L{I,O}stream.h.
750 * src/support/L{I,O}stream.h: new files, designed to setup
751 correctly streams for our use
752 - includes the right header depending on STL capabilities
753 - puts std::ostream and std::endl (for LOStream.h) or
754 std::istream (LIStream.h) in toplevel namespace.
756 1999-10-22 Lars Gullik Bjønnes <larsbj@lyx.org>
758 * src/LaTeX.C (run): added a check in 0 sumchange so that if it
759 was a bib file that had been changed we ensure that bibtex is run.
760 (runBibTeX): enhanced to extract the names of the bib files and
761 getting their absolute path and enter them into the dep file.
762 (findtexfile): static func that is used to look for tex-files,
763 checks for absolute patchs and tries also with kpsewhich.
764 Alternative ways of finding the correct files are wanted. Will
766 (do_popen): function that runs a command using popen and returns
767 the whole output of that command in a string. Should be moved to
770 * src/DepTable.[Ch] (extchanged): new function that returns true if a
771 file with extension ext has changed.
773 * src/insets/figinset.C: added ifdef guards around the fl_free
774 code that jug commented out. Now it is commented out when
775 compiling with XForms == 0.89.
777 * src/support/lyxstring.C: moved the definition of lyxstring::Srep
778 to lyxstring.C, and only keep a forward declaration in
779 lyxstring.h. Simplifies the header file a bit and should help a
780 bit on compile time too. Also changes to Srep will not mandate a
781 recompile of code just using string.
782 (~lyxstring): definition moved here since it uses srep.
783 (size): definition moved here since it uses srep.
785 * src/support/lyxstring.h: removed a couple of "inline" that should
788 1999-10-21 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
790 * src/insets/inseturl.C (C_InsetUrl_CloseUrlCB): forgot to pass
793 1999-10-21 Juergen Vigna <jug@sad.it>
795 * src/table.C (SetPWidth): Just a small fix so the alignment is not
796 set to left if I just remove the width entry (or it is empty).
798 * src/text2.C (SetCursorIntern): Fixed a bug calculating to use wrong
799 paragraph when having dummy paragraphs.
801 1999-10-20 Juergen Vigna <jug@sad.it>
803 * src/insets/figinset.C: just commented some fl_free_form calls
804 and added warnings so that this calls should be activated later
805 again. This avoids for now a segfault, but we have a memory leak!
807 * src/lyxfunc.C (processKeyEvent) (Dispatch): changed
808 'const char * argument' to 'string argument', this should
809 fix some Asserts() in lyxstring.C.
811 * src/lyxfunc.h: Removed the function argAsString(const char *)
812 as it is not used anymore.
814 1999-10-20 Lars Gullik Bjønnes <larsbj@lyx.org>
816 * src/support/lyxstring.C (getline): reads now _all_ chars. uses
819 * src/Literate.h: some funcs moved from public to private to make
820 interface clearer. Unneeded args removed.
822 * src/Literate.C (scanLiterateLogFile): rewritten to use iostream
824 (scanBuildLogFile): ditto
826 * src/LaTeX.C (scanLogFile): merged LaTeX Error handling into
827 normal TeX Error. Still room for improvement.
829 * src/LaTeX.[Ch]: removed scanError. Wrong place and not needed.
831 * src/buffer.C (insertErrors): changes to make the error
832 desctription show properly.
834 * src/LaTeX.C (deplog): removed the test for file in lyx doc dir.
837 * src/support/lyxstring.C (helper): changed to use
838 sizeof(object->rep->ref).
839 (operator>>): changed to use a pointer instead.
841 * src/support/lyxstring.h: changed const reference & to value_type
842 const & lets see if that helps.
844 1999-10-19 Lars Gullik Bjønnes <larsbj@lyx.org>
846 * Makefile.am (rpmdist): fixed to have non static package and
849 * src/support/lyxstring.C: removed the compilation guards
851 * src/vspace.C (nextToken): use i + 1 instead of ++i. Maks things
854 * src/support/Makefile.am (LYXSTRING): bruker USE_LYXSTRING for
855 conditional compile of lyxstring.Ch
857 * acinclude.m4 (LYX_CXX_STL_STRING): new and improved, still a
858 stupid check, but it is a lot better than the bastring hack.
859 (LYX_CXX_STL_STRING): bruker nå AM_CONDITIONAL(USE_LYXSTRING
861 * several files: changed string::erase into string::clear. Not
864 * src/chset.C (encodeString): use a char temporary instead
866 * src/table.C (TexEndOfCell): added tostr around
867 column_of_cell(fcell+i)+1 and around right_column_of_cell(fcell+i)+1
868 (TexEndOfCell): ditto
869 (TexEndOfCell): ditto
870 (TexEndOfCell): ditto
871 (DocBookEndOfCell): ditto
872 (DocBookEndOfCell): ditto
873 (DocBookEndOfCell): ditto
874 (DocBookEndOfCell): ditto
876 * src/paragraph.C (TeXEnvironment): added tostr around foot_count -1
878 * src/lyxfr1.C (SearchReplaceAllCB): added tostr around replace_count
880 * src/lyx_cb.C (MenuRunLaTeX): added tostr around ret
881 (MenuBuildProg): added tostr around ret
882 (MenuRunChktex): added tostr around ret
883 (DocumentApplyCB): added tostr around ret
885 * src/chset.C (encodeString): added tostr around t->ic
887 * src/buffer.C (makeLaTeXFile): added tostr around secnumdepth
888 (makeLaTeXFile): added tostr around tocdepth
889 (makeLaTeXFile): added tostr around ftcound - 1
891 * src/insets/insetbib.C (setCounter): added tostr around counter.
893 * src/support/lyxstring.h: added an operator+=(int) to catch more
896 * src/support/lyxstring.C (lyxstring): We DON'T allow NULL pointers.
897 (lyxstring): We DON'T allow NULL pointers.
899 1999-10-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
901 * src/mathed/math_macro.C (MathMacroArgument::Write,
902 MathMacroTemplate::WriteDef): add tostr() around macro arg numbers
903 when writing them out.
905 * src/LString.C: remove, since it is not used anymore.
907 * src/support/lyxstring.C: condition the content to
908 USE_INCLUDED_STRING macro.
910 * src/mathed/math_symbols.C, src/support/lstrings.C,
911 src/support/lyxstring.C: add `using' directive to specify what
912 we need in <algorithm>. I do not think that we need to
913 conditionalize this, but any thought is appreciated.
915 * many files: change all callback functions to "C" linkage
916 functions to please strict C++ compilers like DEC cxx 6.1 in mode
917 strict_ansi. Those who were static are now global.
918 The case of callbacks which are static class members is
919 trickier, since we have to make C wrappers around them (see
920 InsetError, InsetInfo and InsetUrl). The same holds for friends. I
921 did not finish this yet, since it defeats the purpose of
922 encapsulation, and I am not sure what the best route is.
924 1999-10-19 Juergen Vigna <jug@sad.it>
926 * src/support/lyxstring.C (lyxstring): we permit to have a null
927 pointer as assignment value and just don't assign it.
929 * src/vspace.C (nextToken): corrected this function substituting
930 find_first(_not)_of with find_last_of.
932 * src/TableLayout.C (UpdateLayoutTable) (TableOptionsCB)
933 (TableOptCloseCB) (TableSpeCloseCB):
934 inserted fl_set_focus call for problem with fl_hide_form() in
937 1999-10-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
939 * src/lyx_cb.C (LayoutsCB): fix bug where int was added to a
942 1999-10-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
944 * src/lyxrc.C (Read): RC_PRINTEXSTRAOPTIONS now uses
945 LyXLex::next() and not eatline() to get its argument.
947 1999-10-17 Lars Gullik Bjønnes <larsbj@lyx.org>
949 * src/DepTable.[Ch]: rewritten to store the dependencies in a map
950 instead, use fstreams for io of the depfile, removed unneeded
951 functions and variables.
953 * src/LaTeX.[Ch] (class TeXErrors): rewrote to store the errors in a
954 vector instead, removed all functions and variables that is not in
957 1999-10-16 Lars Gullik Bjønnes <larsbj@lyx.org>
959 * src/buffer.C (insertErrors): use new interface to TeXError
961 * Makefile.am (rpmdist): added a rpmdist target
963 * lib/reLyX/Makefile.am: added RelyxFigure.pm and Verbatim.pm as
964 per Kayvan's instructions.
966 1999-10-15 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
968 * src/Makefile.am: add a definition for localedir, so that locales
969 are found after installation (Kayvan)
971 1999-10-14 Lars Gullik Bjønnes <larsbj@lyx.org>
973 * development/.cvsignore: new file.
975 1999-10-14 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
977 * acinclude.m4 (LYX_CXX_CHEADERS): New macro. Checks whether the
978 C++ compiler provides wrappers for C headers and use our alternate
981 * configure.in: use LYX_CXX_CHEADERS.
983 * src/cheader/: new directory, populated with cname headers from
984 libstdc++-2.8.1. They are a bit old, but probably good enough for
985 what we want (support compilers who lack them).
987 * src/insets/Makefile.am, src/mathed/Makefile.am: remove src/support
988 from includes. It turns out is was stupid.
990 1999-10-14 Lars Gullik Bjønnes <larsbj@lyx.org>
992 * lib/Makefile.am (install-data-local): forgot a ';'
993 (install-data-local): forgot a '\'
994 (libinstalldirs): needed after all. reintroduced.
996 1999-10-13 Lars Gullik Bjønnes <larsbj@lyx.org>
998 * configure.in (AC_OUTPUT): added lyx.spec
1000 * development/lyx.spec: removed file
1002 * development/lyx.spec.in: new file
1004 * po/*.po: merged with lyx.pot becuase of make distcheck
1006 * lib/Makefile.am (dist-hook): added dist-hook so that
1007 documentation files will be included when doing a make
1008 dist/distdir/distcheck. Requires cvs export -r HEAD lyxdoc to run.
1009 (pkgdata_SCRIPTS): added configure.cmd for now, we can use som
1011 more: tried to make install do the right thing, exclude CVS dirs
1014 * src/LaTeXLog.C (ShowLatexLog): reordered som statements so that
1015 Path would fit in more nicely.
1017 * all files that used to use pathstack: uses now Path instead.
1018 This change was a lot easier than expected.
1020 * src/support/path.h: new file
1022 * src/support/Makefile.am (libsupport_a_SOURCES): added path.h
1024 * src/Makefile.am (lyx_SOURCES): removed pathstack.[Ch]
1026 * src/support/lyxstring.C (getline): Default arg was given for
1029 * Configure.cmd: removed file
1031 1999-10-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
1033 * src/support/DebugStream.[Ch]: remove the explicit std:: before
1034 streams classes and types, add the proper 'using' statements when
1035 MODERN_STL is defined.
1037 * src/debug.h: move the << operator definition after the inclusion
1040 * src/support/filetools.C: include "LAssert.h", which is needed
1043 * src/insets/Makefile.am, src/mathed/Makefile.am: add src/support
1046 * src/lyxfont.h, src/commandtags.h, src/mathed/math_defs.h:
1047 include "debug.h" to define a proper ostream.
1049 1999-10-12 Asger Alstrup Nielsen <alstrup@alstrup.galaxy.dk>
1051 * src/sys*: Cleaned up the Systemcall stuff a bit. Added "kill(int)"
1052 method to the SystemCall class which can kill a process, but it's
1053 not fully implemented yet.
1055 * src/*.C: Changed Systemcalls::Startscript() to startscript()
1057 * src/support/FileInfo.h: Better documentation
1059 * src/lyxfunc.C: Added support for buffer-export html
1061 * src/menus.C: Added Export->As HTML...
1063 * lib/bind/*.bind: Added short-cut for buffer-export html
1065 * src/lyxrc.*: Added support for new \tth_command
1067 * lib/lyxrc.example: Added stuff for new \tth_command
1069 1999-10-12 Lars Gullik Bjønnes <larsbj@lyx.org>
1071 * lib/Makefile.am (IMAGES): removed images/README
1072 (pkgdata_SCRIPTS): use this instead of bin_SCRIPTS to that it
1073 installes in correct place. Check permisions is installed
1076 * src/LaTeX.C: some no-op changes moved declaration of some
1079 * src/LaTeX.h (LATEX_H): changed include guard name
1081 1999-10-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
1083 * lib/reLyX/Makefile.am: install noweb2lyx.
1085 * lib/Makefile.am: install configure.
1087 * lib/reLyX/configure.in: declare a config aux dir; set package
1088 name to lyx (not sure what the best solution is); generate noweb2lyx.
1090 * lib/layouts/egs.layout: fix the bibliography layout.
1092 1999-10-08 Jürgen Vigna <jug@sad.it>
1094 * src/support/filetools.C (FileOpenSearch): Fixed a bug where
1095 when in the PATH was something like /usr/bin;;/bin (note: the ;;)
1096 it returned without continuing to search the path.
1098 1999-10-07 Lars Gullik Bjønnes <larsbj@lyx.org>
1100 * src/insets/insetquotes.C (Draw): Simplified a gread deal. This
1101 also fixes a bug. It is not allowed to do tricks with std::strings
1102 like: string a("hei"); &a[e]; this will not give what you
1103 think... Any reason for the complexity in this func?
1105 1999-10-06 Asger Alstrup Nielsen <alstrup@diku.dk>
1107 * Updated README and INSTALL a bit, mostly to check that my
1108 CVS rights are correctly set up.
1110 1999-10-06 Lars Gullik Bjønnes <larsbj@lyx.org>
1112 * src/support/lyxstring.C (helper): removed bogus Assert. strlen
1113 does not allow '\0' chars but lyxstring and std::string does.
1115 1999-10-05 Lars Gullik Bjønnes <larsbj@lyx.org>
1117 * autogen.sh (AUTOCONF): let the autogen script create the
1118 POTFILES.in file too. POTFILES.in should perhaps now not be
1119 included in the cvs module.
1121 * some more files changed to use C++ includes instead of C ones.
1123 * src/filedlg.C (Reread): fixed a bug wrt Time. It was appended
1125 (Reread): added tostr to nlink. buggy output otherwise.
1126 (Reread): added a string() around szMode when assigning to Buffer,
1127 without this I got a log of garbled info strings.
1129 * acconfig.h: commented out the PTR_AS_INT macros. They should not
1132 * I have added several ostream & operator<<(ostream &, some_type)
1133 functions. This has been done to avoid casting and warnings when
1134 outputting enums to lyxerr. This as thus eliminated a lot of
1135 explicit casts and has made the code clearer. Among the enums
1136 affected: kb_action, InsetLatexAccent::ACCENT_TYPE, a couple of
1137 mathed enums, some font enum the Debug::type enum.
1139 * src/support/lyxstring.h (clear): missing method. equivalent of
1142 * all files that contained "stderr": rewrote constructs that used
1143 stderr to use lyxerr instead. (except bmtable)
1145 * src/support/DebugStream.h (level): and the passed t with
1146 Debug::ANY to avoid spurious bits set.
1148 * src/debug.h (Debug::type value): made it accept strings of the
1151 * configure.in (Check for programs): Added a check for kpsewhich,
1152 the latex generation will use this later to better the dicovery of
1155 * src/BufferView.C (create_view): we don't need to cast this to
1156 (void*) that is done automatically.
1157 (WorkAreaButtonPress): removed some dead code.
1159 1999-10-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
1161 * src/minibuffer.C (Init): make sure that the "Welcome to LyX!"
1162 is not overwritten when translated (David Sua'rez de Lis).
1164 * lib/CREDITS: Added David Sua'rez de Lis
1166 * lib/reLyX/configure.in: setup LYX_DIR correctly in reLyX.
1168 * src/bufferparams.C (BufferParams): default input encoding is now
1171 * acinclude.m4 (cross_compiling): comment out macro
1172 LYX_GXX_STRENGTH_REDUCE.
1174 * acconfig.h: make sure that const is not defined (to empty) when
1175 we are compiling C++. Remove commented out code using SIZEOF_xx
1178 * configure.in : move the test for const and inline as late as
1179 possible so that these C tests do not interefere with C++ ones.
1180 Remove the call to LYX_GXX_STRENGTH_REDUCE, since its usefulness
1181 has not been proven.
1183 1999-10-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
1185 * src/table.C (getDocBookAlign): remove bad default value for
1188 * src/menus.C (ShowFileMenu): add a missing tostr() for lastfiles
1190 (ShowFileMenu2): ditto.
1192 * lib/reLyX/.cvsignore: add configure and aclocal.m4 to the list
1195 1999-10-04 Lars Gullik Bjønnes <larsbj@lyx.org>
1197 * Most files: finished the change from the old error code to use
1198 DebugStream for all lyxerr debugging. Only minor changes remain
1199 (e.g. the setting of debug levels using strings instead of number)
1201 1999-10-02 Lars Gullik Bjønnes <larsbj@lyx.org>
1203 * src/layout.C (Add): Changed to use compare_no_case instead of
1206 * src/FontInfo.C: changed loop variable type too string::size_type.
1208 1999-10-01 Lars Gullik Bjønnes <larsbj@lyx.org>
1210 * src/support/Makefile.am: added -I${srcdir}/../ to INCLUDES and
1211 set ETAGS_ARGS to --c++
1213 1999-09-30 Lars Gullik Bjønnes <larsbj@lyx.org>
1215 * src/table.C (DocBookEndOfCell): commented out two unused variables
1217 * src/paragraph.C: commented out four unused variables.
1219 * src/lyx_cb.C (TocUpdateCB): moved variable i and added a new i
1220 insed a if clause with type string::size_type.
1222 * src/lyxfr1.C (IsSearchStringInText): changed iSrch from int to
1225 * src/lyxfunc.C (Dispatch): use string::size_type as loop variable.
1227 * src/lyx_cb.C (ReplaceWord): use string::size_type as loop
1228 variable, also changed loop to go from 0 to lenght + 1, instead of
1229 -1 to length. This should be correct.
1231 * src/LaTeX.C (scanError): use string::size_type as loop variable
1234 * src/BufferView.C (WorkAreaButtonPress): moved #if 0 up two lines
1235 (l.896) since y_tmp and row was not used anyway.
1237 * src/insets/insetref.C (escape): use string::size_type as loop
1240 * src/insets/insetquotes.C (Width): use string::size_type as loop
1242 (Draw): use string::size_type as loop variable type.
1244 * src/insets/insetlatexaccent.C (checkContents): use
1245 string::size_type as loop variable type.
1247 * src/insets/insetlabel.C (escape): use string::size_type as loop
1250 * src/insets/insetinfo.C: added an extern for current_view.
1252 * src/insets/insetcommand.C (scanCommand): use string::size_type
1253 as loop variable type.
1255 * most files: removed the RCS tags. With them we had to recompile
1256 a lot of files after a simple cvs commit. Also we have never used
1257 them for anything meaningful.
1259 * most files: tags-query-replace NULL 0. As adviced several plases
1260 we now use "0" instead of "NULL" in our code.
1262 * src/support/filetools.C (SpaceLess): use string::size_type as
1265 1999-09-29 Lars Gullik Bjønnes <larsbj@lyx.org>
1267 * src/paragraph.C: fixed up some more string stuff.
1269 1999-09-28 Lars Gullik Bjønnes <larsbj@lyx.org>
1271 * src/support/filetools.h: make modestr a std::string.
1273 * src/filetools.C (GetEnv): made ch really const.
1275 * src/lyxlib.h: removed the Maximum and Minimum inline functions,
1276 made code that used these use max/min from <algorithm> instead.
1278 * changed several c library include files to their equivalent c++
1279 library include files. All is not changed yet.
1281 * created a support subdir in src, put lyxstring and lstrings
1282 there + the extra files atexit, fileblock, strerror. Created
1283 Makefile.am. edited configure.in and src/Makefile.am to use this
1284 new subdir. More files moved to support.
1286 * imported som of the functions from repository lyx, filetools
1288 * ran tags-query-replace on LString -> string, corrected the bogus
1289 cases. Tried to make use of lstrings.[hC], debugged a lot. There
1290 is still some errors in there. This is errors where too much or
1291 too litle get deleted from strings (string::erase, string::substr,
1292 string::replace), there can also be some off by one errors, or
1293 just plain wrong use of functions from lstrings. Viewing of quotes
1296 * LyX is now running fairly well with string, but there are
1297 certainly some bugs yet (see above) also string is quite different
1298 from LString among others in that it does not allow null pointers
1299 passed in and will abort if it gets any.
1301 * Added the revtex4 files I forgot when setting up the repository.
1303 1999-09-27 Lars Gullik Bjønnes <larsbj@lyx.org>
1305 * All over: Tried to clean everything up so that only the files
1306 that we really need are included in the cvs repository.
1307 * Switched to use automake.
1308 * Generaton of reLyX is not perfect, LYX_DIR does not get substituted.
1309 * Install has not been checked.
1311 1999-09-22 Lars Gullik Bjønnes <larsbj@lyx.org>
1313 * po/pt.po: Three errors:
1314 l.533 and l.538 format specification error
1315 l. 402 duplicate entry, I just deleted it.