core-text: rename "render-info" to "rendered-line". Fixes #47.
							parent
							
								
									dba4b65aac
								
							
						
					
					
						commit
						2add84176e
					
				| 
						 | 
					@ -47,10 +47,10 @@ ERROR: not-a-string object ;
 | 
				
			||||||
        CTLineCreateWithAttributedString
 | 
					        CTLineCreateWithAttributedString
 | 
				
			||||||
    ] with-destructors ;
 | 
					    ] with-destructors ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: line < disposable line metrics image loc dim render-info ;
 | 
					TUPLE: line < disposable line metrics image loc dim rendered-line ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: render-info font string loc dim ;
 | 
					TUPLE: rendered-line font string loc dim ;
 | 
				
			||||||
C: <render-info> render-info
 | 
					C: <rendered-line> rendered-line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: typographic-bounds ( line -- width ascent descent leading )
 | 
					: typographic-bounds ( line -- width ascent descent leading )
 | 
				
			||||||
    { CGFloat CGFloat CGFloat }
 | 
					    { CGFloat CGFloat CGFloat }
 | 
				
			||||||
| 
						 | 
					@ -129,7 +129,7 @@ C: <render-info> render-info
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        line >>line
 | 
					        line >>line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        font string loc dim <render-info> >>render-info
 | 
					        font string loc dim <rendered-line> >>rendered-line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        metrics >>metrics
 | 
					        metrics >>metrics
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -140,10 +140,10 @@ C: <render-info> render-info
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:: render ( line -- line image )
 | 
					:: render ( line -- line image )
 | 
				
			||||||
    line line>> :> ctline
 | 
					    line line>> :> ctline
 | 
				
			||||||
    line render-info>> string>> :> string
 | 
					    line rendered-line>> string>> :> string
 | 
				
			||||||
    line render-info>> font>> :> font
 | 
					    line rendered-line>> font>> :> font
 | 
				
			||||||
    line render-info>> loc>> :> loc
 | 
					    line rendered-line>> loc>> :> loc
 | 
				
			||||||
    line render-info>> dim>> :> dim
 | 
					    line rendered-line>> dim>> :> dim
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    line dim [
 | 
					    line dim [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue