Richard Heck <[EMAIL PROTECTED]> writes: > Attached is the latest patch addressing this bug. I'm seeking agreement > to commit it to trunk, for testing, prior to committing to branch, > hopefully for 1.5.2. This has been discussed with Jurgen already. JMarc, > or someone else: Does this seem OK?
You did not move anything to src/ did you? I really think stuff like the following is ugly: > +static const docstring TheBibliographyRef(from_ascii("@LyXInfo")); > +static const docstring TheDataString(from_ascii("@BibTeXData")); > +static const docstring TheEntryType(from_ascii("@BibTeXEntryType")); It should be in .h file: > +extern const docstring TheBibliographyRef; and in cpp file: > +const docstring TheBibliographyRef(from_ascii("@LyXInfo")); A static definition in header file is not acceptable. However, it sounds much easier to me to move Buffer::fillWithBibKeys to frontend_helpers.cpp with the rest. This has no reason to be a buffer method. Other than that, I'd propose the following: - move the bibio.cpp (the biblio namespace)stuff to src/ where it belongs. - define a virtual fillWithBibKeys method in Inset to avoid the ridiculous testing against inset codes; if you add a cursor parameter to the method, this could also apply to InsetBibitem - I do not understand the need for doc_it in the bibitem case. Why do a forwardPos? Anyway, I understand that this later list may be not be on the table right now. JMarc