Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions contrib/julia-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@

; TODO: skip keywords inside strings

; fixme? is the line-beginning-position necessary?
; Currently you are fine with this kind of comment:
; # Here's a comment with the word "for" in it
; but not with this:
; x = 5 # Here's another comment with the word "for" in it
(defun in-comment ()
(equal (char-after (+ (line-beginning-position) (current-indentation)))
?#))
Expand Down
24 changes: 24 additions & 0 deletions extras/color.jl
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,27 @@ const _jl_color_names = {
"yellowgreen" => (154, 205, 50),
}

## Color spaces
abstract ColorSpace
type CSnil <: ColorSpace
end
type CSgray <: ColorSpace
end
type CSsRGB <: ColorSpace
end
type CSCMYK <: ColorSpace
end
# Color space where each channel is given a name, e.g.,
# cs = CSNamed("GFP","tdTomato")
# or
# cs = CSNamed(["GFP","tdTomato"])
type CSNamed <: ColorSpace
str::Vector{ASCIIString}
end
CSNamed(t...) = CSNamed([t...]) # allow tuple
function ref(n::CSNamed,ind::Int)
return n.str[ind]
end
function assign(n::CSNamed,value,key)
n.str[key] = value
end
Loading