[LyX/master] Merge branch 'features/indexmacros'

[Scott Kostyshak]

On Sun, Nov 20, 2022 at 03:29:37PM +0100, Thibaut Cuvelier wrote:
> On Fri, 4 Nov 2022 at 01:59, Scott Kostyshak <skostysh at lyx.org> wrote:
> 
> > On Thu, Nov 03, 2022 at 10:04:31PM +0100, Thibaut Cuvelier wrote:
> > > On Thu, 3 Nov 2022 at 21:27, Scott Kostyshak <skostysh at lyx.org> wrote:
> > >
> > > > On Mon, Oct 31, 2022 at 11:38:46PM -0400, Scott Kostyshak wrote:
> > > > > On Tue, Nov 01, 2022 at 12:01:47AM +0100, Thibaut Cuvelier wrote:
> > > > > > On Mon, 31 Oct 2022 at 21:12, Jürgen Spitzmüller <
> > jspitzm at gmail.com>
> > > > wrote:
> > > > > >
> > > > > > > Am Montag, dem 31.10.2022 um 14:58 -0400 schrieb Scott Kostyshak:
> > > > > > > > I get the following warning:
> > > > > > > >
> > > > > > > > /home/scott/lyxbuilds/master-
> > > > > > > > master/repo/src/insets/InsetIndex.cpp:1691:6: error: function
> > > > > > > > 'printTree' is not needed and will not be emitted [-Werror,-
> > > > > > > > Wunneeded-internal-declaration]
> > > > > > > > void printTree(const IndexNode* root_node, unsigned depth = 0)
> > > > > > > >      ^
> > > > > > > > 1 error generated.
> > > > > > >
> > > > > > > I can have a look, but I think this is a method added by Thibaut.
> > > > > >
> > > > > >
> > > > > > I've pushed 3bf1b97ae547aea5d0243e41b2d8af463a6e40c5 to master; it
> > > > should
> > > > > > solve the issue. Scott, let me know if it works for you.
> > > > >
> > > > > Thanks! I see the following failures:
> > > > >
> > > > >   export/doc/Math_xhtml (Failed)
> > > > >   export/doc/de/Additional_xhtml (Failed)
> > > > >   export/doc/de/Math_xhtml (Failed)
> > > > >   export/doc/de/UserGuide_xhtml (Failed)
> > > > >   export/doc/es/Math_xhtml (Failed)
> > > > >   export/doc/fr/Math_xhtml (Failed)
> > > > >   export/doc/ja/Math_xhtml (Failed)
> > > > >   export/doc/ru/Math_xhtml (Failed)
> > > > >
> > > > > Thibaut, can you look at those?
> > > >
> > > > Thibaut, can you take a look? From what I understand, these were
> > passing
> > > > before the merge. The doc/Math_xhtml one seems to have been fixed
> > > > recently somehow, but the other ones still fail:
> > > >
> > > >   export/doc/de/Additional_xhtml (Failed)
> > > >   export/doc/de/Math_xhtml (Failed)
> > > >   export/doc/de/UserGuide_xhtml (Failed)
> > > >   export/doc/es/Math_xhtml (Failed)
> > > >   export/doc/fr/Math_xhtml (Failed)
> > > >   export/doc/ja/Math_xhtml (Failed)
> > > >   export/doc/ru/Math_xhtml (Failed)
> > > >
> > > > For example, for the de Additional_xhtml, I see in the log:
> > > >
> > > > -- Errors from xmllint: doc/de/Additional.xhtml:4451: parser error :
> > > > EntityRef: expecting ';'
> > > > A&A Paper — <a href='#magicparlabel-1252'>1</a></li>
> > > >
> > > > Is it because '&' needs to be escaped?
> > > >
> > >
> > > In this example, the & in A&A should be escaped (& or  &). If you
> > > can fix that quickly, that'd be nice, otherwise, I'll have a look,
> > > tentatively this week-end.
> >
> > Thanks for the quick reply, Thibaut. I would prefer if you took care of
> > it since you are more familiar with this code.
> >
> 
> The case of de/Additional.lyx should be solved at 77f0fbdc9a. Other issues
> in the tests are solved in 48d9d01a; the four remaining tests are solved at
> 7a602438 locally

Thanks! It all looks good here. I uninverted two tests at 42425428 since
it seems that #10355 somehow got fixed.

> (I don't get how to configure CTest to use my version of
> Python, hence it fails in strange ways).

Let's try to figure out how to fix this.

Is it only a problem with the ctests? Meaning, LyX uses your version of
Python without any extra configuration by you, but for the ctests do
not?

What is the error you get from the ctests? Is your version of Python the
first one found in path? Is the command name "python" or "python3" or
something else?

> When having a look when tests were failing, I had this error with
> doc/de/Math.lyx dumped in stderr (which does not prevent output from being
> generated, though):
> 
> Line ~0: Math parse error: found '\]' unexpectedly
> 
> Tokens:
> \text[123,1]68105101115[32,10]105115116[32,10]100101114[32,10]7511110910910111011697114[125,2]\]
> pos: 26

I don't get that, but I do get a lot of output:

  $ lyx -e xhtml Math.lyx
  Entry: 
  0
  1
  "\LaTeX -Kommentare"
  Entry: 
  0
  1
  "\LaTeX -Vorspann"
  Entry: 
  0
  1
  "\TeX -Klammern"
  Entry: 
  0
  1
  "\TeX -Modus"
  Entry: 
  0
  1
  "Akzente"
  Entry: 
  0
  2
  ... [I cut the rest of it].


When I open the exported de Math.xhtml in Chromium, I get:

  "error on line 7159 at column 22: Entity 'imaginary' not defined"

Scott
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20221120/775db6ed/attachment.asc>