[DRE-commits] [ruby-org] 192/303: Use text lexer when source block does not specify lang
Jérémy Bobbio
lunar at alioth.debian.org
Fri Aug 9 17:33:56 UTC 2013
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch master
in repository ruby-org.
commit 8f5e1c086d759e53b814709b6f0a6ba200bc06b8
Author: Waldemar Quevedo <waldemar.quevedo at gmail.com>
Date: Sun Oct 7 01:07:24 2012 +0900
Use text lexer when source block does not specify lang
---
lib/org-ruby/html_output_buffer.rb | 4 +-
.../advanced-code-coderay.html | 2 +-
.../advanced-code-pygments.html | 63 ++++++--------------
.../advanced-code-pygments.org | 4 +-
.../code-pygments.html | 7 +--
.../src-code-list-pygments.html | 12 +---
6 files changed, 29 insertions(+), 63 deletions(-)
diff --git a/lib/org-ruby/html_output_buffer.rb b/lib/org-ruby/html_output_buffer.rb
index cbcfdac..895db63 100644
--- a/lib/org-ruby/html_output_buffer.rb
+++ b/lib/org-ruby/html_output_buffer.rb
@@ -109,7 +109,7 @@ module Orgmode
# Only try to colorize #+BEGIN_SRC blocks with a specified language,
# but we still have to catch the cases when a lexer for the language was not available
- if not @block_lang.empty? and (defined? Pygments or defined? CodeRay)
+ if defined? Pygments or defined? CodeRay
lang = normalize_lang(@block_lang)
# NOTE: CodeRay and Pygments already escape the html once, so no need to escape_buffer!
@@ -347,6 +347,8 @@ module Orgmode
case lang
when 'emacs-lisp', 'common-lisp', 'lisp'
'scheme'
+ when ''
+ 'text'
else
lang
end
diff --git a/spec/html_code_syntax_highlight_examples/advanced-code-coderay.html b/spec/html_code_syntax_highlight_examples/advanced-code-coderay.html
index 83d3bf4..93fe823 100644
--- a/spec/html_code_syntax_highlight_examples/advanced-code-coderay.html
+++ b/spec/html_code_syntax_highlight_examples/advanced-code-coderay.html
@@ -47,7 +47,7 @@ user> (<span style="color:#080;font-weight:bold">take</span> <span style="col
</pre>
<p>Even if no language is set, it is still wrapped in code tags but class is empty.</p>
<pre class="src">
-echo 'Defaults env_keeps="http_proxy https_proxy ftp_proxy"' | sudo tee -a /etc/sudoers
+echo 'Defaults env_keeps="http_proxy https_proxy ftp_proxy"' | sudo tee -a /etc/sudoers
</pre>
<h1><span class="heading-number heading-number-1">3 </span>It should be possible to write a colon at the beginning of an example</h1>
<blockquote>
diff --git a/spec/html_code_syntax_highlight_examples/advanced-code-pygments.html b/spec/html_code_syntax_highlight_examples/advanced-code-pygments.html
index c2076fc..3bf9117 100644
--- a/spec/html_code_syntax_highlight_examples/advanced-code-pygments.html
+++ b/spec/html_code_syntax_highlight_examples/advanced-code-pygments.html
@@ -23,9 +23,7 @@
<span class="k">yield</span> <span class="vg">$2</span><span class="p">,</span> <span class="vg">$3</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
-<p>Now let’s test case-insensitive code blocks.</p>
+</pre></div><p>Now let’s test case-insensitive code blocks.</p>
<div class="highlight"><pre> <span class="c1"># Finds all emphasis matches in a string.</span>
<span class="c1"># Supply a block that will get the marker and body as parameters.</span>
<span class="k">def</span> <span class="nf">match_all</span><span class="p">(</span><span class="n">str</span><span class="p">)</span>
@@ -33,9 +31,7 @@
<span class="k">yield</span> <span class="vg">$2</span><span class="p">,</span> <span class="vg">$3</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
-<div class="highlight"><pre><span class="p">(</span><span class="k">def </span><span class="nv">fib-seq</span>
+</pre></div><div class="highlight"><pre><span class="p">(</span><span class="k">def </span><span class="nv">fib-seq</span>
<span class="p">(</span><span class="nf">concat</span>
<span class="p">[</span><span class="mi">0</span> <span class="mi">1</span><span class="p">]</span>
<span class="p">((</span><span class="k">fn </span><span class="nv">rfib</span> <span class="p">[</span><span class="nv">a</span> <span class="nv">b</span><span class="p">]</span>
@@ -43,11 +39,9 @@
<span class="nv">user></span> <span class="p">(</span><span class="nb">take </span><span class="mi">20</span> <span class="nv">fib-seq</span><span class="p">)</span>
<span class="p">(</span><span class="mi">0</span> <span class="mi">1</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span> <span class="mi">5</span> <span class="mi">8</span> <span class="mi">13</span> <span class="mi">21</span> <span class="mi">34</span> <span class="mi">55</span> <span class="mi">89</span> <span class="mi">144</span> <span class="mi">233</span> <span class="mi">377</span> <span class="mi">610</span> <span class="mi">987</span> <span class [...]
-</pre>
-</div>
-<p>Even if no language is set, it is still wrapped in code tags but class is empty.</p>
-echo ‘Defaults env_keeps=”http_proxy https_proxy ftp_proxy”’ | sudo tee -a /etc/sudoers
-<h1><span class="heading-number heading-number-1">3 </span>It should be possible to write a colon at the beginning of an example</h1>
+</pre></div><p>Even if no language is set, it is still wrapped in code tags but class is empty.</p>
+<div class="highlight"><pre>echo 'Defaults env_keeps="http_proxy https_proxy ftp_proxy"' | sudo tee -a /etc/sudoers
+</pre></div><h1><span class="heading-number heading-number-1">3 </span>It should be possible to write a colon at the beginning of an example</h1>
<blockquote>
<p>I really love to write about :symbols. They sure are the best things in the world!</p>
</blockquote>
@@ -55,29 +49,23 @@ echo ‘Defaults env_keeps=”http_proxy https_proxy ftp_proxy”
<span class="ss">:one</span> <span class="o">=></span> <span class="mi">1</span><span class="p">,</span>
<span class="ss">:two</span> <span class="o">=></span> <span class="mi">2</span>
<span class="p">}</span>
-</pre>
-</div>
-<div class="highlight"><pre><span class="p">(</span><span class="kd">defproject </span><span class="nv">helloworld</span> <span class="s">"0.1"</span>
+</pre></div><div class="highlight"><pre><span class="p">(</span><span class="kd">defproject </span><span class="nv">helloworld</span> <span class="s">"0.1"</span>
<span class="ss">:dependencies</span> <span class="p">[[</span><span class="nv">org.clojure/clojure</span>
<span class="s">"1.1.0-master-SNAPSHOT"</span><span class="p">]</span>
<span class="p">[</span><span class="nv">org.clojure/clojure-contrib</span>
<span class="s">"1.0-SNAPSHOT"</span><span class="p">]]</span>
<span class="ss">:main</span> <span class="nv">helloworld</span><span class="p">)</span>
-</pre>
-</div>
-<h1><span class="heading-number heading-number-1">4 </span>Code syntax highlight with Pygments</h1>
+</pre></div><h1><span class="heading-number heading-number-1">4 </span>Code syntax highlight with Pygments</h1>
<h2><span class="heading-number heading-number-2">4.1 </span>No language selected</h2>
-Nothing to see here
-<h2><span class="heading-number heading-number-2">4.2 </span>CSS example</h2>
+<div class="highlight"><pre><script>alert('hello world')</script>
+</pre></div><h2><span class="heading-number heading-number-2">4.2 </span>CSS example</h2>
<div class="highlight"><pre> <span class="o">*</span> <span class="p">{</span>
<span class="c">/* apply a natural box layout model to all elements */</span>
<span class="n">box</span><span class="o">-</span><span class="n">sizing</span><span class="o">:</span> <span class="k">border</span><span class="o">-</span><span class="n">box</span><span class="p">;</span>
<span class="o">-</span><span class="n">moz</span><span class="o">-</span><span class="n">box</span><span class="o">-</span><span class="n">sizing</span><span class="o">:</span> <span class="k">border</span><span class="o">-</span><span class="n">box</span><span class="p">;</span>
<span class="o">-</span><span class="n">webkit</span><span class="o">-</span><span class="n">box</span><span class="o">-</span><span class="n">sizing</span><span class="o">:</span> <span class="k">border</span><span class="o">-</span><span class="n">box</span><span class="p">;</span>
<span class="p">}</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.3 </span>HTML example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.3 </span>HTML example</h2>
<div class="highlight"><pre><span class="nt"><html></span>
<span class="nt"><head></span>
<span class="nt"><title></span>Hello<span class="nt"></title></span>
@@ -86,24 +74,18 @@ Nothing to see here
<span class="nt"><h1></span>Hello<span class="nt"></h1></span>
<span class="nt"></body></span>
<span class="nt"></html></span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.4 </span>Ruby example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.4 </span>Ruby example</h2>
<div class="highlight"><pre><span class="k">class</span> <span class="nc">Post</span> <span class="o"><<</span> <span class="no">ActiveRecord</span><span class="o">::</span><span class="no">Base</span>
<span class="k">def</span> <span class="nf">print_title</span>
<span class="nb">puts</span> <span class="s2">"</span><span class="si">#{</span><span class="nb">self</span><span class="o">.</span><span class="n">title</span><span class="si">}</span><span class="s2">"</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.5 </span>Python example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.5 </span>Python example</h2>
<div class="highlight"><pre><span class="kn">import</span> <span class="nn">mapnik</span>
<span class="n">m</span> <span class="o">=</span> <span class="n">mapnik</span><span class="o">.</span><span class="n">Map</span><span class="p">(</span><span class="mi">600</span><span class="p">,</span> <span class="mi">800</span><span class="p">)</span>
<span class="n">m</span><span class="o">.</span><span class="n">background</span> <span class="o">=</span> <span class="n">Map</span><span class="o">.</span><span class="n">Color</span><span class="p">(</span><span class="s">'steelblue'</span><span class="p">)</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.6 </span>Javascript example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.6 </span>Javascript example</h2>
<div class="highlight"><pre><span class="nx">exports</span> <span class="o">=</span> <span class="k">this</span><span class="p">;</span>
<span class="p">(</span><span class="kd">function</span><span class="p">(</span><span class="nx">$</span><span class="p">){</span>
@@ -115,27 +97,18 @@ Nothing to see here
<span class="p">};</span>
<span class="p">})(</span><span class="nx">jQuery</span><span class="p">);</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.7 </span>JSON example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.7 </span>JSON example</h2>
<div class="highlight"><pre><span class="p">{</span> <span class="err">name:</span> <span class="nt">"Waldemar"</span>
<span class="p">,</span> <span class="err">surname:</span> <span class="nt">"Quevedo"</span>
<span class="p">}</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.8 </span>PHP example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.8 </span>PHP example</h2>
<div class="highlight"><pre><span class="x">echo "Hello";</span>
<span class="x">phpinfo();</span>
<span class="x">var_dump(some_var);</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.9 </span>Elisp example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.9 </span>Elisp example</h2>
<div class="highlight"><pre><span class="p">(</span><span class="nf">defun</span> <span class="nv">hello</span><span class="p">()</span>
<span class="p">(</span><span class="nf">interactive</span><span class="p">)</span>
<span class="p">(</span><span class="nf">message</span> <span class="s">"hello"</span><span class="p">))</span>
-</pre>
-</div>
-<h2><span class="heading-number heading-number-2">4.10 </span>Not supported language example</h2>
+</pre></div><h2><span class="heading-number heading-number-2">4.10 </span>Not supported language example</h2>
<div class="highlight"><pre>!+!+++!++!++!++!+
-</pre>
-</div>
+</pre></div>
\ No newline at end of file
diff --git a/spec/html_code_syntax_highlight_examples/advanced-code-pygments.org b/spec/html_code_syntax_highlight_examples/advanced-code-pygments.org
index 206f7a5..969784d 100644
--- a/spec/html_code_syntax_highlight_examples/advanced-code-pygments.org
+++ b/spec/html_code_syntax_highlight_examples/advanced-code-pygments.org
@@ -108,8 +108,8 @@ best things in the world!
** No language selected
-#+BEGIN_SRC
-Nothing to see here
+#+BEGIN_SRC
+<script>alert('hello world')</script>
#+END_SRC
** CSS example
diff --git a/spec/html_code_syntax_highlight_examples/code-pygments.html b/spec/html_code_syntax_highlight_examples/code-pygments.html
index c59d7cd..ad4a343 100644
--- a/spec/html_code_syntax_highlight_examples/code-pygments.html
+++ b/spec/html_code_syntax_highlight_examples/code-pygments.html
@@ -9,9 +9,7 @@
<span class="k">end</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
-<p>Now using EXAMPLE blocks instead:</p>
+</pre></div><p>Now using EXAMPLE blocks instead:</p>
<pre class="example">
def hello()
puts "hello"
@@ -30,5 +28,4 @@ end
<span class="c1"># TODO</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
+</pre></div>
\ No newline at end of file
diff --git a/spec/html_code_syntax_highlight_examples/src-code-list-pygments.html b/spec/html_code_syntax_highlight_examples/src-code-list-pygments.html
index 078b9c4..f74710b 100644
--- a/spec/html_code_syntax_highlight_examples/src-code-list-pygments.html
+++ b/spec/html_code_syntax_highlight_examples/src-code-list-pygments.html
@@ -6,20 +6,14 @@
<span class="nb">puts</span> <span class="s1">'cheers'</span>
<span class="k">end</span>
<span class="k">end</span>
-</pre>
-</div>
- </li>
+</pre></div> </li>
<li>Bar
<div class="highlight"><pre> <span class="nb">puts</span> <span class="s2">"This should not get lumped into the above line Example"</span>
-</pre>
-</div>
- <p>A paragraph should go here.</p>
+</pre></div> <p>A paragraph should go here.</p>
<ul>
<li>A sublist goes here with another example
<div class="highlight"><pre> <span class="nb">echo</span> <span class="s2">"Hello"</span>
-</pre>
-</div>
- <p>And this is a paragraph</p>
+</pre></div> <p>And this is a paragraph</p>
</li>
</ul>
</li>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-org.git
More information about the Pkg-ruby-extras-commits
mailing list