Definitely diamond, but not all CAD systems allow this.
Some CAD systems demand the dot to recognize the connection. For example, in TinyCAD without the dot a T intersection is not considered part of the same net; when highlighting that net the T branch does not highlight.
One nice thing in a CAD system is the ability to place simulation results and actual measured scope plots directly onto the schematic, in color. The art has come a long way since I was first forced to use Daisy instead of my pencil.
@David, the diamond schematic in my comment doens;t use dots to indicate connections. Should it? That's another alway's debateable convention: dots or no dots. I prefer dots because sometimes having lies cross in unavoidable. When that occurs, a dot makes i clear that there's a connection. Some get around then by having only T interestions, avoiding crosses (+).
I remember Heathkit schematics as being particularly well-drawn. I think a lot of the quality of the older drawings was that mechanical drawing was at that time a required engineering skill and something people did with great pride. A sloppy drawing indicated sloppy engineering. In Jules Verne's The Begum's Fortune (1879), the hero infiltrates into the enemy's Metropolis-like factory through outstanding mechanical drawing ability.
One of my pet peeves is the terrible automatically-generated logic diagrams one gets from logic synthesizers. IMO they're practically useless for anything but the simplest designs -- I'd much rather have textual equations.
They have to look good, for heaven's sake, like any other art form. In the tube days, the tubes were often lined up on top, and all the passive components feeding them underneath. In the early transistor days, I noticed the same drawing style. But now, and I think for good reason, the active components are not typically separated.
There's nothing like a well executed, complementary symmetry analog circuit diagram, NPN on top, PNP on bottom, IMO. I like the power supply bypass capacitors to be shown close to the component they are bypassing for. And yes, chips tend to not have their inner workings show, because aside from the simplest of chips, that would be practically impossible.