Index: cortav.lua
==================================================================
--- cortav.lua
+++ cortav.lua
@@ -1284,12 +1284,12 @@
 				indent = nil;
 				depth = 0;
 			}
 		end
 	end};
-	{seq='&$', fn=blockwrap(function(s,c)
-		local id, args = s:match('^&$([^%s]+)%s?(.-)$')
+	{seq='$', fn=blockwrap(function(s,c)
+		local id, args = s:match('^%$([^%s]+)%s?(.-)$')
 		if id == nil or id == '' then
 			c:fail 'malformed macro block'
 		end
 		local argv = ss.str.split(c.doc.enc, args, c.doc.enc.encodeUCS'|', {esc=true})
 		return {

Index: desk/cortav.xml
==================================================================
--- desk/cortav.xml
+++ desk/cortav.xml
@@ -42,21 +42,35 @@
 				<StringDetect String='~~~' attribute='Literal Block Cue' firstNonSpace='true' context='literal-block-cue'/>
 				<RegExpr attribute='List' String='[\*:]+' firstNonSpace='true' context='text' />
 				<Detect2Chars char='%' char1='%' attribute='Comment' context='comment'/>
 				<Detect2Chars char='%' char1='!' attribute='Critical Directive Cue' context='directive'/>
 				<DetectChar char='%' attribute='Directive Cue' context='directive'/>
-				<DetectChar char='@' attribute='Resource Cue' context='resource'/>
-				<DetectChar char='&#9;' attribute='Normal Text' context='refdef-id'/>
+				<DetectChar char='@' attribute='Resource Cue' context='resource-ident'/>
+				<DetectChar char='$' attribute='Deref Cue' context='block-macro-ident'/>
+				<DetectChar char='&amp;' attribute='Deref Cue' context='block-deref-ident'/>
+				<Detect2Chars char='&#9;' char1='&#9;' context='refdef'/>
+				<DetectChar char='&#9;' context='refdef-id'/>
+
+				<Detect2Chars char='|' char1=':' attribute="Section Cue" context='#pop!table' />
+				<Detect2Chars char='+' char1=':' attribute="Section Cue" context='#pop!table' />
+				<AnyChar String='|+' attribute="Section Cue" context='#pop!table' />
+				<DetectSpaces context="#pop!init"/>
 			</context>
 
 			<context name='comment' attribute='Comment' lineEndContext='#pop'>
 			</context>
 			<context name='error' attribute='Error' lineEndContext='#pop'>
 			</context>
 
-			<context name='resource' attribute='Resource Identifier' lineEndContext='#pop'>
-				<DetectSpaces context='#pop!error' attribute='Error'/>
+			<context name='resource-ident' attribute='Resource Identifier' lineEndContext='#pop'>
+				<DetectSpaces context='#pop!resource-line'/>
+			</context>
+			<context name='resource-line' attribute='Identifier' lineEndContext='#pop'>
+				<RegExpr String='\{$' attribute="Span Cue" context='#pop!resource-inline'/>
+			</context>
+			<context name='resource-inline' attribute='Literal Block' lineEndContext='#pop!resource-inline'>
+				<RegExpr String='^}$' attribute="Span Cue" context='#pop'/>
 			</context>
 
 			<context name='sec-ident' attribute='Identifier' lineEndContext='#pop'>
 				<DetectSpaces context='#pop!sec' attribute='Normal Text'/>
 			</context>
@@ -84,21 +98,50 @@
 
 			<context name='span' attribute='Styled Text' lineEndContext='#pop'>
 				<IncludeRules context='text'/>
 				<DetectChar attribute='Span Delimiter' context='#pop' char=']'/>
 			</context>
+
+			<context name='table' attribute='Normal Text' lineEndContext='#pop'>
+				<IncludeRules context='text'/>
+				<StringDetect attribute='Section Cue' String=':|:'/>
+				<StringDetect attribute='Section Cue' String=':+:'/>
+				<Detect2Chars attribute='Section Cue' char=':' char1='|'/>
+				<Detect2Chars attribute='Section Cue' char=':' char1='+'/>
+				<Detect2Chars attribute='Section Cue' char='|' char1=':'/>
+				<Detect2Chars attribute='Section Cue' char='+' char1=':'/>
+				<AnyChar attribute='Section Cue' String='|+'/>
+			</context>
 
 			<context name='macro' attribute='Macro' lineEndContext='#pop'>
 				<DetectSpaces context='#pop!macro-body'/>
 				<DetectChar attribute='Macro Delimiter' char='}' context='#pop'/>
 			</context>
 
 			<context name='macro-body' attribute='Styled Text' lineEndContext='#pop'>
-				<RegExpr String='\\.' attribute='Escaped Char'/>
+				<IncludeRules context='text'/>
 				<DetectChar attribute='Field Delimiter' char='|'/>
 				<DetectChar attribute='Macro Delimiter' char='}' context='#pop'/>
-				<IncludeRules context='span'/>
+			</context>
+
+			<context name='block-macro-ident' attribute='Macro' lineEndContext='#pop'>
+				<DetectSpaces context='#pop!block-macro'/>
+				<IncludeRules context='text'/>
+			</context>
+
+			<context name='block-macro' attribute='Styled Text' lineEndContext='#pop'>
+				<RegExpr String='\\.' attribute='Escaped Char'/>
+				<DetectChar attribute='Field Delimiter' char='|'/>
+				<IncludeRules context='text'/>
+			</context>
+
+			<context name='block-deref-ident' attribute='Identifier' lineEndContext='#pop'>
+				<DetectSpaces context='#pop!block-deref'/>
+			</context>
+
+			<context name='block-deref' attribute='Styled Text' lineEndContext='#pop'>
+				<IncludeRules context='text'/>
 			</context>
 
 			<context name='span-emph' attribute='Emphatic Text' lineEndContext='#pop'>
 				<IncludeRules context='span'/>
 			</context>
@@ -111,11 +154,11 @@
 				<IncludeRules context='span'/>
 			</context>
 
 			<context name='span-cue' attribute='Span Cue' lineEndContext='#pop' fallthroughContext="error">
 				<StringDetect attribute='Span Cue' String='`\' context='#pop!flat-span' />
-				<StringDetect attribute='Span Cue' String='\\' context='#pop!flat-span' />
+				<StringDetect attribute='Span Cue' String='"' context='#pop!flat-span' />
 
 				<DetectChar   attribute='Span Cue' char='!' context='#pop!span-emph' />
 				<DetectChar   attribute='Span Cue' char='*' context='#pop!span-strong' />
 				<DetectChar   attribute='Span Cue' char='~' context='#pop!span-del' />
 
@@ -122,14 +165,14 @@
 				<AnyChar      attribute='Span Cue' String='`$+🔒' context='#pop!span' />
 				<StringDetect attribute='Span Cue' String='→' context='#pop!ref' />
 				<StringDetect attribute='Span Cue' String='🔗' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='>' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='^' context='#pop!ref' />
-				<DetectChar   attribute='Span Cue' char='"' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='&amp;' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='#' context='#pop!var-ref' />
 				<DetectChar   attribute='Span Cue' char='\' context='#pop!flat-span' />
+				<DetectChar   attribute='Span Cue' char='=' context='#pop!inline-math' />
 				<Detect2Chars attribute='Comment' char='%' char1='%' context='#pop!inline-comment' />
 				<Detect2Chars attribute='Critical Directive Cue' char='%' char1='!' context='#pop!inline-directive' />
 				<DetectChar   attribute='Directive Cue' char='%' context='#pop!inline-directive' />
 			</context>
 
@@ -146,10 +189,20 @@
 			<context name='inline-directive' attribute='Directive' lineEndContext='#pop'>
 				<IncludeRules context='flat-span'/>
 				<AnyChar String=".:!#$%@~'&quot;" attribute='Directive Cue'/>
 				<DetectSpaces context='#pop!span'/>
 			</context>
+
+			<context name='inline-math' attribute='Emphatic Text' lineEndContext='#pop'>
+				<RegExpr String="\b[\d.,]+" attribute="Literal Block"/>
+				<RegExpr String="\b0x[a-fA-F\d.,]+" attribute="Literal Block"/>
+				<RegExpr String="\b0o[0-7]+" attribute="Literal Block"/>
+				<RegExpr String="\b\w+\(" attribute="Resource Identifier"/>
+				<DetectChar char=')' attribute="Resource Identifier"/>
+				<AnyChar String="+-/÷*×=!%^&amp;|&#172;?" attribute="Strong Text"/>
+				<IncludeRules context='span'/>
+			</context>
 
 			<context name='ref' attribute='Reference' lineEndContext='#pop'>
 				<IncludeRules context='flat-span'/>
 				<DetectSpaces context='#pop!span'/>
 			</context>
@@ -176,10 +229,11 @@
 			<itemData name='Emphatic Text' defStyleNum='dsNormal' italic='true'/>
 			<itemData name='Strong Text' defStyleNum='dsNormal' bold='true'/>
 			<itemData name='Deleted Text' defStyleNum='dsNormal' strikeOut='true'/>
 				
 			<itemData name='Section Cue' defStyleNum='dsKeyword' bold='true'/>
+			<itemData name='Deref Cue' defStyleNum='dsKeyword' bold='true'/>
 			<itemData name='Header' defStyleNum='dsControlFlow' underline='true'/>
 			<itemData name='Identifier' defStyleNum='dsVariable'/>
 
 			<itemData name='Unstyled Text' defStyleNum='dsVerbatimString'/>
 			<itemData name='Escaped Char' defStyleNum='dsSpecialChar'/>

Index: ext/toc.lua
==================================================================
--- ext/toc.lua
+++ ext/toc.lua
@@ -207,11 +207,11 @@
             local function scandoc(doc, depth)
 	            for i, sec in ipairs(doc.secorder) do
 						table.insert(all, {ref = sec, depth = sec.depth + depth})
 						for j, block in ipairs(sec.blocks) do
 							if blockHasSubdoc(block) then
-								scandoc(block.doc, depth + sec.depth-1)
+								scandoc(block.doc, depth + sec.depth-10)
 							end
 						end
 	            end
             end