The continuing interest in unobtrusive electrocardiography requires the development of algorithms, compensating for an increased number of artifacts. In previous work, we proposed a framework for robust parameter estimation of signals following a piecewise Gaussian derivative model, well suited for describing all waves of a heartbeat. The framework is based on a numeric and analytic representation of applying the Wavelet Transform at arbitrary scale to the input model. For robustly estimating model parameters, it processes lines of zero-crossings in scale-space, showing high accuracy for various noise models in synthetic signals. An initial evaluation with electrocardiography signals revealed that our basic classifier for identifying the correct lines often fails, leading to false parameter estimates. In this work, we propose a general delineation method based on a solid mathematical framework that treats each heartbeat, wave and fiducial point in the same way, tailored only by intuitive parameters and not relying on any heuristically found decision rules. The steps include a novel line classifier based on pre-filtering using domain knowledge, followed by an exhaustive search among all possible combinations of zero-crossing lines and an error-measure quantifying their agreement with the model. The combination with highest agreement is processed by the parameter estimation framework, customized to the computation of all nine fiducial points. Evaluation using the expert-annotated QT database, shows high sensitivity (P: 99.91%, QRS: 99.92%, T: 99.89%) and mean errors below 1 ms for all onset and offset fiducial points. The proposed combination of line classification and parameter estimation is well suited for delineating electrocardiograms.