diff --git a/src/draw.c b/src/draw.c index 38cefe10..9b0ebe68 100644 --- a/src/draw.c +++ b/src/draw.c @@ -817,7 +817,7 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub if(dash) { dash_arr[0] = dash_arr[1] = dash; XSetDashes(display, gc[c], 0, dash_arr, 2); - XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapRound , JoinRound); + XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapButt , JoinBevel); } if(draw_window) XDrawLine(display, window, gc[c], x1, y1, x2, y2); if(draw_pixmap) @@ -840,7 +840,7 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub if(dash) { dash_arr[0] = dash_arr[1] = dash; XSetDashes(display, gc[c], 0, dash_arr, 2); - XSetLineAttributes (display, gc[c], bus_width ,LineDoubleDash, CapRound , JoinRound); + XSetLineAttributes (display, gc[c], bus_width ,LineDoubleDash, CapButt , JoinBevel); } else { XSetLineAttributes (display, gc[c], bus_width , LineSolid, CapRound , JoinRound); } @@ -1339,7 +1339,7 @@ void drawpolygon(int c, int what, double *x, double *y, int points, int poly_fil char dash_arr[2]; dash_arr[0] = dash_arr[1] = dash; XSetDashes(display, gc[c], 0, dash_arr, 2); - XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapRound , JoinRound); + XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapButt , JoinBevel); } if(draw_window) XDrawLines(display, window, gc[c], p, points, CoordModeOrigin); if(draw_pixmap) @@ -1401,7 +1401,7 @@ void drawrect(int c, int what, double rectx1,double recty1,double rectx2,double if(dash) { dash_arr[0] = dash_arr[1] = dash; XSetDashes(display, gc[c], 0, dash_arr, 2); - XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapRound , JoinRound); + XSetLineAttributes (display, gc[c], lw ,LineDoubleDash, CapButt , JoinBevel); } if(draw_window) XDrawRectangle(display, window, gc[c], (int)x1, (int)y1, (unsigned int)x2 - (unsigned int)x1, diff --git a/xschem_library/examples/0_examples_top.sch b/xschem_library/examples/0_examples_top.sch index 82a166f4..e5fe6729 100644 --- a/xschem_library/examples/0_examples_top.sch +++ b/xschem_library/examples/0_examples_top.sch @@ -6,15 +6,15 @@ E {} L 3 910 -560 960 -540 {} L 3 880 -680 1200 -680 {} L 8 900 -540 950 -560 {} -L 11 900 -550 950 -530 {} +L 11 900 -550 950 -530 {dash=4} L 16 910 -530 960 -550 {} B 4 940 -510 960 -450 {} -B 7 900 -490 970 -470 {} +B 7 900 -490 970 -470 {dash=4} B 8 910 -510 930 -450 {} A 4 925 -95 35.35533905932738 8.13010235415598 360 {} A 6 990 -150 70.71067811865476 188.130102354156 89.99999999999997 {} A 7 934.1666666666666 -90 39.58991173406564 210.3432488842396 198.9246444160511 {} -P 1 10 930 -370 920 -430 1000 -410 960 -390 990 -360 970 -360 960 -340 940 -380 930 -360 930 -370 {} +P 1 10 930 -370 920 -430 1000 -410 960 -390 990 -360 970 -360 960 -340 940 -380 930 -360 930 -370 {dash=3} P 4 6 880 -350 880 -440 870 -390 870 -430 860 -400 860 -370 {} P 15 11 920 -400 930 -440 950 -410 960 -430 970 -400 990 -410 970 -370 940 -380 910 -360 890 -410 920 -400 {fill=true} T {Welcome to XSCHEM!} 110 -990 0 0 1 1 {layer=5} diff --git a/xschem_library/examples/LCC_instances.sch b/xschem_library/examples/LCC_instances.sch index 34b5ca31..272271de 100644 --- a/xschem_library/examples/LCC_instances.sch +++ b/xschem_library/examples/LCC_instances.sch @@ -11,14 +11,14 @@ L 4 270 -260 290 -280 {} L 4 250 -280 290 -280 {} L 4 250 -280 270 -260 {} L 4 270 -340 270 -280 {} -L 4 350 -620 370 -600 {} -L 4 370 -640 370 -600 {} -L 4 350 -620 370 -640 {} +L 4 350 -620 370 -600 {dash=3} +L 4 370 -640 370 -600 {dash=3} +L 4 350 -620 370 -640 {dash=3} L 4 370 -620 530 -620 {dash=3} -L 4 1400 -290 1420 -310 {} -L 4 1400 -330 1400 -290 {} -L 4 1400 -330 1420 -310 {} -L 4 1240 -310 1400 -310 {} +L 4 1400 -290 1420 -310 {dash=3} +L 4 1400 -330 1400 -290 {dash=3} +L 4 1400 -330 1420 -310 {dash=3} +L 4 1240 -310 1400 -310 {dash=3} P 4 7 530 -860 1130 -860 1130 -690 1390 -690 1390 -580 530 -580 530 -860 {dash=3} T {These 2 instances are equivalent} 290 -320 0 0 0.4 0.4 {} T {Example of using a schematic as a diff --git a/xschem_library/examples/bus_keeper.sch b/xschem_library/examples/bus_keeper.sch index ceac7502..efdebbca 100644 --- a/xschem_library/examples/bus_keeper.sch +++ b/xschem_library/examples/bus_keeper.sch @@ -6,7 +6,7 @@ template="name=X1 WN_FB=1u WP_FB=2u"} V {} S {} E {} -P 4 5 250 -880 250 -120 480 -120 480 -880 250 -880 {dash=5} +P 2 5 250 -880 250 -120 480 -120 480 -880 250 -880 {dash=5} T {@name} 250 -915 0 0 0.5 0.5 {} T {@symname} 253.75 -115 0 0 0.5 0.5 {} N 250 -300 300 -300 {lab=A} diff --git a/xschem_library/examples/cmos_inv.sch b/xschem_library/examples/cmos_inv.sch index 85a877a6..50c15b97 100644 --- a/xschem_library/examples/cmos_inv.sch +++ b/xschem_library/examples/cmos_inv.sch @@ -7,7 +7,7 @@ template="name=X1 WN=15u WP=45u LLN=3u LLP=3u m=1" V {} S {} E {} -P 4 5 60 -390 60 -90 190 -90 190 -390 60 -390 {dash=5} +B 2 60 -390 190 -90 {dash=5} T {@name} 60 -405 0 0 0.2 0.2 {} T {@symname} 63.75 -85 0 0 0.2 0.2 {} N 140 -260 140 -200 {lab=Z}