macros/core.rb in glyph-0.4.1 vs macros/core.rb in glyph-0.4.2
- old
+ new
@@ -129,13 +129,13 @@
value
end
macro :condition do
min_parameters 1
- max_parameters 2
+ max_parameters 3
res = param(0)
- (res.blank? || res == "false") ? "" : param(1).to_s
+ (res.blank? || res == "false") ? param(2).to_s : param(1).to_s
end
macro :eq do
within :condition
min_parameters 1
@@ -191,9 +191,13 @@
macro_error "Macro '#{macro_name}' cannot be defined by itself"
end
end
Glyph.rewrite macro_name, raw_param(1).dup
nil
+end
+
+macro "output?" do
+ Glyph['document.output'].in? parameters
end
macro_alias '--' => :comment
macro_alias '&' => :snippet
macro_alias '&:' => 'snippet:'