Sounds like you want -all- the harmonics.

Clipping gets you only the odd harmonics, so 50, 150, 250, etc.

A triangle wave is also only odd harmonics. Triangle wave is a
symmetrical gradual rise and fall with sharp peaks.

For all the harmonics, you want a sawtooth wave. That's the one where
the rise is gradual and the fall vertical or vice versa.

http://www.answers.com/topic/sawtooth-wave