Refentry in section

[gpfadel]

Hi,

I have a book with some refentry groups sparse along the document, something like this

Book                        (a)
    Chapter                 (b)
        Section             (c)
            Refentry        (d)
        Section             (e)
            Refentry        (f)
        Section             (g)
        Section             (h)
        Section             (i)
            Section         (j)
                Refentry    (k)
            Section         (l)
                Refentry    (m)
        Section             (n)

where refentry elements are children of section and not of reference.

When the document is created I have two issues.

1. The numbers of section are wrong. When a section contains a refentry the next section restarts its
   numeration from 1. In the example (e) is numbered 1 instead of 2, (g) is 1, (n) is 1.

2. When refentry is present at second level of sub section, as (k) o (m), the resulting structure of the document
   is wrong although the TOC is right.
   If you move trough the document with the Next navigation button you have this sequence:

   h -> i -> j -> l -> k -> m -> n

   instead of

   h -> i -> j -> k -> l -> m -> n

In the attached zip file a minimal example of the issues.

Thanks

refentrytest.zip