2.1.0 release

yianwillis · Aug 21, 2017 · 978faa9 · 978faa9
1 parent 3023ed0
commit 978faa9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,7 @@
 2017-08-20 yianwillis@gmail.com update reference
 
+ChangeLog
+VERSION
 devel/pdf_maker/reference.inp
 devel/pdf_maker/user_manual.inp
 devel/release/vcd-setup-unicode.nsi

diff --git a/devel/doc/main.aap b/devel/doc/main.aap
@@ -4,10 +4,10 @@ TOPLEVELDIR = ../..
 @Files = expand2string(glob(DOC_FILES))
 
 :attr {publish = $SF_SCP_WEB_URL/doc/%file%} vim-stylesheet.css
-#:attr {publish = $SF_SCP_WEB_URL/doc/%file%} *.html
+:attr {publish = $SF_SCP_WEB_URL/doc/%file%} *.html
 
 allhtml {virtual}:
-    :sys $TOOLS_DIR/vim2html.pl $DOC_DIR/tags-cn $DOC_FILES
+    :sys $TOOLS_DIR/vim2html.pl --banner $DOC_DIR/tags-cn $DOC_FILES
     :copy $TOOLS_DIR/vim-stylesheet.css .
 
 all {virtual}:

diff --git a/devel/pdf_maker/main.aap b/devel/pdf_maker/main.aap
@@ -8,7 +8,8 @@ all:
 	:print Use 'aap release' to generate pdf mauals to release.
 
 help.html:
-	:execute ../doc/main.aap allhtml
+	:sys $TOOLS_DIR/vim2html.pl $DOC_DIR/tags-cn $DOC_FILES
+	:copy $TOOLS_DIR/vim-stylesheet.css .
 	:sys ./uncss.sh
 
 :rule %.tex: help.html ../tools/html2lex %.inp
@@ -22,6 +23,5 @@ release: reference.pdf user_manual.pdf
         :copy user_manual.pdf $(RELEASE_DIR)/user_manual-$(VERSION).pdf
 
 clean:
-	:del {r}{force} *.html *.pdf *.tex *.aux *.log *.out *.fdb_latexmk *.fls
-	:execute ../doc/main.aap clean
+	:del {r}{force} *.html *.pdf *.tex *.aux *.log *.out *.fdb_latexmk *.fls *.css
 	:execute $TOOLS_DIR/main.aap clean
diff --git a/devel/pdf_maker/uncss.sh b/devel/pdf_maker/uncss.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-for i in ../doc/*.html; do
+for i in *.html; do
   cat $i |
   perl -np -e 's/<code class="note">((?:.(?!<\/?code))*.)<\/code>/<dfn>\1<\/dfn>/g' |
   perl -np -e 's/<code class="keystroke">((?:.(?!<\/?code))*.)<\/code>/<kbd>\1<\/kbd>/g' |

diff --git a/devel/tools/vim2html.pl b/devel/tools/vim2html.pl
@@ -13,11 +13,14 @@
 use Text::Tabs; # Willis: expand replaced by myexpand. So no longer necessary.
 use Encode;
 use vars qw/%url $date/;
+use Getopt::Long qw(GetOptions);
 
 %url = ();
 $date = Encode::decode_utf8(`date -u`);
 chop $date;
 
+my $show_banner;
+
 sub maplink
 {
 	my $tag = shift;
@@ -127,6 +130,15 @@ sub vim2html
 	my $head = uc( $outfile );
 
 	my $filler = ' ' x 80;
+	my $banner = $show_banner ? <<"EOF" : "";
+<div id=banner>
+<a href="help.html">帮助总览</a> &middot;
+<a href="quickref.html">快速参考</a> &middot;
+<a href="usr_toc.html">用户手册</a> &middot;
+<a href="help.html#reference_toc">参考手册</a>
+</div>
+EOF
+
 	print OUT<<EOF;
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -136,13 +148,7 @@ sub vim2html
 <link rel="stylesheet" href="vim-stylesheet.css" type="text/css">
 </head>
 <body>
-<h2></h2>
-<div id=banner>
-<a href="help.html">帮助总览</a> &middot;
-<a href="quickref.html">快速参考</a> &middot;
-<a href="usr_toc.html">用户手册</a> &middot;
-<a href="help.html#reference_toc">参考手册</a>
-</div>
+$banner
 <div id=outer><pre id=sp>$filler</pre><div id=inner>
 <pre>
 EOF
@@ -288,7 +294,9 @@ sub usage
 vim2html.pl: converts vim documentation to HTML.
 usage:
 
-	vim2html.pl <tag file> <text files>
+	vim2html.pl [--banner] <tag file> <text files>
+	Parameters:
+	--banner: optional. Print banner line.
 EOF
 }
 
@@ -298,6 +306,10 @@ sub usage
 #usage() if $#ARGV < 2;
 usage() if !defined $ARGV[1];
 
+GetOptions(
+    'banner' => \$show_banner,
+) or usage();
+
 print "Processing tags...\n";
 readTagFile( $ARGV[ 0 ] );