Re: [O] extra paragraph in image export?

2017-01-25 Thread Matt Price
(I totally misread the patch, sorry. duh.)

On Wed, Jan 25, 2017 at 11:59 AM, Nicolas Goaziou 
wrote:

> Hello,
>
> Rasmus  writes:
>
> >> So would the following patch fix the issue?
> >
> > Looks fine to me.
> >
> > Thanks!
>
> Applied. Thank you.
>
> Regards,
>
> --
> Nicolas Goaziou
>
>


Re: [O] extra paragraph in image export?

2017-01-25 Thread Nicolas Goaziou
Hello,

Rasmus  writes:

>> So would the following patch fix the issue?
>
> Looks fine to me.
>
> Thanks!

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou



Re: [O] extra paragraph in image export?

2017-01-25 Thread Rasmus
> So would the following patch fix the issue?

Looks fine to me.

Thanks!

Rasmus

-- 
The second rule of Fight Club is: You do not talk about Fight Club




Re: [O] extra paragraph in image export?

2017-01-25 Thread Rasmus
Hi,

>> I'm not sure. Doesn't look like it to me -- I would instead have put:
>>
>> -(format "\n%s" contents)
>> +(format "\n%s" contents)
>>
>> Because we never want the  tag inside the figure. Isn't that right?
>
> I don't think so. When `org-html-html5-fancy' is non-nil, "ox-html.el"
> uses  tags to separate image and caption. 

I agree that the  could be retained in the non-HTML5 case.  That
corresponds to the W3 example below.  Note, strictly speaking I guess the
non-HTML5 org html output is not necessarily "HTML4", so the example may
not apply.

https://www.w3.org/Style/Examples/007/figures.en.html#Illustrati

> Moreover, there is no  in that case, but a  class=\"figure\">. Can't this contain a  block element?

Yes.  HTML5 "figure" can hold "p" as well, but it's not necessary, and it
seems to be uncommon.

Rasmus

-- 
Human: An animal that complicates things more than strictly necessary




Re: [O] extra paragraph in image export?

2017-01-25 Thread Nicolas Goaziou
Hello,

Matt Price  writes:

> I'm not sure. Doesn't look like it to me -- I would instead have put:
>
> -(format "\n%s" contents)
> +(format "\n%s" contents)
>
> Because we never want the  tag inside the figure. Isn't that right?

I don't think so. When `org-html-html5-fancy' is non-nil, "ox-html.el"
uses  tags to separate image and caption. 

Moreover, there is no  in that case, but a . Can't this contain a  block element?

Regards,

-- 
Nicolas Goaziou



Re: [O] extra paragraph in image export?

2017-01-24 Thread Matt Price
On Tue, Jan 24, 2017 at 4:27 PM, Nicolas Goaziou 
wrote:

> Hello,
>
> Rasmus  writes:
>
> > I'm not an expert of HTML either.  However, the "p" tag inside the
> > "figure" is uncommon looking a bit on the example usages online.  Thus, I
> > agree with Matt that it should probably not be there.
>
> OK.
>
> > AFAIK, the CSS selector still differs so on the output side they are not
> > alike.  I.e. the former is "figure>img" the other is a "p>img".  Aside:
> If
> > anything, removing the "p" tag inside the figure would make it easier to
> > handle images.
>
> So would the following patch fix the issue?
>
>
I'm not sure. Doesn't look like it to me -- I would instead have put:

-(format "\n%s" contents)
+(format "\n%s" contents)

Because we never want the  tag inside the figure. Isn't that right?


Re: [O] extra paragraph in image export?

2017-01-24 Thread Matt Price
On Tue, Jan 24, 2017 at 4:27 PM, Nicolas Goaziou 
wrote:

> Hello,
>
> Rasmus  writes:
>
> > I'm not an expert of HTML either.  However, the "p" tag inside the
> > "figure" is uncommon looking a bit on the example usages online.  Thus, I
> > agree with Matt that it should probably not be there.
>
> OK.
>
> > AFAIK, the CSS selector still differs so on the output side they are not
> > alike.  I.e. the former is "figure>img" the other is a "p>img".  Aside:
> If
> > anything, removing the "p" tag inside the figure would make it easier to
> > handle images.
>
> So would the following patch fix the issue?
>
> Regards,
>
> --
> Nicolas Goaziou
>


Re: [O] extra paragraph in image export?

2017-01-24 Thread Nicolas Goaziou
Hello,

Rasmus  writes:

> I'm not an expert of HTML either.  However, the "p" tag inside the
> "figure" is uncommon looking a bit on the example usages online.  Thus, I
> agree with Matt that it should probably not be there.

OK.

> AFAIK, the CSS selector still differs so on the output side they are not
> alike.  I.e. the former is "figure>img" the other is a "p>img".  Aside: If
> anything, removing the "p" tag inside the figure would make it easier to
> handle images.

So would the following patch fix the issue?

Regards,

-- 
Nicolas Goaziou
>From 49ebd5a8406bdee0c0a94b83f7135d94e35bb6ba Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Tue, 24 Jan 2017 22:22:47 +0100
Subject: [PATCH] ox-html: Remove  tag around block images when using HTML5

* lisp/ox-html.el (org-html--wrap-image): Do not add a spurious 
  tag when using  to mark images.
---
 lisp/ox-html.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index d3c1b2eb1..fa8476a05 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1607,7 +1607,7 @@ arguments CAPTION and LABEL are given, use them for caption and
 	;; ID.
 	(if (org-string-nw-p label) (format " id=\"%s\"" label) "")
 	;; Contents.
-	(format "\n%s" contents)
+	(if html5-fancy contents (format "\n%s" contents))
 	;; Caption.
 	(if (not (org-string-nw-p caption)) ""
 	  (format (if html5-fancy "\n%s"
-- 
2.11.0



Re: [O] extra paragraph in image export?

2017-01-24 Thread Rasmus
Hi,

>> with org-html-html5-fancy is non-nil, images are exported with something
>> like this code:
>>
>> 
>> https://imgs.xkcd.com/comics/proof_2x.png; alt="proof_2x.png"
>> class="fragment (appear) visible current-fragment"
>> data-fragment-index="0">
>> 

I'm not an expert of HTML either.  However, the "p" tag inside the
"figure" is uncommon looking a bit on the example usages online.  Thus, I
agree with Matt that it should probably not be there.

> I'm not well-versed enough in HTML to answer this, but, from Org POV,
> there should be a difference between
>
>   A paragraph
>
>   #+caption: foo
>   [[block-image.png]]
>
>   Another paragraph
>
>
> and
>
>   A paragraph with an [[inline-image.png]] and some text following.
>
> Would removing the  tag blur the difference between the two examples
> above ?

(I hope I understand your concern correctly).

AFAIK, the CSS selector still differs so on the output side they are not
alike.  I.e. the former is "figure>img" the other is a "p>img".  Aside: If
anything, removing the "p" tag inside the figure would make it easier to
handle images.

Rasmus

-- 
Vote for proprietary math!




Re: [O] extra paragraph in image export?

2017-01-22 Thread Nicolas Goaziou
Hello,

Matt Price  writes:

> with org-html-html5-fancy is non-nil, images are exported with something
> like this code:
>
> 
> https://imgs.xkcd.com/comics/proof_2x.png; alt="proof_2x.png"
> class="fragment (appear) visible current-fragment"
> data-fragment-index="0">
> 
>
>
> At least in ox-reveal, this makes it quite difficult to address images
> separately from text (e.g., to set the text-align property appropriately.
> You can try this if you have ox-reveal installed with any simple image:
> --
> * Test
> [[https://imgs.xkcd.com/comics/proof_2x.png]]
>
> 
> At least on my machine, the image won't be centered in the resultant slide,
> and it will be hard to construct CSS to fix the issue.
>
> Is there a strong reason to include the  tag? I've removed it from
> org-html--wrap-image and haven't noticed any ill effects so far, but
> haven't done much testing.

I'm not well-versed enough in HTML to answer this, but, from Org POV,
there should be a difference between

  A paragraph

  #+caption: foo
  [[block-image.png]]

  Another paragraph


and

  A paragraph with an [[inline-image.png]] and some text following.

Would removing the  tag blur the difference between the two examples
above ?


Regards,

-- 
Nicolas Goaziou



Re: [O] extra paragraph in image export?

2017-01-21 Thread Matt Price
On Sat, Jan 21, 2017 at 11:26 AM, Matt Price  wrote:

> with org-html-html5-fancy is non-nil, images are exported with something
> like this code:
>
> 
> https://imgs.xkcd.com/comics/proof_2x.png;
> alt="proof_2x.png" class="fragment (appear) visible current-fragment"
> data-fragment-index="0">
> 
>
> There is some cruft in here -- I hastily copied from `inspect element`
instead of from the code itself, and also included some ox-reveal-specific
markup.  This is a more representative output:

https://imgs.xkcd.com/comics/proof_2x.png;
alt="proof_2x.png">


The following's still true:

>
> At least in ox-reveal, this makes it quite difficult to address images
> separately from text (e.g., to set the text-align property appropriately).
> You can try this if you have ox-reveal installed with any simple image:
> --
> * Test
> [[https://imgs.xkcd.com/comics/proof_2x.png]]
>
> 
> At least on my machine, the image won't be centered in the resultant
> slide, and it will be hard to construct CSS to fix the issue.
>
> Is there a strong reason to include the  tag? I've removed it from
> org-html--wrap-image and haven't noticed any ill effects so far, but
> haven't done much testing.
>
>


[O] extra paragraph in image export?

2017-01-21 Thread Matt Price
with org-html-html5-fancy is non-nil, images are exported with something
like this code:


https://imgs.xkcd.com/comics/proof_2x.png; alt="proof_2x.png"
class="fragment (appear) visible current-fragment"
data-fragment-index="0">



At least in ox-reveal, this makes it quite difficult to address images
separately from text (e.g., to set the text-align property appropriately.
You can try this if you have ox-reveal installed with any simple image:
--
* Test
[[https://imgs.xkcd.com/comics/proof_2x.png]]


At least on my machine, the image won't be centered in the resultant slide,
and it will be hard to construct CSS to fix the issue.

Is there a strong reason to include the  tag? I've removed it from
org-html--wrap-image and haven't noticed any ill effects so far, but
haven't done much testing.