diff --git a/src/current/c1map/c1nodes.xsl b/src/current/c1map/c1nodes.xsl index a712bca1..2fb8fbd3 100644 --- a/src/current/c1map/c1nodes.xsl +++ b/src/current/c1map/c1nodes.xsl @@ -39,18 +39,43 @@ form: '>Name' => array( ) --> + - + + => - - - + + + + + @@ -61,6 +86,11 @@ array( + + 'text()' => + + + ) @@ -72,11 +102,22 @@ - + + + + => + , @@ -105,9 +146,31 @@ + + + + + + + diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl index 2e8046c1..01de88d9 100644 --- a/src/current/c1map/render.xsl +++ b/src/current/c1map/render.xsl @@ -133,6 +133,11 @@ + + + + $contract->escapeValue( + $contract->getValueByContext( @@ -145,6 +150,9 @@ ' ) + + ) + @@ -177,11 +185,82 @@ + + + + + + + + + + + $contract->escapeValue( $contract->getValue( ' + + ', $contract->getValueIndex( ' + + ' ) ) + + + + $contract->getValue( ' + + ', $contract->getValueIndex( ' + + ' ) + + , @@ -241,6 +320,10 @@ + + + + diff --git a/src/current/c1map/valparse.xsl b/src/current/c1map/valparse.xsl index e84b25dc..e06de78b 100644 --- a/src/current/c1map/valparse.xsl +++ b/src/current/c1map/valparse.xsl @@ -36,7 +36,6 @@ - @@ -143,6 +142,14 @@ ) ) " /> + + + +