Consider the current page # when numbering articles

Resolves #335