From 4c0c840f96030685216ad1ff072fba8dd4f3eeb6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 31 Jul 2018 23:54:12 +1000 Subject: (nw) be less eager to shadow variables in layouts, make highlights visible on white squares in modena --- docs/source/techspecs/layout_files.rst | 39 +++++++------- src/mame/layout/aim65.lay | 16 +++--- src/mame/layout/intlc44.lay | 28 +++++----- src/mame/layout/intlc440.lay | 28 +++++----- src/mame/layout/mephisto_academy.lay | 20 +++---- src/mame/layout/mephisto_modena.lay | 97 +++++++++------------------------- src/mame/layout/sitcom.lay | 8 +-- src/mame/layout/whousetc.lay | 10 ++-- src/mame/layout/wildfire.lay | 4 +- 9 files changed, 103 insertions(+), 147 deletions(-) diff --git a/docs/source/techspecs/layout_files.rst b/docs/source/techspecs/layout_files.rst index 47a675251de..89ce3e54d58 100644 --- a/docs/source/techspecs/layout_files.rst +++ b/docs/source/techspecs/layout_files.rst @@ -675,18 +675,18 @@ Two horizontally separated, clickable, four-by-four keypads (inside a ``group`` or ``view`` element):: - - + + - - + + - + @@ -697,19 +697,19 @@ top right, ``btn30`` in the bottom left, and ``btn37`` in the bottom right, counting in between. The four rows are connected to I/O ports ``row0``, ``row1``, ``row2``, and ``row3``, from top to bottom. The columns are connected to consecutive I/O port bits, starting with the least significant bit on the -left. Note that the ``col``, ``x`` and ``mask`` parameters in the innermost -``repeat`` element take their initial values from the correspondingly named -parameters in the enclosing scope, but do not modify them. +left. Note that the ``mask`` parameter in the innermost ``repeat`` element +takes its initial value from the correspondingly named parameter in the +enclosing scope, but does not modify it. Generating a chequerboard pattern with alternating alpha values 0.4 and 0.2 (inside a ``group`` or ``view`` element):: - - + + - - + + @@ -717,20 +717,23 @@ Generating a chequerboard pattern with alternating alpha values 0.4 and 0.2 - - + + - - + + -Rows are connected to I/O ports ``board:IN.7`` at the top to ``board.IN.0`` at -the bottom. +The outermost ``repeat`` element generates a group of two rows on each +iteration; the next ``repeat`` element generates an individual row on each +iteration; the innermost ``repeat`` element produces two horizontally adjacent +tiles on each iteration. Rows are connected to I/O ports ``board:IN.7`` at the +top to ``board.IN.0`` at the bottom. .. _layout-autogen: diff --git a/src/mame/layout/aim65.lay b/src/mame/layout/aim65.lay index 9322a56e8aa..d3cbf032f19 100644 --- a/src/mame/layout/aim65.lay +++ b/src/mame/layout/aim65.lay @@ -33,11 +33,11 @@ - + - - + + @@ -48,12 +48,12 @@ - - + + - - - + + + diff --git a/src/mame/layout/intlc44.lay b/src/mame/layout/intlc44.lay index a294da1dde9..1484429952e 100644 --- a/src/mame/layout/intlc44.lay +++ b/src/mame/layout/intlc44.lay @@ -225,20 +225,20 @@ Intel INTELLEC® 4/MOD 4 layout - + - + - + - + @@ -248,7 +248,7 @@ Intel INTELLEC® 4/MOD 4 layout - + @@ -288,19 +288,19 @@ Intel INTELLEC® 4/MOD 4 layout - + - + - + - + - - + + @@ -318,13 +318,13 @@ Intel INTELLEC® 4/MOD 4 layout - + - + - + diff --git a/src/mame/layout/intlc440.lay b/src/mame/layout/intlc440.lay index d2732278cd8..8a826178238 100644 --- a/src/mame/layout/intlc440.lay +++ b/src/mame/layout/intlc440.lay @@ -220,20 +220,20 @@ Intel INTELLEC® 4/MOD 40 layout - + - + - + - + @@ -243,7 +243,7 @@ Intel INTELLEC® 4/MOD 40 layout - + @@ -283,19 +283,19 @@ Intel INTELLEC® 4/MOD 40 layout - + - + - + - + - - + + @@ -313,13 +313,13 @@ Intel INTELLEC® 4/MOD 40 layout - + - + - + diff --git a/src/mame/layout/mephisto_academy.lay b/src/mame/layout/mephisto_academy.lay index fbea1e63ff8..917dcb459a0 100644 --- a/src/mame/layout/mephisto_academy.lay +++ b/src/mame/layout/mephisto_academy.lay @@ -186,10 +186,10 @@ - + - + @@ -198,11 +198,11 @@ - - + + - - + + @@ -210,12 +210,12 @@ - - + + - - + + diff --git a/src/mame/layout/mephisto_modena.lay b/src/mame/layout/mephisto_modena.lay index 6087b3ca05a..0b238c55ddd 100644 --- a/src/mame/layout/mephisto_modena.lay +++ b/src/mame/layout/mephisto_modena.lay @@ -21,7 +21,7 @@ - + @@ -202,77 +202,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/sitcom.lay b/src/mame/layout/sitcom.lay index e74282f46a8..736139945b0 100644 --- a/src/mame/layout/sitcom.lay +++ b/src/mame/layout/sitcom.lay @@ -45,11 +45,11 @@ - - + + - - + + diff --git a/src/mame/layout/whousetc.lay b/src/mame/layout/whousetc.lay index 6af99406950..b76e6901214 100644 --- a/src/mame/layout/whousetc.lay +++ b/src/mame/layout/whousetc.lay @@ -826,18 +826,18 @@ Westinghouse Test Console Serial #5 layout - - + + - - + + - + diff --git a/src/mame/layout/wildfire.lay b/src/mame/layout/wildfire.lay index 7bec0a1d3d2..3c9a3fae054 100644 --- a/src/mame/layout/wildfire.lay +++ b/src/mame/layout/wildfire.lay @@ -30,10 +30,10 @@ - + - + -- cgit v1.2.3