]>
git.lyx.org Git - lyx.git/log
Jean-Marc Lasgouttes [Mon, 5 Sep 2016 09:29:44 +0000 (11:29 +0200)]
Set vertical lines in math arrays correctly on Y axis
This is a fixup to commit
39329935 . The two fixes are
* add forgotten offset `y' when drawing the line
* in order to have a continuous vertical line, draw from the offset of
the previous row.
Fixes bug #10363.
(cherry-picked from
a27ff136 )
Georg Baum [Thu, 8 Sep 2016 18:54:13 +0000 (20:54 +0200)]
Fix filter filter regex
Now the external material file dialog shows the file types defined in the
template again. Before this fix it did only show "All files (*)".
I don't know what the old syntax was supposed to do or whether it ever worked
with boost::regex, but with std::regex the new one is correct.
Georg Baum [Thu, 8 Sep 2016 18:53:37 +0000 (20:53 +0200)]
Add xlsx format
We do already have docx, but xlsx was missing. This is a separate format
because of the MIME type. nd because some users might need converters which
can only handle one format. Now the spreadsheet template does not hide the
fact anymore that it can deal with xlsx files as well.
Juergen Spitzmueller [Thu, 8 Sep 2016 08:31:37 +0000 (10:31 +0200)]
Update docs wrt Separator
Uwe Stöhr [Wed, 7 Sep 2016 22:49:56 +0000 (00:49 +0200)]
French UserGuide.lyx: remove unnecessary language change
Juergen Spitzmueller [Wed, 7 Sep 2016 07:51:47 +0000 (09:51 +0200)]
Remove duplicate context menu item
Fixes: #10368
Juergen Spitzmueller [Sun, 4 Sep 2016 15:43:51 +0000 (17:43 +0200)]
Amend
7d52d37662f69
\@ifundefined is an If-Then-ELSE construct.
Juergen Spitzmueller [Sat, 9 Jul 2016 14:45:27 +0000 (16:45 +0200)]
Fix for recent luatex versions.
Uwe Stöhr [Sat, 3 Sep 2016 20:17:52 +0000 (22:17 +0200)]
French doc files: re-add missing \origin tag
otherwise LyX cannot be compiled here
Juergen Spitzmueller [Sat, 3 Sep 2016 15:01:29 +0000 (17:01 +0200)]
Remove English traces in IPA inset that make XeTeX fail.
Enrico Forestieri [Mon, 29 Aug 2016 20:35:09 +0000 (22:35 +0200)]
If available, use qtchooser to select correct Qt tools
When the Qt directory is specified by --with-qt-dir, the tools
are only searched for in the corresponding bin subdir and their
full path is retained, so that it is not necessary modifying the
PATH and PKG_CONFIG_PATH environment variables to select a custom
Qt version. Otherwise, if qtchooser is detected early in the PATH,
the generic names are attempted with proper arguments to select the
desired Qt version (e.g., "moc -qt=qt5" if --enable-qt5 is specified).
Failing all of the above, the generic names with and without proper
suffixes (either -qt4 or -qt5) are checked in the PATH.
Eventually, a check is performed and a warning is issued if the
selected tools do not match the chosen Qt libraries.
Jean-Marc Lasgouttes [Mon, 29 Aug 2016 10:03:33 +0000 (12:03 +0200)]
Amend
3e432ec6314
It failed in the case where a selection already existed (the anchor would be wrongly reset).
(cherry picked from commit
68d825fed8f34aa98053e6264cf0668d08534549 )
Jean-Marc Lasgouttes [Fri, 19 Aug 2016 12:01:00 +0000 (14:01 +0200)]
Simplify menus when there is only one caption type
This removes the submenu indirection in Insert and the type changer in
contextual menu. Interestingly, the code was there, but it did not
work at all.
(cherry picked from commit
e7a33cacf171ee41609d6fe31e19eff6df1691bf
and made compatible with C++98)
Jean-Marc Lasgouttes [Wed, 24 Aug 2016 13:29:17 +0000 (15:29 +0200)]
Do not set layout for no-op paragraph break
When breaking paragraph in an empty top-level paragraph, nothing
happens on screen but yet there is an undo step because the layout is
reset to what it already was.
Avoid this case.
Fixes bug #10089.
(cherry picked from commit
2ad52918da1d0f375bf2831df4c51f6afa7ea448 )
Guillaume Munch [Fri, 15 Jul 2016 16:45:47 +0000 (17:45 +0100)]
LaTeX highlighter: make at a letter in the user preamble
Syntax highlighting now provides the appropriate cue that the user preamble is
inside \makeatletter…\makeatother.
(cherry picked from commit
10f6eb2e7eeffc757b7f54059524441e90008240 )
Guillaume Munch [Sun, 28 Aug 2016 00:51:16 +0000 (01:51 +0100)]
status.22x.
Guillaume Munch [Tue, 22 Mar 2016 21:57:17 +0000 (21:57 +0000)]
LyXToolBox: a QToolBox with minimum size management
The purpose of this custom widget is to allow the use of a QToolBox in a limited
area. The stock QToolBox does not provide a minimum size hint that depends on
the size of the pages; it assumes that there is enough room. This subclass sets
the minimal size of the QToolbox. Without this, the size of the QToolbox is only
determined by values in the ui file and therefore causes portability and
localisation issues. Note that the computation of the minimum size hint depends
on the minimum size hints of the page widgets. Therefore page widgets must have
a layout with layoutSizeContraint = SetMinimumSize or similar.
(cherry picked from commits
576cb5df77604b50175b2410ac006c5c5c110e2b
7e9d0a938bb02510304822f6bce4df3bcfe4bfc9
efbc297b955da58cef7bf2d63dfbc8b2942c671e )
Guillaume Munch [Fri, 29 Jul 2016 20:18:43 +0000 (21:18 +0100)]
Basic implementation of QSignalBlocker for qt4
(cherry picked from commit
bc8eb059db9f25b0cb44af0a26fba13170971f40 )
Guillaume Munch [Fri, 29 Jul 2016 20:27:13 +0000 (21:27 +0100)]
Fix "scroll here" feature of scrollbar (#10311)
Prevent setRange() from causing a recursive call to scrollTo(). Reduces three
calls of scrollTo() to one call for all scrolling functions of the scroll bar
(e.g. clicking on the arrow, dragging, or clicking somewhere on the scrollbar).
(cherry picked from commit
4d7b912ca1890b5b0b3ed29568b7091a7e7baef0 )
Kornel Benko [Fri, 26 Aug 2016 19:13:20 +0000 (21:13 +0200)]
Update sk.po
Juergen Spitzmueller [Fri, 26 Aug 2016 17:18:19 +0000 (19:18 +0200)]
de.po: fix meta data
Juergen Spitzmueller [Fri, 26 Aug 2016 17:13:50 +0000 (19:13 +0200)]
de.po: update
Juergen Spitzmueller [Fri, 26 Aug 2016 09:35:12 +0000 (11:35 +0200)]
Implement proper dialog titles in InsetParamsDialogs
Fixes: #10329
Juergen Spitzmueller [Fri, 26 Aug 2016 08:45:15 +0000 (10:45 +0200)]
Fix \@ifundefined check for covexample(s)
Fixes: #10340
Kornel Benko [Fri, 26 Aug 2016 11:00:10 +0000 (13:00 +0200)]
Update sk.po
Jean-Marc Lasgouttes [Tue, 23 Aug 2016 15:43:38 +0000 (17:43 +0200)]
Move correctly the end of proof marker when row is large
This was a regression from 2.1.x in LtR mode, and it never worked correctly in RtL mode.
Fixes bug #10344.
(cherry picked from commit
07c7dae367aea2ebc6486d1cc67b11c409f2d8a0 )
Jean-Marc Lasgouttes [Tue, 23 Aug 2016 10:22:35 +0000 (12:22 +0200)]
Reset anchor before selecting with S-button1
(cherry picked from commit
b583fb26e89ccdc242e5c11d5e9d8b0606bee957 )
Jean-Marc Lasgouttes [Fri, 19 Aug 2016 12:53:31 +0000 (14:53 +0200)]
Let M-x give focus to minibuffer when it is already open
(cherry picked from commit
65b0e84b5428897e36ff05fdf701bbba4acee8e8 )
Jean-Marc Lasgouttes [Thu, 21 Jul 2016 18:16:27 +0000 (20:16 +0200)]
Remove horizontal spacing around previews
This concerns the preview version of InsetPreview and InsetIPA.
Fixes bug #10304.
(cherry picked from commit
4ddad2f6cdefcfdd873ae3d4cea8b272495f9aba )
Scott Kostyshak [Wed, 17 Aug 2016 02:09:57 +0000 (22:09 -0400)]
Warn in GUI when mixing Title and InTitle layouts
Since we process layouts sequentially, we export LaTeX code for the
title once we arrive to a layout that has InTitle false. If the
document then later has a layout with InTitle true, we do not
(currently) go back to add it to the title and just output it
in-place. We previously warned with LYXERR0, but since this can
cause missing or unexpected output we now warn in the GUI.
For more information, see the following lyx-devel thread:
https://www.mail-archive.com/search?l=mid&q=
a65ae226 -d3bd-8fc5-a93b-
7bb23f1cda82 %40lyx.org
(cherry picked from commit
0b1cf1330d850b21313f5e68a83bb5053e52e6ec )
Scott Kostyshak [Tue, 9 Aug 2016 03:41:59 +0000 (23:41 -0400)]
Improve a layout LYXERR0 message
The name of the layout is now included in an error message about
layouts. This will help with finding the root issue of several
documents we have.
(cherry picked from commit
c949268da7a56368cf848199f37659c218a57808 )
Enrico Forestieri [Wed, 17 Aug 2016 20:58:13 +0000 (22:58 +0200)]
Fix exit code from runCommand on Windows
On Windows, runCommand has never returned the exit code of the
spawned process but the result of correctly closing the input handle.
Fixes #10327
(cherry picked from commit
fb46b3a1ee642b66b9712c6f376f543c47a2695e )
Richard Heck [Sat, 6 Aug 2016 01:39:58 +0000 (21:39 -0400)]
Remove debugging code.
(cherry picked from commit
e57e008e88cb4e0339484e9da4470a60651e4dcc )
jpc [Wed, 27 Jul 2016 17:12:06 +0000 (18:12 +0100)]
Update French UI localization
jpc [Wed, 27 Jul 2016 17:09:40 +0000 (18:09 +0100)]
Update French Customization, Math, Tutorial and UserGuide manuals
Juergen Spitzmueller [Thu, 4 Aug 2016 08:27:10 +0000 (10:27 +0200)]
Correct default font of beamer article layouts
Fixes: #9977
Richard Heck [Fri, 5 Aug 2016 02:43:17 +0000 (22:43 -0400)]
Fix XHTML export of German Additional Features manual.
There was an oddity in the manual that exposed a problem with the
test for the "special case" of an inset all by itself in a pargraph.
If a font change is applied to that inset, we still need to open the
paragraph.
(cherry picked from commit
3be23d18b64d1409d14e0c1c95f4192e9a23e543 )
Richard Heck [Fri, 5 Aug 2016 01:57:13 +0000 (21:57 -0400)]
We don't need to crash here, but can try to continue in release
mode.
(cherry picked from commit
0a603c5d0e370c8b9c9e0f5dfa024b6e500b2dd4 )
Richard Heck [Fri, 5 Aug 2016 01:40:37 +0000 (21:40 -0400)]
Remove stray "typewriter" font.
(cherry picked from commit
fab09075a65d8432a3437b2c8c9c74f67c2a529e )
Richard Heck [Fri, 5 Aug 2016 01:09:32 +0000 (21:09 -0400)]
Special characters should be output to the TOC.
(cherry picked from commit
f15c4159aa9fa1c78b7b642e58edbff333292d5a )
Richard Heck [Thu, 4 Aug 2016 21:47:57 +0000 (17:47 -0400)]
Status for last commit.
Richard Heck [Thu, 4 Aug 2016 21:09:12 +0000 (17:09 -0400)]
Fix bug #10320.
Layout::write needs to allow for the possility that the name of the
style may contain a space. It seems sufficient just always to quote it.
Juergen Spitzmueller [Wed, 3 Aug 2016 12:58:18 +0000 (14:58 +0200)]
de.po: fix meta data
Juergen Spitzmueller [Wed, 3 Aug 2016 12:52:23 +0000 (14:52 +0200)]
de.po: minor fixes
Juergen Spitzmueller [Wed, 3 Aug 2016 07:06:43 +0000 (09:06 +0200)]
de.po: update
Juergen Spitzmueller [Wed, 3 Aug 2016 07:05:06 +0000 (09:05 +0200)]
Fix typo.
Richard Heck [Tue, 2 Aug 2016 22:54:31 +0000 (18:54 -0400)]
Fix problem noticed by Scott.
(cherry picked from commit
16d39b1f83253ff039c3db23124a74c02994e231 )
Richard Heck [Tue, 2 Aug 2016 15:11:46 +0000 (11:11 -0400)]
Fix quotes in InStar module description.
Juergen Spitzmueller [Tue, 2 Aug 2016 11:21:31 +0000 (13:21 +0200)]
de.po: update
José Matos [Mon, 1 Aug 2016 10:04:39 +0000 (11:04 +0100)]
Fix bug #10273
The export of compressed files to previous lyx versions failed on windows.
The change in this case is to explicitly pass the output file since we know it.
At the same time take care of the fact that lyx2lyx knows what file format
versions corresponds to each lyx version.
José Matos [Mon, 1 Aug 2016 09:53:10 +0000 (10:53 +0100)]
White space change only (remove spaces at the end of lines)
Richard Heck [Sun, 31 Jul 2016 16:47:13 +0000 (12:47 -0400)]
Fix typo in new dia converter.
Uwe Stöhr [Sun, 31 Jul 2016 08:35:04 +0000 (10:35 +0200)]
Customization.lyx: remove incorrect LaTeX symbols
Richard Heck [Sat, 30 Jul 2016 04:03:35 +0000 (00:03 -0400)]
Simplify CSS classes for floats.
Fixes bug #8605 and probably parts of #8755 and #9328.
(cherry picked from commit
50c139195083120fb79a215d21cedda516a3451c )
Richard Heck [Sat, 30 Jul 2016 04:15:33 +0000 (00:15 -0400)]
Fix CSS for math cases.
Fixes bug #8755.
(cherry picked from commit
752c89ae1320fdfa86d3b91dcfdc82e6f20b1407 )
Richard Heck [Sat, 30 Jul 2016 04:25:09 +0000 (00:25 -0400)]
Fix HTML display of math matrices.
(cherry picked from commit
60ce2b7570e65ccf31738c39211b0997113e4d57 )
Richard Heck [Sun, 31 Jul 2016 07:18:32 +0000 (03:18 -0400)]
Fix output of floats, etc, inside environments.
Fixes bug #9094.
(cherry picked from commit
98feadd61eb80ec330cd1884f2321952313ea4b1 )
Richard Heck [Sun, 31 Jul 2016 06:52:30 +0000 (02:52 -0400)]
Add 'dir="auto"' to the body tag for XHTML export. This should take
care of much of what we need to do for RTL languages. It does not
take care of inline language changes, probably.
(cherry picked from commit
07dcb1c525435c6f22de4314ba31150c53502429 )
Richard Heck [Sun, 31 Jul 2016 05:47:30 +0000 (01:47 -0400)]
Fix display of code listings in XHTML.
Fixes bug #8362.
(cherry picked from commit
ab3a49973f8f948884186f13fe8fd07ecd453198 )
Richard Heck [Sun, 31 Jul 2016 05:20:16 +0000 (01:20 -0400)]
Enable export of spreadsheets with XHTML.
(cherry picked from commit
1840e2dbaf8b0278a81c6b14fe8a1f939c390160 )
Richard Heck [Sun, 31 Jul 2016 04:53:12 +0000 (00:53 -0400)]
Dummy export for spreadsheets: plaintext and DocBook.
(cherry picked from commit
94dd876699691037e1d30442c4541006347be9fe )
Richard Heck [Sun, 31 Jul 2016 04:41:23 +0000 (00:41 -0400)]
Export external raster graphics as png for XHTML.
(cherry picked from commit
681e76086a0b229589fd09cbec64eb8f1063a41b )
Richard Heck [Sun, 31 Jul 2016 04:40:16 +0000 (00:40 -0400)]
Export external vector graphics as svg for XHTML.
(cherry picked from commit
b9f7bf7d69c8c5e5391c59a9956377c742ca60de )
Richard Heck [Sun, 31 Jul 2016 04:28:37 +0000 (00:28 -0400)]
Enable SVG export of XFig figures for XHTML.
(cherry picked from commit
a45ffddb238dde85e54ae0226b20ef347b4e9e4c )
Richard Heck [Sun, 31 Jul 2016 03:17:15 +0000 (23:17 -0400)]
Activate export of chess diagrams for XHTML.
(cherry picked from commit
0b8c6bbbf83aa21e01f31693ae1d9b421293ef66 )
Richard Heck [Sun, 31 Jul 2016 04:36:46 +0000 (00:36 -0400)]
Enable XHTML export of LilyPond files.
(cherry picked from commit
b35661b755bb6ef95716eb575561aac4009c140b )
Richard Heck [Sun, 31 Jul 2016 04:52:22 +0000 (00:52 -0400)]
Allow XHTML export of Dia diagrams.
(cherry picked from commit
3f1199d56ad45d5da46dd0d7e30a45f506cabf96 )
Richard Heck [Sun, 31 Jul 2016 02:42:01 +0000 (22:42 -0400)]
Activate export of external material for XHTML.
As of this commit, this is ineffective, since no changes have been
made to external_templates.
(cherry picked from commit
daf7cd4c05f55c7eb957df7076ec91dcd2eca543 )
Richard Heck [Sun, 31 Jul 2016 04:15:48 +0000 (00:15 -0400)]
Fix substitution for $$Contents.
The second argument here is the length of the string to replace,
not the position of the final character.
(cherry picked from commit
6b97f2c0751ff79fc19ea0e11b4ef957fd71324c )
Richard Heck [Sun, 31 Jul 2016 03:48:27 +0000 (23:48 -0400)]
Fix preview of external material with plaintext and DocBook.
(cherry picked from commit
93a612220ed4ce604c864b72b14efc59e8ce6683 )
Richard Heck [Sun, 31 Jul 2016 03:17:30 +0000 (23:17 -0400)]
Fix indentation of fen2ascii script so it will run.
(cherry picked from commit
22e1063cb9b6bd84e6c1d3adf24b3d93a06b90bb )
Richard Heck [Sun, 31 Jul 2016 01:57:52 +0000 (21:57 -0400)]
Use scaling factor in XHTML output.
(cherry picked from commit
47c52db13e2f58224d31a2e26a69320f1f5b16cf )
Richard Heck [Sun, 31 Jul 2016 01:51:25 +0000 (21:51 -0400)]
If we cannot find the input format for a graphic, we cannot convert it.
Also includes some minor code cleanup.
(cherry picked from commit
e1f597e3da26865cb01eab5bef6ad5d9e862ff7a )
Richard Heck [Sun, 31 Jul 2016 01:08:06 +0000 (21:08 -0400)]
Fix some symbols that are displayed incorrectly in MathML export.
(cherry picked from commit
88603655657e9cf7c3c858213702e2d9675b8af8 )
Richard Heck [Sun, 31 Jul 2016 00:17:31 +0000 (20:17 -0400)]
Fix bug #10154.
Richard Heck [Sat, 30 Jul 2016 05:30:37 +0000 (01:30 -0400)]
Fix thinko from earlier commit.
We need to output the deferred material AFTER the paragraph is closed.
Richard Heck [Fri, 24 Jun 2016 18:57:28 +0000 (14:57 -0400)]
Only trim right end of lines in header. This allows us to preserve
whitespace in local layout.
(cherry picked from commit
a11e07a62fb78cae8d33d132550454a5db96e26e )
Richard Heck [Sun, 10 Jul 2016 03:12:32 +0000 (23:12 -0400)]
Fix problem with branch handling. The problem was that we were not
dealing properly with the paragraph separator tag.
We really need to use that tag as a kind of general marker for which
tags we're responsible for in a given paragraph and which tags we are
not. So the changes to InsetText.cpp use the tag as that kind of marker.
Note that, as of this commit, the User Guide again exports without any
kind of error. I haven't yet checked the other manuals.
This fixes bug #8022.
(cherry picked from commit
31e25c8ec695f864bec3679c3e11495e3011a0e2 )
Richard Heck [Sat, 30 Jul 2016 03:36:48 +0000 (23:36 -0400)]
Fix display of colors in labels of arguments.
We need to handle this specially, just as we do the main font.
(cherry picked from commit
96a8156557731a914087b29ec7e976960c0b8c36 )
Uwe Stöhr [Tue, 26 Jul 2016 21:40:34 +0000 (23:40 +0200)]
Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
Uwe Stöhr [Tue, 26 Jul 2016 21:40:19 +0000 (23:40 +0200)]
Win installer: add an MSVC DLL
the compiled lyx.exe does not use it but since its distribution is recommended by Microsoft it doesn't harm to distribute it with the installer
Richard Heck [Tue, 26 Jul 2016 17:33:41 +0000 (13:33 -0400)]
orig_x can and so prsumably should be a double.
Richard Heck [Mon, 25 Jul 2016 19:07:03 +0000 (15:07 -0400)]
Fix indentation.
Richard Heck [Mon, 25 Jul 2016 18:55:16 +0000 (14:55 -0400)]
Merge branch '2.2.x' into 2.2.2-staging
Richard Heck [Mon, 25 Jul 2016 18:50:10 +0000 (14:50 -0400)]
Start development of 2.2.2.
Richard Heck [Sat, 23 Jul 2016 17:42:54 +0000 (13:42 -0400)]
Fix hang reported at #10307.
Also, add a FIXME explaining what we'd need to do to fix the
convert_TeX_brace_to_Argument routine properly.
(cherry picked from commit
0f4c14bba21526274856ef564b689cbbded5f777 )
Richard Heck [Thu, 21 Jul 2016 18:34:19 +0000 (14:34 -0400)]
Fix directory in build script.
Richard Heck [Thu, 21 Jul 2016 18:31:23 +0000 (14:31 -0400)]
Remerge strings.
Richard Heck [Thu, 21 Jul 2016 18:29:54 +0000 (14:29 -0400)]
Update gmo files for German and Brazilian Portuguese.
Richard Heck [Thu, 21 Jul 2016 18:25:32 +0000 (14:25 -0400)]
Start preparations for 2.2.1.
Jean-Marc Lasgouttes [Thu, 21 Jul 2016 08:21:45 +0000 (10:21 +0200)]
Recompute Paragraph::beginOfBody() earlier
In redoParagraph, this should be done before coping with the insets,
other wise some graphic gliches may occur. This is a better fix for
Fixes bug #10163.
(cherry picked from commit
71374b38c26585dc060e923452f2dd873ef00f15 )
Jean-Marc Lasgouttes [Wed, 20 Jul 2016 21:25:17 +0000 (23:25 +0200)]
When painting only insets, paint also change and language marks
Fixes bug #10265.
(cherry picked from commit
c73923c51901ef7d7b0a0a3e0a4a581671fbe0f1 )
Uwe Stöhr [Wed, 20 Jul 2016 21:44:11 +0000 (23:44 +0200)]
prepare installer for 2.2.1
Uwe Stöhr [Tue, 19 Jul 2016 23:50:02 +0000 (01:50 +0200)]
status.22x: mention Brazilian update
Uwe Stöhr [Tue, 19 Jul 2016 23:46:03 +0000 (01:46 +0200)]
pt_BR.po: updates by Georger
Jean-Marc Lasgouttes [Mon, 18 Jul 2016 14:44:06 +0000 (16:44 +0200)]
Add feedback in status bar when zooming
Moreover enforce better the lower limit of 10 and avoid overflow due
to unsigned int.
Fixes bug #10212.
(cherry picked from commit
8884c4044d7c1d29526aca7b0be1734231c89207 )
Jean-Marc Lasgouttes [Tue, 19 Jul 2016 20:29:57 +0000 (22:29 +0200)]
Realize inset argument label font before using it
Also fix a few typos in status.22x.
(cherry picked from commit
e35110eab7a540deaf8dc52483f1e5a55a773f46 )
Richard Heck [Mon, 18 Jul 2016 17:01:42 +0000 (13:01 -0400)]
Do not crash is release mode if we stumble across an unrealized font.
(cherry picked from commit
3203fb1c5fcfa8e1b3c4e4e802c18241bdbc4272 )
Richard Heck [Mon, 18 Jul 2016 17:02:56 +0000 (13:02 -0400)]
Ignore .dirstamp.
Richard Heck [Mon, 18 Jul 2016 02:50:17 +0000 (22:50 -0400)]
The way this was previously, it had to fail if the GUI language
was not English: We return the the abbreviated author "One and Two",
but translated to the GUI language; then we search that for " and "
in order to pull the authors apart again.
I've just replaced the distinct routines with a single one that handles
both cases, depending upon whether a Buffer is provided as one argument.
(cherry picked from commit
fb84ccd9fb8fbe1eeb764580964a333acb2e6c0d )