[LyX/master] DocBook: fix XML in comments (-- forbidden for some historical reason).

[Thibaut Cuvelier]

On Sat, 1 Aug 2020 at 03:51, Thibaut Cuvelier <tcuvelier at lyx.org> wrote:

> On Sat, 1 Aug 2020 at 01:01, Kornel Benko <kornel at lyx.org> wrote:
>
>> Am Sat, 1 Aug 2020 00:42:20 +0200
>> schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
>>
>> > On Sat, 1 Aug 2020 at 00:28, Kornel Benko <kornel at lyx.org> wrote:
>> >
>> > > Am Fri, 31 Jul 2020 23:37:33 +0200 (CEST)
>> > > schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
>> > >
>> > > > commit 85946aae2b94fedf5ce9bd35e91ba500986b5121
>> > > > Author: Thibaut Cuvelier <tcuvelier at lyx.org>
>> > > > Date:   Sat Aug 1 00:02:36 2020 +0200
>> > > >
>> > > >     DocBook: fix XML in comments (-- forbidden for some historical
>> > > reason).
>> > > > ---
>> > > >  autotests/export/docbook/deutsches_ert.lyx |   14 +++++-
>> > > >  autotests/export/docbook/deutsches_ert.xml |    2 +-
>> > > >  src/insets/InsetERT.cpp                    |   14 ++++--
>> > > >  src/xml.cpp                                |   80
>> > > ++++++++++++++-------------
>> > > >  src/xml.h                                  |    5 +-
>> > > >  5 files changed, 68 insertions(+), 47 deletions(-)
>> > >
>> > > Cannot compile ...
>> > > I get now
>> > > /usr2/src/lyx/lyx-git/src/xml.cpp:78:79: error: explicit
>> qualification in
>> > > declaration of
>> > > ‘lyx::docstring lyx::xml::escapeString(const docstring&,
>> > > lyx::XMLStream::EscapeSettings)’
>> > > docstring xml::escapeString(docstring const & raw,
>> > > XMLStream::EscapeSettings e) ^
>> > > src/CMakeFiles/lyx2.4.dir/build.make:1441: recipe for target
>> > > 'src/CMakeFiles/lyx2.4.dir/usr2/src/lyx/lyx-git/src/xml.cpp.o' failed
>> > >
>> >
>> > Is the new version better?
>>
>> Looks good :)
>> Now the remaining problematic case is
>>         3718 -
>>
>> export/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29_docbook5
>>         (Failed)
>> ('\'' in param)
>> ...
>> <bibliomixed xml:id='Newell and O'Neil (1978)'>Newell, E. B., and O'Neil,
>> E. J. 1978,
>> <!-- \apjs -->, 37, 27 </bibliomixed> <bibliomixed xml:id='Ortolani et al.
>> (1985)'>Ortolani, S., Rosino, L., and Sandage, A. 1985, <!-- \aj -->, 90,
>> 473
>> </bibliomixed>
>> ...
>>
>> (Mark, this is from the examples directory (not templates dir with the
>> same filename))
>>
>
> That one is fixed too, thanks!
>

Still on that American_Astronomical_Society test case, I try to improve
things a bit. The main choke point for now is appendices: why is there a
layout Appendix, which does not work like the usual "start of appendix".
Maybe the constructor of ParagraphParameters should just check whether the
LaTeX command is \appendix?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200801/b152ca49/attachment.html>