X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FMetapost.tex;h=63b0620bd7b2556fa4bfec26aa8e378e10bee277;hp=6c46ece6a82c7fb48103748dffa40a75cc7014b5;hb=8515f491f83e63caa71de03c6e71b25df12aedb2;hpb=5d17eedd2ad157c9d35d72093eb3acca851342e8 diff --git a/Utils/Metapost.tex b/Utils/Metapost.tex index 6c46ece..63b0620 100644 --- a/Utils/Metapost.tex +++ b/Utils/Metapost.tex @@ -50,7 +50,8 @@ vardef newReg@#(expr v) text options= "xpart @#out = xpart @#e", "xpart @#d = xpart @#ck = xpart @#w", fi - "ypart @#d = ypart @#out = ypart (@#sw * .25 + @#nw * .75)", + "ypart @#out = ypart midpoint(@#n, @#s)", + "ypart @#d = ypart (@#sw * .25 + @#nw * .75)", "ypart @#ck = ypart (@#sw * .75 + @#nw * .25)"; StandardTies; @@ -101,7 +102,7 @@ vardef newMux@# text options= assignObj(@#,"Mux"); StandardInterface; % Add ports - ObjPoint inpa, inpb, out; + ObjPoint inpa, inpb, out, sel; ObjCode MinimumStandardEquations, % Make it a parallel trapezium @@ -115,7 +116,8 @@ vardef newMux@# text options= % And space the input ports evenly "@#inpa = midpoint(@#nw, @#w)", "@#inpb = midpoint(@#w, @#sw)", - "@#out = @#e"; + "@#out = @#e", + "@#sel = @#n"; StandardTies; enddef; @@ -134,7 +136,7 @@ def BpathMux(suffix n)=StandardBpath(n) enddef; define_local_numeric_option("width"); define_local_numeric_option("height"); setObjectDefaultOption("Mux")("width")(5mm); -setObjectDefaultOption("Mux")("height")(20mm); +setObjectDefaultOption("Mux")("height")(15mm); setObjectDefaultOption("Mux")("framed")(true); % Overidden above %setObjectDefaultOption("Mux")("framewidth")(.5bp);