# HG changeset patch # User Shinji KONO # Date 1316804411 -32400 # Node ID 85a60c32503c3dc906c63cd3fc86b63211255dcb # Parent 450bcedf4ed4311a4c1cea02346e8e911d80bcfe theme fix diff -r 450bcedf4ed4 -r 85a60c32503c Makefile --- a/Makefile Fri Sep 23 23:05:08 2011 +0900 +++ b/Makefile Sat Sep 24 04:00:11 2011 +0900 @@ -1,4 +1,4 @@ -o2s5: +o2s5: o2s5.source tar zcf ui.tgz ui uuencode ui.tgz < ui.tgz > ui.uu perl f.pl o2s5.source > o2s5 diff -r 450bcedf4ed4 -r 85a60c32503c o2s5.source --- a/o2s5.source Fri Sep 23 23:05:08 2011 +0900 +++ b/o2s5.source Sat Sep 24 04:00:11 2011 +0900 @@ -2,26 +2,27 @@ -$depth = 0; -$section = 1; -$note = 1; -$abstract = 0; -$current = fh000; -$tag = "content000"; +my $depth = 0; +my $section = 1; +my $note = 1; +my $abstract = 0; +my $current = fh000; +my $tag = "content000"; -$back = "white"; -$fore = "black"; +my $back = "white"; +my $fore = "black"; -$subtitle = ''; -$affilation = ''; -$closing = ""; -$opening = '
  • '; -$xoxo = ''; +my $subtitle = ''; +my $affilation = ''; +my $closing = ""; +my $opening = '
    '; +my $xoxo = ''; -$tfont = 1; +my $tfont = 1; -$ul = 0; -$theme = "default"; +my $ul = 0; +my $theme = "default"; +my $in_title = ""; @opt = grep(! /\.ind/,@ARGV); @ARGV = grep( /\.ind/,@ARGV); @@ -32,6 +33,12 @@ $theme = "pixel"; } elsif (grep(/-f/,@opt)) { $theme = "flower"; + } elsif (grep(/-n/,@opt)) { + $theme = "nautilus"; + } elsif (grep(/-i/,@opt)) { + $theme = "i18n"; + } elsif (grep(/-b/,@opt)) { + $theme = "blue"; } elsif (grep(/-2/,@opt)) { $closing = "
    "; $opening = '
    '; @@ -88,6 +95,7 @@

    $title

    $author, +$in_title


    @@ -156,6 +164,7 @@

    $subtitle

    $author

    $affilation

    +$in_title RogueRogue @@ -168,7 +177,7 @@ } sub o2s5 { -local($current) = @_; +my ($current) = @_; %content = (); my $in_comment = 0; @@ -293,7 +302,10 @@ $tag++; next line; } - next if ($title ne 'done'); + if ($title ne 'done') { + $in_title .= $_; + next; + } if (/^\t/) { if (! $ul) { diff -r 450bcedf4ed4 -r 85a60c32503c ui/themes/blue/pretty.css --- a/ui/themes/blue/pretty.css Fri Sep 23 23:05:08 2011 +0900 +++ b/ui/themes/blue/pretty.css Sat Sep 24 04:00:11 2011 +0900 @@ -48,7 +48,7 @@ font-family:georgia, Times, 'Times New Roman', serif; background:transparent url(bodybg.gif) -16px 0 repeat-x} div.slide h1 {position:absolute;left:87px;z-index:1; - white-space:nowrap;text-transform:capitalize;top:0;width:80%; + white-space:nowrap;top:0;width:80%; margin:0px auto;text-align:center;padding:0px; font:36px georgia, Times, 'Times New Roman', serif; color:#fff;background:transparent} @@ -109,4 +109,4 @@ pre.javascript .other { color: #F0F; } pre.css21 span.ident { color: #FFF; } pre.javascript span.comment { color: #88F; } -pre.xml span.punct { color: #8DF; font-weight: bold; } \ No newline at end of file +pre.xml span.punct { color: #8DF; font-weight: bold; } diff -r 450bcedf4ed4 -r 85a60c32503c ui/themes/default/pretty.css --- a/ui/themes/default/pretty.css Fri Sep 23 23:05:08 2011 +0900 +++ b/ui/themes/default/pretty.css Sat Sep 24 04:00:11 2011 +0900 @@ -46,7 +46,7 @@ div.slide {top:0px;width:92%;padding:2.5em 4% 4%} div.slide h1 {position:absolute;top:0;left:145px;z-index:1;color:#DDE; - text-align:left;white-space:nowrap;text-transform:capitalize; + text-align:left;white-space:nowrap; margin:0px;padding:0.3em 0 0 50px;font:bold 150%/1em Helvetica,sans-serif} div.slide h3 {font-size:130%} div.long {font-size:0.75em} diff -r 450bcedf4ed4 -r 85a60c32503c ui/themes/flower/pretty.css --- a/ui/themes/flower/pretty.css Fri Sep 23 23:05:08 2011 +0900 +++ b/ui/themes/flower/pretty.css Sat Sep 24 04:00:11 2011 +0900 @@ -50,7 +50,7 @@ font-family:georgia,times,'Times New Roman',serif} div.slide h1 {position:absolute;z-index:1;background:transparent; margin:0;padding:5px 0 0 64px;white-space:nowrap; - text-transform:capitalize;top:0;left:64px;color:#4A040A; + top:0;left:64px;color:#4A040A; font:150%/1em georgia, times, 'Times New Roman', serif} div.slide h3 {font-size:130%} div.long {font-size:0.75em} diff -r 450bcedf4ed4 -r 85a60c32503c ui/themes/nautilus/pretty.css --- a/ui/themes/nautilus/pretty.css Fri Sep 23 23:05:08 2011 +0900 +++ b/ui/themes/nautilus/pretty.css Sat Sep 24 04:00:11 2011 +0900 @@ -48,7 +48,7 @@ font-family:Verdana, Helvetica, Arial, sans-serif} div.slide h1 {position:absolute;top:24px;left:64px;z-index:1;color:#FFF; background:transparent;margin:0px;padding:0 0 0 50px;white-space:nowrap; - font:bold 30px Helvetica, sans-serif;text-transform:capitalize} + font:bold 30px Helvetica, sans-serif;} div.slide h3 {font-size:130%} div.long {font-size:0.75em} /* diff -r 450bcedf4ed4 -r 85a60c32503c ui/themes/pixel/pretty.css --- a/ui/themes/pixel/pretty.css Fri Sep 23 23:05:08 2011 +0900 +++ b/ui/themes/pixel/pretty.css Sat Sep 24 04:00:11 2011 +0900 @@ -48,7 +48,7 @@ font-family:Verdana, Helvetica, Arial, sans-serif} div.slide h1 {position:absolute;top:24px;left:64px;z-index:1;color:#FFF; background:transparent;margin:0px;padding:0 0 0 50px;white-space:nowrap; - font:bold 30px Helvetica, sans-serif;text-transform:capitalize} + font:bold 30px Helvetica, sans-serif;} div.slide h3 {font-size:130%} div.long {font-size:0.75em} /*