improve as.code of formula

Author: grlloyd

R/struct_class.R

@@ -736,7 +736,7 @@ setMethod(f = 'as.code',
                 str=paste0(str,P[p], ' = ', val)
 
             } else if (is(val,'formula')) {
-                str=paste0(str,P[p], ' = ',capture.output(print(val)))
+                str=paste0(str,P[p], ' = ',deparse1(val))
             } else if (is.null(val)) {
                 str=paste0(str,P[p], ' = ','NULL')
             } else {

R/zzz.R

@@ -184,9 +184,12 @@ stringify_params = function(M,P,type='param',val=NULL) {
             } else if (is(val,'character')) {
                 d=paste0(d,'\\code{"',val,'"}.')
             } else if (is.function(val) | is.call(val)) {
-                d=paste0(d,'\\code{',gsub('}','\\}',
-                                          paste0(trimws(deparse(val)),collapse='')),'}.')
+                d=paste0(d,
+                         '\\code{',gsub('}','\\}',
+                         paste0(trimws(deparse1(val)),collapse='')),'}.')
                 #d=paste0(d,'\\code{some_function()}.')
+            } else if (is(val,'formula')) {
+                d = paste0('\\code{',deparse1(val),'}.')
             } else {
 
                 d=paste0(d,'\\code{',val,'}.\\cr')