[DRE-commits] [ruby-org] 248/303: Fixes the title for HTML output. Updates the examples.
Jérémy Bobbio
lunar at alioth.debian.org
Fri Aug 9 17:34:07 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 2f09bbd1b21c7769fc8a989c651ff2670ff3b5e2
Author: vonavi <ivvl82 at gmail.com>
Date: Wed Jan 30 01:17:56 2013 +0200
Fixes the title for HTML output. Updates the examples.
---
lib/org-ruby/parser.rb | 4 ++--
spec/html_examples/advanced-lists.html | 2 +-
spec/html_examples/block_code.html | 2 +-
spec/html_examples/blockcomment.html | 2 +-
spec/html_examples/blockquote.html | 2 +-
spec/html_examples/code-block-lists.html | 2 +-
spec/html_examples/code-comment.html | 2 +-
spec/html_examples/code-lists.html | 2 +-
spec/html_examples/comment-trees.html | 2 +-
spec/html_examples/emphasis.html | 2 +-
spec/html_examples/entities.html | 2 +-
spec/html_examples/horizontal_rule.html | 2 +-
spec/html_examples/html-literal.html | 2 +-
spec/html_examples/inline-formatting.html | 2 +-
spec/html_examples/inline-images.html | 2 +-
spec/html_examples/lists.html | 2 +-
spec/html_examples/metadata-comment.html | 2 +-
spec/html_examples/only-list.html | 2 +-
spec/html_examples/only-table.html | 2 +-
spec/html_examples/properties_drawer.html | 2 +-
spec/html_examples/subsupscript-nil.html | 2 +-
spec/html_examples/subsupscript.html | 2 +-
spec/html_examples/tables.html | 2 +-
spec/html_examples/text.html | 2 +-
24 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/lib/org-ruby/parser.rb b/lib/org-ruby/parser.rb
index 582e4b6..6396c96 100644
--- a/lib/org-ruby/parser.rb
+++ b/lib/org-ruby/parser.rb
@@ -138,7 +138,7 @@ module Orgmode
@headlines << @current_headline = line if Headline.headline? line.line
# If there is a setting on this line, remember it.
line.in_buffer_setting? do |key, value|
- store_in_buffer_setting key, value
+ store_in_buffer_setting key.upcase, value
end
mode = line.paragraph_type if line.begin_block?
@@ -179,7 +179,7 @@ module Orgmode
def to_html
mark_trees_for_export
export_options = {
- :decorate_title => true,
+ :decorate_title => @in_buffer_settings["TITLE"],
:export_heading_number => export_heading_number?,
:export_todo => export_todo?,
:use_sub_superscripts => use_sub_superscripts?,
diff --git a/spec/html_examples/advanced-lists.html b/spec/html_examples/advanced-lists.html
index 4110de4..63bab81 100644
--- a/spec/html_examples/advanced-lists.html
+++ b/spec/html_examples/advanced-lists.html
@@ -1,4 +1,4 @@
-<p class="title">Advanced Lists</p>
+<p>Advanced Lists</p>
<p><code>org-ruby</code> supports the following list features of <code>org-mode</code>:</p>
<h1>Nested lists</h1>
<ul>
diff --git a/spec/html_examples/block_code.html b/spec/html_examples/block_code.html
index f791d1e..715d813 100644
--- a/spec/html_examples/block_code.html
+++ b/spec/html_examples/block_code.html
@@ -1,4 +1,4 @@
-<h1 class="title">Block Code</h1>
+<h1>Block Code</h1>
<p>I need to get block code examples working. In <code>orgmode</code>, they look
like this:</p>
<pre class="example">
diff --git a/spec/html_examples/blockcomment.html b/spec/html_examples/blockcomment.html
index a2688fc..af898dc 100644
--- a/spec/html_examples/blockcomment.html
+++ b/spec/html_examples/blockcomment.html
@@ -1,3 +1,3 @@
-<p class="title">BLOCKCOMMENT</p>
+<p>BLOCKCOMMENT</p>
<p>Testing that the next part is ignored</p>
<p>And now back to normal!</p>
diff --git a/spec/html_examples/blockquote.html b/spec/html_examples/blockquote.html
index ccdac05..ac559ef 100644
--- a/spec/html_examples/blockquote.html
+++ b/spec/html_examples/blockquote.html
@@ -1,4 +1,4 @@
-<p class="title">BLOCKQUOTE</p>
+<p>BLOCKQUOTE</p>
<p>Testing that I can have block quotes:</p>
<blockquote>
<p><i>Example:</i></p>
diff --git a/spec/html_examples/code-block-lists.html b/spec/html_examples/code-block-lists.html
index eaff4b2..f009d2d 100644
--- a/spec/html_examples/code-block-lists.html
+++ b/spec/html_examples/code-block-lists.html
@@ -1,4 +1,4 @@
-<h1 class="title">Code blocks in lists</h1>
+<h1>Code blocks in lists</h1>
<h2>No spaces in code block</h2>
<pre class="example">
- List starts
diff --git a/spec/html_examples/code-comment.html b/spec/html_examples/code-comment.html
index 7a289a2..9d7cafe 100644
--- a/spec/html_examples/code-comment.html
+++ b/spec/html_examples/code-comment.html
@@ -1,4 +1,4 @@
-<h1 class="title">Code Comment</h1>
+<h1>Code Comment</h1>
<p>I need to be able to export things that look like org-mode comments
inside of code blocks, like this:</p>
<pre class="example">
diff --git a/spec/html_examples/code-lists.html b/spec/html_examples/code-lists.html
index 2ce94f1..9c0e08c 100644
--- a/spec/html_examples/code-lists.html
+++ b/spec/html_examples/code-lists.html
@@ -1,4 +1,4 @@
-<h1 class="title">normal list should work</h1>
+<h1>normal list should work</h1>
<ul>
<li>one
text in the same line
diff --git a/spec/html_examples/comment-trees.html b/spec/html_examples/comment-trees.html
index bfc6490..abcf977 100644
--- a/spec/html_examples/comment-trees.html
+++ b/spec/html_examples/comment-trees.html
@@ -1,4 +1,4 @@
-<h1 class="title">This headline is in the output</h1>
+<h1>This headline is in the output</h1>
<h1>This is in the output</h1>
<h2>Yet, this is in the output</h2>
<p>and this is also part of the output</p>
diff --git a/spec/html_examples/emphasis.html b/spec/html_examples/emphasis.html
index 869065a..e3fccaa 100644
--- a/spec/html_examples/emphasis.html
+++ b/spec/html_examples/emphasis.html
@@ -1,4 +1,4 @@
-<h1 class="title">Inline Formatting test for emphasis</h1>
+<h1>Inline Formatting test for emphasis</h1>
<h2>Simple feature test</h2>
<p><b>bold</b></p>
<p><i>italic</i></p>
diff --git a/spec/html_examples/entities.html b/spec/html_examples/entities.html
index 3cc0543..cdcffb1 100644
--- a/spec/html_examples/entities.html
+++ b/spec/html_examples/entities.html
@@ -1,4 +1,4 @@
-<p class="title">ENTITIES</p>
+<p>ENTITIES</p>
<p><code>Org-ruby</code> supports “smart double quotes,” ‘smart single quotes,’
apostrophes for contractions like won’t and can’t, and other
things… like elipses. Oh – and dashes.</p>
diff --git a/spec/html_examples/horizontal_rule.html b/spec/html_examples/horizontal_rule.html
index 69576b7..54fb07e 100644
--- a/spec/html_examples/horizontal_rule.html
+++ b/spec/html_examples/horizontal_rule.html
@@ -1,4 +1,4 @@
-<p class="title">Useful contribution by <a href="http://www.neilsmithline.com">Neil-Smithline</a></p>
+<p>Useful contribution by <a href="http://www.neilsmithline.com">Neil-Smithline</a></p>
<p>5 hyphens or more,</p>
<hr />
<p>will produce a horizontal rule.</p>
diff --git a/spec/html_examples/html-literal.html b/spec/html_examples/html-literal.html
index 1b624cd..d4f5611 100644
--- a/spec/html_examples/html-literal.html
+++ b/spec/html_examples/html-literal.html
@@ -1,4 +1,4 @@
-<p class="title">HTML literals</p>
+<p>HTML literals</p>
<p>ORG escapes HTML by default. This should <b>not be bold text!</b>
Instead, it should look like regular text with some HTML tags around
it.</p>
diff --git a/spec/html_examples/inline-formatting.html b/spec/html_examples/inline-formatting.html
index b555edc..f58def5 100644
--- a/spec/html_examples/inline-formatting.html
+++ b/spec/html_examples/inline-formatting.html
@@ -1,4 +1,4 @@
-<p class="title">Inline Formatting</p>
+<p>Inline Formatting</p>
<p>I want to make sure I handle all inline formatting. I need to handle
<b>bold</b>, <i>italic</i>, <code>code</code>, <code>verbatim</code>, <span style="text-decoration:underline;">underline</span>, <del>strikethrough</del>.</p>
<p>In addition, I need to make sure I can handle links. We’ve got simple
diff --git a/spec/html_examples/inline-images.html b/spec/html_examples/inline-images.html
index 1b97715..fa4b57d 100644
--- a/spec/html_examples/inline-images.html
+++ b/spec/html_examples/inline-images.html
@@ -1,4 +1,4 @@
-<p class="title">Inline Images</p>
+<p>Inline Images</p>
<p>Per the org-mode <a href="http://orgmode.org/manual/Images-and-tables.html#Images-and-tables">spec</a>, you can include inline images as links without
any descriptive link text, like this:</p>
<p><a href="http://farm5.static.flickr.com/4049/4358074549_5efb8b4903.jpg"><img src="http://farm5.static.flickr.com/4049/4358074549_5efb8b4903.jpg" /></a></p>
diff --git a/spec/html_examples/lists.html b/spec/html_examples/lists.html
index 12f0b92..755624e 100644
--- a/spec/html_examples/lists.html
+++ b/spec/html_examples/lists.html
@@ -1,4 +1,4 @@
-<h1 class="title">Lists</h1>
+<h1>Lists</h1>
<p>I want to make sure I have great support for lists.</p>
<ul>
<li>This is an unordered list</li>
diff --git a/spec/html_examples/metadata-comment.html b/spec/html_examples/metadata-comment.html
index 284187b..1d8889e 100644
--- a/spec/html_examples/metadata-comment.html
+++ b/spec/html_examples/metadata-comment.html
@@ -1,4 +1,4 @@
-<h1 class="title">Metadata, etc.</h1>
+<h1>Metadata, etc.</h1>
<p>I normally filter out things that look like metadata. Can’t do it any
more. I need to see all of the following:</p>
<pre class="example">
diff --git a/spec/html_examples/only-list.html b/spec/html_examples/only-list.html
index f6ff4f8..91e354a 100644
--- a/spec/html_examples/only-list.html
+++ b/spec/html_examples/only-list.html
@@ -1,4 +1,4 @@
-<ul class="title">
+<ul>
<li>This file has only a list</li>
<li>Note it will end with nothing other than a list item.</li>
<li>the world wants to know: Will org-ruby write the closing ul tag?</li>
diff --git a/spec/html_examples/only-table.html b/spec/html_examples/only-table.html
index f113bd8..0b2823c 100644
--- a/spec/html_examples/only-table.html
+++ b/spec/html_examples/only-table.html
@@ -1,4 +1,4 @@
-<table class="title">
+<table>
<tr><th>One</th><th>Two</th><th>Three</th><th>Four</th></tr>
<tr><td>Five</td><td>Six</td><td>Seven</td><td>Eight</td></tr>
<tr><td>Nine</td><td>Ten</td><td>Eleven</td><td>Twelve</td></tr>
diff --git a/spec/html_examples/properties_drawer.html b/spec/html_examples/properties_drawer.html
index f51abc5..ab79134 100644
--- a/spec/html_examples/properties_drawer.html
+++ b/spec/html_examples/properties_drawer.html
@@ -1,4 +1,4 @@
-<h1 class="title">The mount point of the fullest disk</h1>
+<h1>The mount point of the fullest disk</h1>
<h2>query all mounted disks</h2>
<pre class="example">
df \
diff --git a/spec/html_examples/subsupscript-nil.html b/spec/html_examples/subsupscript-nil.html
index 3bda423..d611686 100644
--- a/spec/html_examples/subsupscript-nil.html
+++ b/spec/html_examples/subsupscript-nil.html
@@ -1,3 +1,3 @@
-<p class="title">SUBSUPSCRIPT</p>
+<p>SUBSUPSCRIPT</p>
<p>a^{b}</p>
<p>a_{b}</p>
diff --git a/spec/html_examples/subsupscript.html b/spec/html_examples/subsupscript.html
index 5ed592f..af05926 100644
--- a/spec/html_examples/subsupscript.html
+++ b/spec/html_examples/subsupscript.html
@@ -1,3 +1,3 @@
-<p class="title">SUBSUPSCRIPT</p>
+<p>SUBSUPSCRIPT</p>
<p>a<sup>b</sup></p>
<p>a<sub>b</sub></p>
diff --git a/spec/html_examples/tables.html b/spec/html_examples/tables.html
index 06fe4b8..8e32275 100644
--- a/spec/html_examples/tables.html
+++ b/spec/html_examples/tables.html
@@ -1,4 +1,4 @@
-<p class="title">TABLES</p>
+<p>TABLES</p>
<p>Different types of ORG tables.</p>
<h1>Simple table, no header.</h1>
<table>
diff --git a/spec/html_examples/text.html b/spec/html_examples/text.html
index 9cc9789..d1cb236 100644
--- a/spec/html_examples/text.html
+++ b/spec/html_examples/text.html
@@ -1,4 +1,4 @@
-<p class="title">The simplest case: translating plain text.</p>
+<p>The simplest case: translating plain text.</p>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
--
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