A very related question: I'm looking for a(n ideally FLOSS) e-reader that works on both Windows and Android so I can start building and cross-referencing my e-b

A very related question: I'm looking for a(n ideally FLOSS) e-reader that works on both Windows and Android so I can start building and cross-referencing my e-book/article (EPUB/PDF) library. I'm currently using Calibre but did play with Xodo before and liked both (Xodo has the nicer interface and allows for writing on pages with a stylus -- that's awesome). The killer feature I need is saving any highlighting/bookmarking right into the file (eg: a particular quote or diagram). If I can extrapolate these highlights along with page numbers and citations (APA format would be ideal) that would be even better. If there is some citation software out there that does this, that's fine too... though I do have EndNote but don't see these archival options available on it just yet. Any solutions out there?