diff options
Diffstat (limited to 'graphics/circuit_macros/examples/MoreTable.m4')
-rw-r--r-- | graphics/circuit_macros/examples/MoreTable.m4 | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/graphics/circuit_macros/examples/MoreTable.m4 b/graphics/circuit_macros/examples/MoreTable.m4 index 3d90b71eb4..cc198c198b 100644 --- a/graphics/circuit_macros/examples/MoreTable.m4 +++ b/graphics/circuit_macros/examples/MoreTable.m4 @@ -2,26 +2,33 @@ # heater.m4 cct_init -Heater: [ - movewid = 2 pt__ - hm = 2.05 - right_ +Heater:[ { - {lamp ; move; "`{\tt lamp}'" ljust} + {E: lamp(,,shaded "yellow") + "`\tt\shortstack[l]{lamp(,{,}\\\;shaded \"yellow\")}'" ljust below \ + at E.start -(textoffset,0) } move right_ 1.5 - {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + {E: lamp(,T) + "`\tt lamp(,T)'" ljust below at E.start -(textoffset,0)} + move right_ 1.0 + {E: thermocouple + "`\tt thermocouple'" ljust below at E.start -(textoffset,0)} move right_ 1.25 - {thermocouple ; move;" `{\tt thermocouple}'" ljust } - move right_ hm - {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + {E: thermocouple(,,,T) + "`\tt thermocouple(,{,},T)'" ljust below at E.start -(textoffset,0) } } - move down 0.4; right_ +move down 0.5; right_ { - {heater; move;"`{\tt heater}'" ljust} - move right_ hm - {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} - move right_ hm+0.4 - {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + definergbcolor(lightred,0.8,0.16,0.16) + {E: heater(,,,,shaded "lightred") + "`\tt\shortstack[l]{heater(,{,},{,}\\ \;shaded \"'lightred`\")}'" ljust below \ + at (E.start-(textoffset,0),last [].sw)} + move right_ 1.5 + {E: heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust below \ + at E.start -(textoffset,0) } + move right_ 1.5 + {E: heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust below \ + at E.start -(textoffset,0) } } ] @@ -40,8 +47,8 @@ vm = 0.28 #} # move down 0.25; right_ { {memristor ; move;"`{\tt memristor}'" ljust} - move right_ hm - {heater; move;"`{\tt heater}'" ljust} +# move right_ hm +# {heater; move;"`{\tt heater}'" ljust} move right_ hm {tline ; move;"`{\tt tline}'" ljust} } @@ -65,5 +72,5 @@ vm = 0.28 {xtal(,type=R;outerdiam=0.2) ; move ;"`{\tt xtal(,type=R)}'" ljust} } -] with .nw at Heater.sw+(0,-0.2) +] with .nw at Heater.sw+(0,-0.3) .PE |