deplate 0.8.3 → 0.8.4

data/CHANGES.TXT

@@ -1,31 +1,13 @@
-2008-07-10  Thomas Link (micathom at gmail com)
-	* core.rb (set_theme): Typo.
+2008-07-20  Thomas Link (micathom at gmail com)
+	* gem, zip: Fixed packaging problem
 
-2008-07-09  Thomas Link (micathom at gmail com)
-	* etc.rb (footnote_setup): For inline footnotes, set args[:minor] = 
-	true for all elements.
-	* latex.rb (format_paragraph): Respect args[:minor].
-	* formatter.rb (wrap_text): If a line matches /^\s+$/, push nil in 
-	order to avoid additional linebreaks.
-	* latex.rb (format_footnote): The footnote body is surrounded by 
-	linebreaks in the latex output.
-	* latex.rb (format_environment): rstrip the body.
-	* formatter.rb (wrap_text): strscan-based word wrap.
-
-2008-07-08  Thomas Link (micathom at gmail com)
-	* html.rb (format_list_item): List items have an additional 
-	"#{type}-#{level}" class
-	* formatter.rb (break_line): Removed
-	* formatter.rb (wrap_text): Rewrite. wrapMarginInner became 
-	wrapMargin; wrapMarginInner is gone
-	* latex.rb (format_list_item): Adapted for new wrap_text algorithm
-	* elements.rb (Deplate::Element::Command.accumulate): Optional bang 
-	"!" for commands
-	* elements.rb (Deplate::Element::Region#setup): Optional bang "!" 
-	for regions
-	* commands.rb (Deplate::Command::CAP): "#CAP!" is equivalent to 
-	''extended!''. There is a chance though this results in incorrect output 
-	with, e.g., the docbook formatter
+2008-07-18  Thomas Link (micathom at gmail com)
+	* html.rb (head_css): When the css was defined as in "FILE|MEDIA" 
+	the ".css" suffix was added to the media.
+	* html.rb (head_css): Limit split in FILE|MEDIA to 2
 
+2008-07-16  Thomas Link (micathom at gmail com)
+	* guesslanguage.rb (guesslanguage): Don't set the language, if the 
+	lang variable is already set.
 
 # vim: ft=changelog:tw=72

data/VERSION.TXT

@@ -1 +1 @@
-0.8.3final-3107
+0.8.4final-3109

data/lib/deplate.rb

@@ -4,7 +4,7 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     24-Feb-2004.
-# @Last Change: 2007-04-14.
+# @Last Change: 2008-07-20.
 
 require 'profile' if ARGV[0] == '--profile'
 

data/lib/deplate/core.rb

@@ -3,7 +3,7 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     24-Feb-2004.
-# @Last Change: 2008-07-10.
+# @Last Change: 2008-07-20.
 
 require 'uri'
 require 'optparse'
@@ -26,10 +26,10 @@ module Deplate; end
 class Deplate::Core
     extend Forwardable
 
-    Version    = '0.8.3'
+    Version    = '0.8.4'
     # VersionSfx = 'a'
     VersionSfx = 'final'
-    MicroRev   = '3107'
+    MicroRev   = '3109'
 
     if ENV['HOME']
         CfgDir = File.join(ENV['HOME'].gsub(/\\/, '/'), '.deplate')

data/lib/deplate/css/deplate.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2007-09-28. */
-/* @Revision:    0.1233 */
+/* @Last Change: 2008-07-19. */
+/* @Revision:    0.1353 */
 
 body {
     padding: 1px;
@@ -72,32 +72,65 @@ h1 {
     margin-bottom: 20px;
     padding-top: 10px;
     padding-bottom: 10px;
-    border-left:10px solid #ffe590;
+    /* border:1px solid #ffe590; */
+    border-top: 1px solid #ffe590;
+    border-right: 2px solid #ffe590;
+    border-left: 1px solid #ffe590;
     background-color: #fff3d0;
+    -webkit-border-top-left-radius: 15px;
+    -webkit-border-top-right-radius: 15px;
+    -moz-border-radius-topleft: 15px;
+    -moz-border-radius-topright: 15px;
+    -khtml-border-top-left-radius: 15px;
+    -khtml-border-top-right-radius: 15px;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
 }
 h2 {
     margin-top: 30px;
     margin-bottom: 10px;
-    border-left:10px solid #ffe590;
+    padding-top: 5px;
+    /* border-left:2px solid #ffe590; */
+    /* border-right:3px solid #ffe590; */
+    /* border-top:2px solid #ffe590; */
+    /* -webkit-border-top-left-radius: 15px; */
+    /* -webkit-border-top-right-radius: 15px; */
+    /* -moz-border-radius-topleft: 15px; */
+    /* -moz-border-radius-topright: 15px; */
+    /* -khtml-border-top-left-radius: 15px; */
+    /* -khtml-border-top-right-radius: 15px; */
+    /* border-top-left-radius: 15px; */
+    /* border-top-right-radius: 15px; */
 }
 h3 {
-    border-left:10px solid #ffe590;
-	margin-top: 20px;
-	margin-bottom: 10px;
+    margin-top: 20px;
+    margin-bottom: 10px;
+    padding-top: 5px;
+    /* border-left:1px solid #ffe590; */
+    /* border-right:2px solid #ffe590; */
+    /* border-top:1px solid #ffe590; */
+    /* -webkit-border-top-left-radius: 15px; */
+    /* -webkit-border-top-right-radius: 15px; */
+    /* -moz-border-radius-topleft: 15px; */
+    /* -moz-border-radius-topright: 15px; */
+    /* -khtml-border-top-left-radius: 15px; */
+    /* -khtml-border-top-right-radius: 15px; */
+    /* border-top-left-radius: 15px; */
+    /* border-top-right-radius: 15px; */
 }
 h4 {
     border-left:10px solid #ffe590;
-	margin-top: 10px;
-	margin-bottom: 10px;
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 h5 {
     border-left:10px solid #ffe590;
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 h6 {
     border-left:10px solid #ffe590;
-	margin-top: 10px;
+    margin-top: 10px;
 }
 
 em {
@@ -193,8 +226,13 @@ pre {
 }
 
 pre.verbatim {
-    background-color: #eaeaea;
-    border-left: 5px solid #efefef;
+    /* background-color: #eaeaea; */
+    /* background-color: #f5f4eb; */
+    /* border: 1px solid #ebf2f5; */
+    /* border-left: 5px solid #efefef; */
+    border-top: 1px solid #aaaaaa;
+    border-left: 1px solid #aaaaaa;
+    border-right: 1px solid #eeeeee;
 }
 
 div.code {
@@ -211,7 +249,8 @@ div.tableNote {
 }
 table, tr, th, td {
     border-style: none;
-    background-color:#eaeaea;
+    /* background-color: #fff6f0; */
+    /* border: 1px solid #fef0ff; */
     border-spacing: 0;
     color : black;
 }
@@ -220,14 +259,17 @@ table {
     /* border-right: 10px solid #ffffff; */
     /* margin: 0 10px 0 10px; */
     margin: 0;
+    border: 1px solid #aaaaaa;
+    /* border-top: 1px solid #aaaaaa; */
+    /* border-bottom: 1px solid #aaaaaa; */
 }
 thead {
 }
 tfoot {
 }
 tr, th, td {
-    padding: 2px;
-    border: 1px solid #ffffff;
+    padding: 3px;
+    /* border: 1px solid #ffffff; */
 }
 tr {
 }
@@ -238,6 +280,7 @@ tr.foot {
 tr.high {
 }
 th {
+    border-bottom: 1px solid #aaaaaa;
 }
 td {
 }
@@ -256,7 +299,7 @@ td.high {
 .footnotesize {
 }
 
-.grid {
+table.grid, td.grid, th.grid, tr.grid {
     background-color:#ffffff;
     border-collapse: collapse;
 }
@@ -268,7 +311,7 @@ th.grid, td.grid {
     padding: 2px;
 }
 
-.formal {
+table.formal, tr.formal, td.formal, th.formal {
     background-color:#ffffff;
 }
 div.formal {
@@ -299,7 +342,7 @@ td.formal[class~="foot"] {
     border-top: 1px solid #000000;
 }
 
-.box {
+table.box, tr.box, th.box, td.box {
     background-color:#ffffff;
 }
 div.box {
@@ -326,7 +369,7 @@ td.box[class~="high"] {
     border-right: 1px solid #000000;
 }
 
-.overlay {
+table.overlay, tr.overlay, th.overlay, td.overlay {
     background-color:#ffffff;
 }
 div.overlay {
@@ -436,11 +479,16 @@ div.title {
     text-align: left;
     padding: 20px;
     margin: 20px 0 20px 0;
+    /* border: 1px solid #ffe590; */
     border-top: 1px solid #ffe590;
-    border-right: 10px solid #ffe590;
+    border-right: 2px solid #ffe590;
     border-left: 1px solid #ffe590;
-    border-bottom: 5px solid #ffe590;
+    border-bottom: 2px solid #ffe590;
     background-color: #fff3d0;
+    -webkit-border-radius: 15px;
+    -moz-border-radius: 15px;
+    -khtml-border-top: 15px;
+    border-radius: 15px;
 }
 p.title, p.author, p.authornote, p.date {
     margin: 0;
@@ -522,11 +570,19 @@ p.example {
     font-weight: bold;
 }
 .example-output {
-    padding: 20px 5px 20px 5px;
-    margin: 20px 0 20px 0;
-    border-left: 10px solid #eaeaea;
-    border-right: 10px solid #eaeaea;
-    /* background-color: #fff3d0; */
+    /* padding: 20px 5px 20px 5px; */
+    /* margin: 20px 0 20px 0; */
+    /* border-left: 10px solid #eaeaea; */
+    /* border-right: 10px solid #eaeaea; */
+	margin-left: 40px;
+	margin-right: 40px;
+    padding: 5px;
+    /* border-left: 5px solid #efefef; */
+    /* border: 1px solid #ebf2f5; */
+    /* background-color: #eff5eb; */
+    border-bottom: 1px solid #aaaaaa;
+    border-right: 1px solid #aaaaaa;
+    border-left: 1px solid #eeeeee;
 }
 
 /* Mini Table of Contents */

data/lib/deplate/css/doc.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (samul AT web.de) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2008-07-06. */
-/* @Revision:    0.1202 */
+/* @Last Change: 2008-07-10. */
+/* @Revision:    0.1217 */
 
 body {
     padding: 1px;
@@ -189,8 +189,10 @@ pre.verbatim {
 }
 
 div.code {
-    background-color: #fffff0;
-    border: 1px double #fff0f0;
+    /* background-color: #f0f0f0; */
+    /* background-color: #eaeaea; */
+    /* border: 1px double #96e6e6; */
+    padding: 5px 20px 5px 20px;
 }
 
 /* Tables */

data/lib/deplate/css/highlight.css

@@ -0,0 +1,19 @@
+/* CSS definition file generated by highlight 2.2-8, http://www.andre-simon.de/ */
+
+/* Highlighting theme definition: */
+
+	/* body	{ background-color:#ffffff; } */
+	/* pre	{ color:#000000; background-color:#ffffff; font-size:10pt; font-family:Courier;} */
+	.num	{ color:#a900a9; }
+	.esc	{ color:#C42DA8; }
+	.str	{ color:#ff0000; }
+	.dstr	{ color:#ff0000; }
+	.slc	{ color:#666666; font-style:italic; }
+	.com	{ color:#666666; font-style:italic; }
+	.dir	{ color:#00b800; }
+	.sym	{ color:#ff0000; }
+	.line	{ color:#666666; }
+	.kwa	{ color:#0000ff; font-weight:bold; }
+	.kwb	{ color:#0000ff; }
+	.kwc	{ color:#ec7f15; }
+

data/lib/deplate/css/highstep.css

@@ -1,10 +1,21 @@
+body {
+    /* font-family: Georgia, Bookman, Times, Serif; */
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
+	/* font-size-adjust: .5; */
+    font-size: 14px;
+    /* line-height: 1.36em */
+}
+
 span.steppreview {
-    background-color: #f9f9f9;
-    border: 1px solid #e0e0e0;
+    background-color: #f5f5f5;
+    /* padding: 1px; */
+    /* border: 1px solid #e0e0e0; */
+    border: 1px solid #f0f0f0;
 }
 
 span.stephighlight {
-    background-color: #ffff90;
+    background-color: #ffff60;
+    /* padding: 1px; */
     border: 1px solid #e0e0e0;
 }
 

data/lib/deplate/css/htmldoc.css

@@ -2,8 +2,9 @@
 
 body {
     /* background-color: #d9e0f0; */
-    background-color: #e4e8f0;
-    background-image: url(grad_blue.jpg);
+    /* background-color: #e4e8f0; */
+    background-color: #ebebf0;
+    /* background-image: url(grad_blue.jpg); */
     background-repeat: repeat-x;
 }
 
@@ -26,9 +27,11 @@ body {
     margin-top: 0;
     padding: 10px;
     /* border: 1px dashed #cae0ea; */
-    border: 1px solid #cae0ea;
-    border-radius: 15px;
+    /* border: 1px solid #cae0ea; */
+    -webkit-border-radius: 15px;
     -moz-border-radius: 15px;
+    -khtml-border-top: 15px;
+    border-radius: 15px;
 }
 
 div.pageicons {

data/lib/deplate/css/presentation.css

@@ -0,0 +1,209 @@
+/* Text style: sans-serif */
+/* @Author:      Thomas Link (samul AT web.de) */
+/* @Created:     13-Apr-2004. */
+/* @Last Change: 2008-07-08. */
+/* @Revision:    0.637 */
+
+body, table, div {
+    /* font-family: Georgia, Bookman, Times, Serif; */
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
+	/* font-size-adjust: .5; */
+    font-size: 28px;
+    /* line-height: 1.3em */
+}
+
+big {
+    font-weight: bolder;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    /* font-family : Georgia, Bookman, Times, Serif; */
+    /* font-family : Verdana, Monaco, Sans-Serif; */
+    font-family: Verdana, "Myriad Web", Syntax, sans-serif;
+    font-weight: bold;
+}
+h1 {
+    font-size: 56px;
+}
+h2 {
+    font-size: 48px;
+}
+h3 {
+    font-size: 40px;
+}
+h4 {
+    font-size: 36px;
+}
+h5 {
+    font-size: 32px;
+}
+h6 {
+    font-size: 32px;
+}
+
+tr.head, tr.foot, tr.high, th, td.foot, td.high {
+    font-weight: bold;
+}
+td[class~="head"], td[class~="foot"] {
+    font-weight: bold;
+}
+div.tableNote {
+    font-size: 24px;
+    font-style: italic;
+}
+.small {
+    font-size: 22px;
+}
+.scriptsize {
+    font-size: 20px;
+}
+.footnotesize {
+    font-size: 18px;
+}
+
+blockquote {
+    font-family: Sans-Serif;
+}
+blockquote.quote {
+}
+blockquote.longquote {
+}
+blockquote.abstract {
+    font-style: italic;
+}
+
+li.Itemize-1 {
+    list-style-type : none;
+}
+dt {
+    font-weight: bold;
+}
+
+code, pre {
+    font-family: 'Monotype.com', "Courier New", Courier, Monospace;
+	font-size-adjust: -.5;
+}
+/* pre { */
+/*     font-size: 24px; */
+/* } */
+
+
+/* htmlnavigation: Usage note */
+
+
+/* Navigation bar */
+a:link.navbar, a:visited.navbar, a:link.navbarUrl, a:visited.navbarUrl {
+    text-decoration: none;
+    font-size: 24px;
+}
+select.navmenu {
+    font-size:18px;
+}
+p.navgo {
+    font-size:18px;
+}
+
+
+/* Figure */
+
+
+/* Caption */
+caption, p.caption {
+    font-weight: bold;
+}
+
+/* Title */
+p.title, p.author, p.authornote, p.date {
+    font-family: Verdana, "Myriad Web", Syntax, sans-serif;
+    font-weight: bold;
+}
+p.title {
+    font-size: 56px;
+}
+p.author {
+    font-size: 48px;
+}
+p.authornote {
+    font-size: 36px;
+}
+p.date {
+    font-size: 36px;
+}
+
+
+/* Table of Contents etc. */
+
+
+/* Mini Table of Contents */
+
+
+/* Footnotes */
+a:link.footnote, a:visited.footnote {
+    font-size: 18px;
+    text-decoration: none;
+}
+p.footnotes, ol.footnotes, li.footnotes {
+    font-size: 24px;
+}
+p.footnotes {
+    font-weight: bold;
+}
+
+
+/* OpenOffice compatible footnotes */
+.sdfootnoteanc {
+    font-size: 18px;
+}
+.sdfootnotesym, .sdfootnote {
+    font-size: 24px;
+}
+
+
+/* Bibliography */
+
+
+/* Index */
+
+
+/* Marker */
+div.note, div.warning, div.caution, div.important {
+    font-family: Verdana, "Myriad Web", Syntax, sans-serif;
+    font-size: 24px;
+}
+
+
+/* Header, Footer */
+.header, .footer {
+    font-family: Verdana, "Myriad Web", Syntax, sans-serif;
+    font-size: 18px;
+}
+
+
+/* Validate HTML */
+
+
+/* TabBar */
+.tabBarLeft, .tabBarRight, .tabBarTop, .tabBarBottom {
+    font-size: 20px;
+}
+a.tabBarEntry {
+    text-decoration: none;
+    font-family: Verdana, "Myriad Web", Syntax, sans-serif;
+}
+
+/* ProgressBar */
+span.progress {
+    font-size: 20px;
+}
+
+input, textarea {
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
+    font-size: 90%;
+    line-height: 135%;
+}
+
+
+p.comments {
+    font-size: 20px;
+}
+