2 files changed, 10 insertions, 2 deletions
diff --git a/templates/shortcodes/img.html b/templates/shortcodes/img.html
index 4645569..cf2a562 100644
--- a/templates/shortcodes/img.html
+++ b/templates/shortcodes/img.html
@@ -16,6 +16,13 @@
 
 {%- endif %}
 
+{%- if not w or not h %}
+  {%- set metafile = page.path ~ path ~ src %}
+  {%- set meta = get_image_metadata(path=metafile) %}
+  {%- set w = meta.width %}
+  {%- set h = meta.height %}
+{%- endif %}
+
 {%- set img = src | split(pat="/") | last %}
 {%- set name = img | split(pat=".") | first %}
 <img src="{{ path | safe }}{{ img | safe }}"{% if class %} class="{{class}}"{% endif %}{% if alt %} alt="{{alt}}"{% endif %}{% if w %} width="{{w}}"{% endif %}{% if h %} height="{{h}}"{% endif %} />
diff --git a/templates/shortcodes/imghover.html b/templates/shortcodes/imghover.html
index b1af3f9..1ad733c 100644
--- a/templates/shortcodes/imghover.html
+++ b/templates/shortcodes/imghover.html
@@ -69,9 +69,10 @@
       {%- set metafile = page.path ~ path ~ sourcepath %}
       {%- set meta = get_image_metadata(path=metafile) %}
       {%- set padding = meta.height / meta.width * p %}
-      /* height={{meta.height}} width={{meta.width}} (THIS IS BACKWARDS!?) */
     {%- else %}
-      {%- set padding = 50 %}
+      {%- set metafile = page.path ~ path ~ sourcepath %}
+      {%- set meta = get_image_metadata(path=metafile) %}
+      {%- set padding = meta.height / meta.width * 50 %}
     {%- endif %}