The top end lumix compacts are well worth a look lx3 and lx5 I think.
I've ended up keeping the LX7 for above-ground use, as it's newer, although it can over-saturate colours in bright light unless you control the aperture manually.
The LX3 is very similar and has the huge benefit of being able to switch it on to review photographs with the lens cap still on - something the LX7 (and LX5 I think) can't do. In a grubby environment, this is a big benefit.
Both are 10 Megapixel, which is just about enough for most purposes, but in reality the LX7 should have been more when it was released.
One area where they do particularly well is close-ups: see the pics at the bottom - the second one is a table mat.
Would recommend The Panasonic Lumix LX cameras - although I'd possibly steer towards a second-hand LX3 as this should offer the better bang for buck.
There also seems to be a 20 Megapixel LX8 on the horizon - although it might be a while before the price comes down. It *may* be weather sealed, which will make it tempting...
LX3 pics underground:
Examples of close-up: