projects
/
matthijs
/
master-project
/
report.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "DEFAULT" a keyword.
[matthijs/master-project/report.git]
/
Utils
/
Metapost.tex
diff --git
a/Utils/Metapost.tex
b/Utils/Metapost.tex
index 6c46ece6a82c7fb48103748dffa40a75cc7014b5..63b0620bd7b2556fa4bfec26aa8e378e10bee277 100644
(file)
--- 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
"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;
"ypart @#ck = ypart (@#sw * .75 + @#nw * .25)";
StandardTies;
@@
-101,7
+102,7
@@
vardef newMux@# text options=
assignObj(@#,"Mux");
StandardInterface;
% Add ports
assignObj(@#,"Mux");
StandardInterface;
% Add ports
- ObjPoint inpa, inpb, out;
+ ObjPoint inpa, inpb, out
, sel
;
ObjCode MinimumStandardEquations,
% Make it a parallel trapezium
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)",
% And space the input ports evenly
"@#inpa = midpoint(@#nw, @#w)",
"@#inpb = midpoint(@#w, @#sw)",
- "@#out = @#e";
+ "@#out = @#e",
+ "@#sel = @#n";
StandardTies;
enddef;
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);
define_local_numeric_option("width");
define_local_numeric_option("height");
setObjectDefaultOption("Mux")("width")(5mm);
-setObjectDefaultOption("Mux")("height")(
20
mm);
+setObjectDefaultOption("Mux")("height")(
15
mm);
setObjectDefaultOption("Mux")("framed")(true);
% Overidden above
%setObjectDefaultOption("Mux")("framewidth")(.5bp);
setObjectDefaultOption("Mux")("framed")(true);
% Overidden above
%setObjectDefaultOption("Mux")("framewidth")(.5bp);