From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Machulis Subject: [PATCH] ox-html: Fix meta tag output for properties Date: Sat, 1 Jun 2013 15:12:00 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=bcaec53aecea437ca104de1f0545 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uiu1q-0005QG-HS for emacs-orgmode@gnu.org; Sat, 01 Jun 2013 18:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uiu1p-0003Yn-J9 for emacs-orgmode@gnu.org; Sat, 01 Jun 2013 18:12:02 -0400 Received: from mail-vc0-f173.google.com ([209.85.220.173]:51174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uiu1p-0003Yi-DV for emacs-orgmode@gnu.org; Sat, 01 Jun 2013 18:12:01 -0400 Received: by mail-vc0-f173.google.com with SMTP id ht10so1900606vcb.32 for ; Sat, 01 Jun 2013 15:12:00 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode --bcaec53aecea437ca104de1f0545 Content-Type: multipart/alternative; boundary=bcaec53aecea437c9404de1f0543 --bcaec53aecea437c9404de1f0543 Content-Type: text/plain; charset=ISO-8859-1 There are a few document properties (author, description, keywords) that should automatically be made meta tags if they exist on export. These were currently being checked as part of an and block that would evaluate both, creating the string, then just return a newline on success, meaning the meta tags were never added to the document (since they're part of a larger concat that never got the string added to it). This patch wraps the needed logic check into a when, then concats the tag creation and newline addition to return. --bcaec53aecea437c9404de1f0543 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
There are a few document properties (author, description, = keywords) that should automatically be made meta tags if they exist on expo= rt. These were currently being checked as part of an and block that would e= valuate both, creating the string, then just return a newline on success, m= eaning the meta tags were never added to the document (since they're pa= rt of a larger concat that never got the string added to it). This patch wr= aps the needed logic check into a when, then concats the tag creation and n= ewline addition to return.
--bcaec53aecea437c9404de1f0543-- --bcaec53aecea437ca104de1f0545 Content-Type: application/octet-stream; name="0001-ox-html.el-Fix-output-of-meta-tags-when-properties-a.patch" Content-Disposition: attachment; filename="0001-ox-html.el-Fix-output-of-meta-tags-when-properties-a.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hhfcuntg0 RnJvbSBkMGE1NGNmZmU4NDQ1YzJiMDJiNmExNTBjMzhhYjEyYzYyNTFiY2M3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLeWxlIE1hY2h1bGlzIDxreWxlQG5vbnBvbHlub21pYWwuY29t PgpEYXRlOiBTYXQsIDEgSnVuIDIwMTMgMTU6MDQ6MTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBv eC1odG1sLmVsOiBGaXggb3V0cHV0IG9mIG1ldGEgdGFncyB3aGVuIHByb3BlcnRpZXMgYXJlCiBw cmVzZW50CgoqIGxpc3Avb3gtaHRtbC5lbCAob3JnLWh0bWwtLWJ1aWxkLW1ldGEtaW5mbyk6IEZp eCBvdXRwdXQgb2YgbWV0YSB0YWdzCiAgd2hlbiBwcm9wZXJ0aWVzIGFyZSBwcmVzZW50CgpUSU5Z Q0hBTkdFCi0tLQogbGlzcC9veC1odG1sLmVsIHwgMzcgKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDE4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3gtaHRtbC5lbCBiL2xpc3Avb3gtaHRtbC5lbApp bmRleCBmYWNkODRjLi41ZTRhZDdiIDEwMDY0NAotLS0gYS9saXNwL294LWh0bWwuZWwKKysrIGIv bGlzcC9veC1odG1sLmVsCkBAIC0xNTE4LDI0ICsxNTE4LDI1IEBAIElORk8gaXMgYSBwbGlzdCB1 c2VkIGFzIGEgY29tbXVuaWNhdGlvbiBjaGFubmVsLiIKICAgICAgIGNoYXJzZXQpICJcbiIKICAg ICAgKG9yZy1odG1sLWNsb3NlLXRhZyAibWV0YSIgIiBuYW1lPVwiZ2VuZXJhdG9yXCIgY29udGVu dD1cIk9yZy1tb2RlXCIiIGluZm8pCiAgICAgICJcbiIKLSAgICAgKGFuZCAob3JnLXN0cmluZy1u dy1wIGF1dGhvcikKLQkgIChvcmctaHRtbC1jbG9zZS10YWcgIm1ldGEiCi0JCQkgICAgICAoZm9y bWF0ICIgbmFtZT1cImF1dGhvclwiIGNvbnRlbnQ9XCIlc1wiIgotCQkJCSAgICAgIChmdW5jYWxs IHByb3RlY3Qtc3RyaW5nIGF1dGhvcikpCi0JCQkgICAgICBpbmZvKQotCSAgIlxuIikKLSAgICAg KGFuZCAob3JnLXN0cmluZy1udy1wIGRlc2NyaXB0aW9uKQotCSAgKG9yZy1odG1sLWNsb3NlLXRh ZyAibWV0YSIKLQkJCSAgICAgIChmb3JtYXQgIiBuYW1lPVwiZGVzY3JpcHRpb25cIiBjb250ZW50 PVwiJXNcIlxuIgotCQkJCSAgICAgIChmdW5jYWxsIHByb3RlY3Qtc3RyaW5nIGRlc2NyaXB0aW9u KSkKLQkJCSAgICAgIGluZm8pCi0JICAiXG4iKQotICAgICAoYW5kIChvcmctc3RyaW5nLW53LXAg a2V5d29yZHMpCi0JICAob3JnLWh0bWwtY2xvc2UtdGFnICJtZXRhIgotCQkJICAgICAgKGZvcm1h dCAiIG5hbWU9XCJrZXl3b3Jkc1wiIGNvbnRlbnQ9XCIlc1wiIgotCQkJCSAgICAgIChmdW5jYWxs IHByb3RlY3Qtc3RyaW5nIGtleXdvcmRzKSkKLQkJCSAgICAgIGluZm8pCi0JICAiXG4iKSkpKQor CisgICAgICh3aGVuIChvcmctc3RyaW5nLW53LXAgYXV0aG9yKQorICAgICAgIChjb25jYXQgKG9y Zy1odG1sLWNsb3NlLXRhZyAibWV0YSIKKwkJCQkgICAoZm9ybWF0ICIgbmFtZT1cImF1dGhvclwi IGNvbnRlbnQ9XCIlc1wiIgorCQkJCQkgICAoZnVuY2FsbCBwcm90ZWN0LXN0cmluZyBhdXRob3Ip KQorCQkJCSAgIGluZm8pCisJICAgICAgICJcbiIpKQorICAgICAod2hlbiAob3JnLXN0cmluZy1u dy1wIGRlc2NyaXB0aW9uKQorICAgICAgIChjb25jYXQgKG9yZy1odG1sLWNsb3NlLXRhZyAibWV0 YSIKKwkJCQkgICAoZm9ybWF0ICIgbmFtZT1cImRlc2NyaXB0aW9uXCIgY29udGVudD1cIiVzXCIi CisJCQkJCSAgIChmdW5jYWxsIHByb3RlY3Qtc3RyaW5nIGRlc2NyaXB0aW9uKSkKKwkJCQkgICBp bmZvKQorCSAgICAgICAiXG4iKSkKKyAgICAgKHdoZW4gKG9yZy1zdHJpbmctbnctcCBrZXl3b3Jk cykKKyAgICAgICAoY29uY2F0IChvcmctaHRtbC1jbG9zZS10YWcgIm1ldGEiCisJCQkJICAgKGZv cm1hdCAiIG5hbWU9XCJrZXl3b3Jkc1wiIGNvbnRlbnQ9XCIlc1wiIgorCQkJCQkgICAoZnVuY2Fs bCBwcm90ZWN0LXN0cmluZyBrZXl3b3JkcykpCisJCQkJICAgaW5mbykKKwkgICAgICAgIlxuIikp KSkpCiAKIChkZWZ1biBvcmctaHRtbC0tYnVpbGQtaGVhZCAoaW5mbykKICAgIlJldHVybiBpbmZv cm1hdGlvbiBmb3IgdGhlIDxoZWFkPi4uPC9oZWFkPiBvZiB0aGUgSFRNTCBvdXRwdXQuCi0tIAox LjguMi4zCgo= --bcaec53aecea437ca104de1f0545--