VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-08 19:44:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #135 from joedicastro/master

Browse Source 
Fixes #133
This commit is contained in:
mattn
2013-08-07 18:32:10 -07:00
parent 455f6f5760 7fb711c257
commit db7c3bebc8
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/emmet/lang/haml.vim
View File

@@ -120,8 +120,11 @@ function! emmet#lang#haml#imageSize()
if fn =~ '^\s*$' if fn =~ '^\s*$'
return return
elseif fn !~ '^\(/\|http\)' elseif fn !~ '^\(/\|http\)'
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn) let fn = simplify(expand('%:h') . '/' . fn)
endif endif
endif
let [width, height] = emmet#util#getImageSize(fn) let [width, height] = emmet#util#getImageSize(fn)
if width == -1 && height == -1 if width == -1 && height == -1

3
autoload/emmet/lang/html.vim
View File

@@ -444,8 +444,11 @@ function! emmet#lang#html#imageSize()
if fn =~ '^\s*$' if fn =~ '^\s*$'
return return
elseif fn !~ '^\(/\|http\)' elseif fn !~ '^\(/\|http\)'
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn) let fn = simplify(expand('%:h') . '/' . fn)
endif endif
endif
let [width, height] = emmet#util#getImageSize(fn) let [width, height] = emmet#util#getImageSize(fn)
if width == -1 && height == -1 if width == -1 && height == -1

3
autoload/emmet/lang/slim.vim
View File

@@ -98,8 +98,11 @@ function! emmet#lang#slim#imageSize()
if fn =~ '^\s*$' if fn =~ '^\s*$'
return return
elseif fn !~ '^\(/\|http\)' elseif fn !~ '^\(/\|http\)'
let fn = resolve(expand(fn))
if !filereadable(fn)
let fn = simplify(expand('%:h') . '/' . fn) let fn = simplify(expand('%:h') . '/' . fn)
endif endif
endif
let [width, height] = emmet#util#getImageSize(fn) let [width, height] = emmet#util#getImageSize(fn)
if width == -1 && height == -1 if width == -1 && height == -1

5
autoload/emmet/util.vim
View File

@@ -241,11 +241,16 @@ function! emmet#util#getImageSize(fn)
endfunction endfunction
function! emmet#util#imageSizeWithImageMagick(fn) function! emmet#util#imageSizeWithImageMagick(fn)
let fn = a:fn
if filereadable(fn)
let img_info = system('identify -format "%wx%h" "'.a:fn.'"') let img_info = system('identify -format "%wx%h" "'.a:fn.'"')
let img_size = split(substitute(img_info, '\n', '', ''), 'x') let img_size = split(substitute(img_info, '\n', '', ''), 'x')
let width = img_size[0] let width = img_size[0]
let height = img_size[1] let height = img_size[1]
return [width, height] return [width, height]
else
echo 'The file "'.fn.'" does not exist or is not readable'
return [-1, -1]
endfunction endfunction
function! emmet#util#isImageMagickInstalled() function! emmet#util#isImageMagickInstalled()