Hello. I'm working on a book and the TOC has the page numbers aligned to the right, via a right indent tab, that I defined on the paragraph styles the TOC uses.
Some of the entries, however, are a bit long and so they get too close to the page number or even fill more than one line. This makes the page number flow into the next line as well, although it remains right aligned, as it should.

What I need is to define a right aligned tab for the text and one for the page number. This would essentially define a margin between the entry's text and the page numbers.
Also, if possible, I'd prefer to have the page number always on the first line of the entry and not have it flow to the last one.

Any thoughts? I hope I explained this well enough, but if it's not the case, just let me know. Thanks in advance.

http://www.vivoeusebio.com