From mboxrd@z Thu Jan 1 00:00:00 1970 From: "David O'Toole" Subject: user control of source block header line exporting formats Date: Sat, 31 Jul 2010 16:54:57 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=000e0ce0d87a231393048cb52ebb Return-path: Received: from [140.186.70.92] (port=45247 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OfJ5A-0002Ip-8P for emacs-orgmode@gnu.org; Sat, 31 Jul 2010 16:55:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OfJ59-0000HY-5J for emacs-orgmode@gnu.org; Sat, 31 Jul 2010 16:55:00 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:41581) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OfJ58-0000HT-U6 for emacs-orgmode@gnu.org; Sat, 31 Jul 2010 16:54:59 -0400 Received: by wwi14 with SMTP id 14so2188843wwi.30 for ; Sat, 31 Jul 2010 13:54:58 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode Mailinglist --000e0ce0d87a231393048cb52ebb Content-Type: text/plain; charset=ISO-8859-1 I've attached a diff of my apparently-working changes to allow better control of the way ob-exp.el formats the name and arguments of source code blocks. What do you think? --000e0ce0d87a231393048cb52ebb Content-Type: text/x-patch; charset=US-ASCII; name="caption-formatting.diff" Content-Disposition: attachment; filename="caption-formatting.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gcaxwayh0 ZGlmZiAtLWdpdCBhL2xpc3Avb2ItZXhwLmVsIGIvbGlzcC9vYi1leHAuZWwKaW5kZXggNzk2ODEy Yy4uMGMzNDQzMSAxMDA2NDQKLS0tIGEvbGlzcC9vYi1leHAuZWwKKysrIGIvbGlzcC9vYi1leHAu ZWwKQEAgLTIwNiw0MiArMjA2LDY2IEBAIFRoZSBmdW5jdGlvbiByZXNwZWN0cyB0aGUgdmFsdWUg b2YgdGhlIDpleHBvcnRzIGhlYWRlciBhcmd1bWVudC4iCiAJCSAgICAgKG9yZy1iYWJlbC1leHAt cmVzdWx0cyBpbmZvIHR5cGUpKSkpKSkKIAogKGRlZnZhciBiYWNrZW5kKQorCisoZGVmdmFyIG9y Zy1iYWJlbC1mb3JtYXQtY29kZS1mdW5jdGlvbnMKKyAgJyhpbmxpbmUgb3JnLWJhYmVsLWZvcm1h dC1jb2RlLWlubGluZQorICAgIGJsb2NrIG9yZy1iYWJlbC1mb3JtYXQtY29kZS1ibG9jaworICAg IGxvYiBvcmctYmFiZWwtZm9ybWF0LWNvZGUtbG9iKSkKKworKGRlZnVuIG9yZy1iYWJlbC1mb3Jt YXQtY29kZS1pbmxpbmUgKGxhbmcgYm9keSBhcmdzIHN3aXRjaGVzIG5hbWUpIAorICAoZm9ybWF0 ICI9JXM9IiBib2R5KSkKKworKGRlZnZhciBvcmctYmFiZWwtZm9ybWF0LWNvZGUtYmxvY2stY29u dHJvbC1zdHJpbmcgIiVzKCVzKSIpCisKKyhkZWZ1biBvcmctYmFiZWwtZm9ybWF0LWNvZGUtYmxv Y2stZGVmYXVsdC1zdHlsZSAoaW5mbykKKyAgKGRlc3RydWN0dXJpbmctYmluZCAobGFuZyBib2R5 IGFyZ3MwIHN3aXRjaGVzIG5hbWUgJnJlc3QgaWdub3JlKSBpbmZvCisgICAgKGZvcm1hdCBvcmct YmFiZWwtZm9ybWF0LWNvZGUtYmxvY2stY29udHJvbC1zdHJpbmcKKwkgICAgbmFtZQorCSAgICAo bWFwY29uY2F0ICMnaWRlbnRpdHkgYXJncyAiLCAiKSkpKQorCisoZGVmdW4gb3JnLWJhYmVsLWZv cm1hdC1jb2RlLWJsb2NrLWFsdGVybmF0ZS1zdHlsZSAoaW5mbykKKyAgKGRlc3RydWN0dXJpbmct YmluZCAobGFuZyBib2R5IGFyZ3MwIHN3aXRjaGVzIG5hbWUgJnJlc3QgaWdub3JlKSBpbmZvCisg ICAgKGZvcm1hdCAiU09VUkNFOiAlcyBBUkdVTUVOVFM6ICVzIExBTkdVQUdFOiAlcyIKKwkgICAg bmFtZSAoaWYgKG51bGwgYXJncykgIk5vbmUuIgorCQkgICAgIChtYXBjb25jYXQgIydpZGVudGl0 eSBhcmdzICIsICIpKQorCSAgICBsYW5nKSkpCisKKyhkZWZ2YXIgb3JnLWJhYmVsLWZvcm1hdC1j b2RlLWJsb2NrLWNhcHRpb24tZnVuY3Rpb24KKyAgJ29yZy1iYWJlbC1mb3JtYXQtY29kZS1ibG9j ay1kZWZhdWx0LXN0eWxlKSAKKworKGRlZnVuIG9yZy1iYWJlbC1mb3JtYXQtY29kZS1ibG9jayAo bGFuZyBib2R5IGFyZ3Mgc3dpdGNoZXMgbmFtZSkgCisgIChsZXQgKChzdHIKKwkgKGZvcm1hdCAi IytCRUdJTl9TUkMgJXMgJXNcbiVzJXMjK0VORF9TUkNcbiIgbGFuZyBzd2l0Y2hlcyBib2R5CisJ CSAoaWYgKGFuZCBib2R5IChzdHJpbmctbWF0Y2ggIlxuJCIgYm9keSkpCisJCSAgICAgIiIgIlxu IikpKSkKKyAgICAod2hlbiBuYW1lCisgICAgICAoYWRkLXRleHQtcHJvcGVydGllcworICAgICAg IDAgKGxlbmd0aCBzdHIpCisgICAgICAgKGxpc3QgJ29yZy1jYXB0aW9uCisJICAgICAoZnVuY2Fs bCBvcmctYmFiZWwtZm9ybWF0LWNvZGUtYmxvY2stY2FwdGlvbi1mdW5jdGlvbiAKKwkJICAgICAg KGxpc3QgbGFuZyBib2R5IGFyZ3Mgc3dpdGNoZXMgbmFtZSkpKQorICAgICAgIHN0cikpCisgICAg c3RyKSkKKworKGRlZnVuIG9yZy1iYWJlbC1mb3JtYXQtY29kZS1sb2IgKGxhbmcgYm9keSBhcmdz IHN3aXRjaGVzIG5hbWUpIAorICAobGV0ICgoY2FsbC1saW5lIChhbmQgKHN0cmluZy1tYXRjaCAi cmVzdWx0cz0iIChjYXIgYXJncykpCisJCQkoc3Vic3RyaW5nIChjYXIgYXJncykgKG1hdGNoLWVu ZCAwKSkpKSkKKyAgICAoY29uZAorICAgICAgKChlcSBiYWNrZW5kICdodG1sKQorICAgICAgIChm b3JtYXQgIlxuIytIVE1MOiA8bGFiZWwgY2xhc3M9XCJvcmctc3JjLW5hbWVcIj4lczwvbGFiZWw+ XG4iCisJICAgICAgIGNhbGwtbGluZSkpCisgICAgICAoKGZvcm1hdCAiOiAlc1xuIiBjYWxsLWxp bmUpKSkpKQorCiAoZGVmdW4gb3JnLWJhYmVsLWV4cC1jb2RlIChpbmZvIHR5cGUpCiAgICJQcmVw YXJlIGFuZCByZXR1cm4gY29kZSBpbiB0aGUgY3VycmVudCBjb2RlIGJsb2NrIGZvciBleHBvcnQu Ci1Db2RlIGlzIHByZXBhcmVkIGluIGEgbWFubmVyIHN1aXRhYmxlIGZvciBleHBvcnRhdCBieQor Q29kZSBpcyBwcmVwYXJlZCBpbiBhIG1hbm5lciBzdWl0YWJsZSBmb3IgZXhwb3J0IGJ5CiBvcmct bW9kZS4gIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGJ5IGBvcmctYmFiZWwtZXhwLWRvLWV4cG9y dCcuCiBUaGUgY29kZSBibG9jayBpcyBub3QgZXZhbHVhdGVkLiIKLSAgKGxldCAoKGxhbmcgKG50 aCAwIGluZm8pKQotICAgICAgICAoYm9keSAobnRoIDEgaW5mbykpCi0gICAgICAgIChzd2l0Y2hl cyAobnRoIDMgaW5mbykpCi0gICAgICAgIChuYW1lIChudGggNCBpbmZvKSkKLSAgICAgICAgKGFy Z3MgKG1hcGNhcgotCSAgICAgICAjJ2NkcgotCSAgICAgICAob3JnLXJlbW92ZS1pZi1ub3QgKGxh bWJkYSAoZWwpIChlcSA6dmFyIChjYXIgZWwpKSkgKG50aCAyIGluZm8pKSkpKQotICAgIChjYXNl IHR5cGUKLSAgICAgICgnaW5saW5lIChmb3JtYXQgIj0lcz0iIGJvZHkpKQotICAgICAgKCdibG9j awotCSAgKGxldCAoKHN0cgotCQkgKGZvcm1hdCAiIytCRUdJTl9TUkMgJXMgJXNcbiVzJXMjK0VO RF9TUkNcbiIgbGFuZyBzd2l0Y2hlcyBib2R5Ci0JCQkgKGlmIChhbmQgYm9keSAoc3RyaW5nLW1h dGNoICJcbiQiIGJvZHkpKQotCQkJICAgICAiIiAiXG4iKSkpKQotCSAgICAod2hlbiBuYW1lCi0J ICAgICAgKGFkZC10ZXh0LXByb3BlcnRpZXMKLQkgICAgICAgMCAobGVuZ3RoIHN0cikKLQkgICAg ICAgKGxpc3QgJ29yZy1jYXB0aW9uCi0JCSAgICAgKGZvcm1hdCAiJXMoJXMpIgotCQkJICAgICBu YW1lCi0JCQkgICAgIChtYXBjb25jYXQgIydpZGVudGl0eSBhcmdzICIsICIpKSkKLQkgICAgICAg c3RyKSkKLQkgICAgc3RyKSkKLSAgICAgICgnbG9iCi0gICAgICAgKGxldCAoKGNhbGwtbGluZSAo YW5kIChzdHJpbmctbWF0Y2ggInJlc3VsdHM9IiAoY2FyIGFyZ3MpKQotCQkJICAgICAoc3Vic3Ry aW5nIChjYXIgYXJncykgKG1hdGNoLWVuZCAwKSkpKSkKLQkgKGNvbmQKLQkgICgoZXEgYmFja2Vu ZCAnaHRtbCkKLQkgICAoZm9ybWF0ICJcbiMrSFRNTDogPGxhYmVsIGNsYXNzPVwib3JnLXNyYy1u YW1lXCI+JXM8L2xhYmVsPlxuIgotCQkgICBjYWxsLWxpbmUpKQotCSAgKChmb3JtYXQgIjogJXNc biIgY2FsbC1saW5lKSkpKSkpKSkKKyAgKGRlc3RydWN0dXJpbmctYmluZCAobGFuZyBib2R5IGFy Z3MwIHN3aXRjaGVzIG5hbWUgJnJlc3QgaWdub3JlKSBpbmZvCisgICAgKGxldCAoKGFyZ3MgKG1h cGNhciAjJ2NkcgorCQkJKG9yZy1yZW1vdmUtaWYtbm90IChsYW1iZGEgKGVsKSAoZXEgOnZhciAo Y2FyIGVsKSkpIGFyZ3MwKSkpKQorICAgICAgKGxldCAoKGZvcm1hdHRlciAoZ2V0ZiBvcmctYmFi ZWwtZm9ybWF0LWNvZGUtZnVuY3Rpb25zIHR5cGUpKSkKKwkoZnVuY2FsbCBmb3JtYXR0ZXIgbGFu ZyBib2R5IGFyZ3Mgc3dpdGNoZXMgbmFtZSkpKSkpCiAKIChkZWZ1biBvcmctYmFiZWwtZXhwLXJl c3VsdHMgKGluZm8gdHlwZSAmb3B0aW9uYWwgc2lsZW50KQogICAiRXZhbHVhdGUgYW5kIHJldHVy biB0aGUgcmVzdWx0cyBvZiB0aGUgY3VycmVudCBjb2RlIGJsb2NrIGZvciBleHBvcnQuCg== --000e0ce0d87a231393048cb52ebb Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --000e0ce0d87a231393048cb52ebb--