Author: dylan
Date: 2004-08-11 22:37:29 -0400 (Wed, 11 Aug 2004)
New Revision: 349
Removed:
trunk/docs/manual/macros.tex
Modified:
trunk/docs/manual/Makefile
trunk/docs/manual/buildlatex
trunk/docs/manual/chap/commands.tex
trunk/docs/manual/chap/commands/server.tex
trunk/docs/manual/config.m4
trunk/docs/manual/haver.tex
trunk/docs/manual/style.tex
Log:
Well, make html sort of works now.
Modified: trunk/docs/manual/Makefile
===================================================================
--- trunk/docs/manual/Makefile 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/Makefile 2004-08-12 02:37:29 UTC (rev 349)
@@ -9,10 +9,11 @@
-or -name '*.blg' \
-or -name '*.toc' \
-or -name '*.out' \
- -or -name 'config.tex'
+ -or -name 'config.tex' \
+ -or -name tags
base = haver
tex = $(shell find -name '*.tex')
-files = $(tex) config.m4 haver.big
+files = $(tex) config.m4 haver.bib
ARGS += -D VERSION=$(VERSION)
@@ -46,13 +47,14 @@
$(base).dvi: $(base).tex $(files)
- ./buildlatex -f DVI $(ARGS) $<
+ ./buildlatex -D DRIVER=dvips $(ARGS) $<
$(base).pdf: $(base).tex $(files)
- ./buildlatex -f PDF $(ARGS) -l pdflatex $<
+ ./buildlatex -D DRIVER=pdftex $(ARGS) -l pdflatex $<
-#$(base)/$(base).html: $(base).tex $(tex)
-# latex2html -local_icons -split 3 $<
+$(base)/$(base).html: $(base).tex $(files)
+ ./buildlatex -D DRIVER=latex2html $(ARGS) --dry-run $<
+ latex2html -local_icons -split 3 $<
.PHONY: all clean dvi
Modified: trunk/docs/manual/buildlatex
===================================================================
--- trunk/docs/manual/buildlatex 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/buildlatex 2004-08-12 02:37:29 UTC (rev 349)
@@ -7,7 +7,7 @@
use constant RERUN_MAX => 6;
sub spoon (&);
-my ($latex, @feature, %define, $config, $texfile);
+my ($latex, @feature, %define, $config, $texfile, $dryrun);
$latex = "latex";
$config = "config.m4";
@@ -17,6 +17,7 @@
'feature|have|f=s' => [EMAIL PROTECTED],
'define|d|D=s' => \%define,
'config|c=s' => \$config,
+ 'dry-run|dry' => \$dryrun,
);
$texfile = shift or die "Usage: $0 [options] file\n";
@@ -37,6 +38,8 @@
exec('m4', @args, $config);
};
+exit 0 if $dryrun;
+
if (defined $code and $code == 0) {
my $rerun = 0;
my $count = 0;
Modified: trunk/docs/manual/chap/commands/server.tex
===================================================================
--- trunk/docs/manual/chap/commands/server.tex 2004-08-11 19:27:16 UTC (rev
348)
+++ trunk/docs/manual/chap/commands/server.tex 2004-08-12 02:37:29 UTC (rev
349)
@@ -5,21 +5,22 @@
This section describes the commands that servers may send to clients.
-\begin{commands}
- \begin{cmddef}{HAVER}{\param{client}}
- \citem{\Desc}
- This command may only be sent once during
- the liftetime the connection.
-
- A client will send this command when it
- first connects to the server. The argument
\param{client}
- should be the name and version num\-ber of the user
agent.
- \citem{\Res}
- The server will send \scmd{HAVER} and \scmd{WANT}.
-
- \citem{\Err} None.
- \end{cmddef}
-
-\end{commands}
-
+%\begin{commands}
+% \begin{cmddef}{HAVER}{\param{client}}
+% \citem{\Desc}
+% This command may only be sent once during
+% the liftetime the connection.
+%
+% A client will send this command when it
+% first connects to the server. The argument
\param{client}
+% should be the name and version num\-ber of the user
agent.
+%
+% \citem{\Res}
+% The server will send \scmd{HAVER} and \scmd{WANT}.
+%
+% \citem{\Err} None.
+% \end{cmddef}
+%
+%\end{commands}
+%
Modified: trunk/docs/manual/chap/commands.tex
===================================================================
--- trunk/docs/manual/chap/commands.tex 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/chap/commands.tex 2004-08-12 02:37:29 UTC (rev 349)
@@ -1,44 +1,10 @@
% vim: set isk=@,48-57,192-255,/,\:,.:
-\newenvironment{commands}{\begin{description}}{\end{description}}
-\newenvironment{errors}{\begin{description}}{\end{description}}
-\newcommand{\param}[1]{\emph{#1}}
-\newcommand{\opt}[1]{[\param{#1}]}
-\newcommand{\params}[1]{\param{#1\ldots}}
-\newcommand{\opts}[1]{[\param{#1\ldots}]}
-\newcommand{\cmd}[1]{{\bfseries #1}}
-\newcommand{\scmd}[1]{\cmd{#1}}
-\newcommand{\error}[1]{#1}
-
-\newcommand{\eitem}[2]{\item[\error{#1}] \param{#2}}
-\newcommand{\citem}[1]{\item[#1] ~ \par}
-
-\ifhas{COLOR}{
- \renewcommand{\param}[1]{\textcolor{param}{\emph{#1}}}
- \renewcommand{\cmd}[1]{\textcolor{cmd}{{\bfseries #1}}}
- \renewcommand{\scmd}[1]{\textcolor{scmd}{{\bfseries #1}}}
- \renewcommand{\error}[1]{\textcolor{err}{#1}}
-}
-
-
-
-
\newcommand{\Res}{Results}
\newcommand{\Desc}{Description}
\newcommand{\Err}{Errors}
-\newcommand{\cmddefcmd}[1]{\cmd{#1}}
-\newenvironment{cmddef}[2]{%
- \item[\cmdcmd{#1}] #2
-
- \begin{description}%
- \nopagebreak[1]
-}{%
- \end{description}%
-}
-
-
\chapter{Commands}
This chapter describes the building blocks that clients and servers
@@ -69,10 +35,6 @@
\input{chap/commands/client}
-% Change the formatting of command entries
-% in \begin{cmddef}.
-\renewcommand{\cmddefcmd}[1]{\scmd{#1}}
-
\input{chap/commands/server}
\section{Errors}
Modified: trunk/docs/manual/config.m4
===================================================================
--- trunk/docs/manual/config.m4 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/config.m4 2004-08-12 02:37:29 UTC (rev 349)
@@ -1,13 +1,39 @@
dnl Edit the makefile if you want to configure this. :)
-ifdef(`have', , dnl
-`define(`have', `\newboolean{have$1}dnl
-\setboolean{have$1}{ifdef(`$1', `true', `false')}')')dnl
-ifdef(`version', , dnl
-`define(`version', ``\newcommand{\version}{$1}'')')
+\newcommand{\version}{VERSION}
+ifdef(`COLOR',
+ `\usepackage{color}',
+ `\newcommand{\textcolor}[2]{#2}
+\newcommand{\definecolor}[3]{}')
-version(VERSION)
-have(`COLOR')
-have(`DRAFT')
-have(`PDF')
+ifdef(`DRAFT',
+ `\newcommand{\comment}[1]{[\emph{#1}]}',
+ `\newcommand{\comment}[1]{}')
+
+ifdef(`DRIVER', `\usepackage[DRIVER]{hyperref}')
+
+
+
+ifelse(DRIVER, `latex2html',
+dnl HTML
+`\renewenvironment{cmddef}[2]{%
+ \item[#1 {\normalfont #2}]
+ \begin{description}%
+ \nopagebreak[1]
+}{%
+ \end{description}%
+}
+\newcommand{\citem}[1]{\item[#1]}',
+dnl Regular
+`\newenvironment{cmddef}[2]{%
+ \item[#1] #2
+
+ \begin{description}%
+ \nopagebreak[1]
+}{%
+ \end{description}%
+}
+\newcommand{\citem}[1]{\item[#1] ~ \par}')
+
+
Modified: trunk/docs/manual/haver.tex
===================================================================
--- trunk/docs/manual/haver.tex 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/haver.tex 2004-08-12 02:37:29 UTC (rev 349)
@@ -1,18 +1,10 @@
% Date: Wednesday, May 26 at 7:45PM
% vim: set isk=@,48-57,192-255,/,\:,.:
\documentclass[12pt]{report}
-\usepackage{ifthen}
\input{config}
-\input{macros}
-
-\ifhas{COLOR}{\usepackage{color}}
-\usepackage{url}
-\ifhas{PDF}{\usepackage[pdftex]{hyperref}}
-
\input{style}
-
\title{The Divine Secrets of Haver (v\version)}
\author{Dylan William Hardison}
\date{\today}
Deleted: trunk/docs/manual/macros.tex
===================================================================
--- trunk/docs/manual/macros.tex 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/macros.tex 2004-08-12 02:37:29 UTC (rev 349)
@@ -1,8 +0,0 @@
-% vim: set isk=@,48-57,192-255,/,\:,.:
-
-\newcommand{\ifhas}[2]{%
-\ifthenelse{\boolean{have#1}}{#2}{ }%
-}
-\newcommand{\ifhaselse}[3]{%
-\ifthenelse{\boolean{have#1}}{#2}{#3}%
-}
Modified: trunk/docs/manual/style.tex
===================================================================
--- trunk/docs/manual/style.tex 2004-08-11 19:27:16 UTC (rev 348)
+++ trunk/docs/manual/style.tex 2004-08-12 02:37:29 UTC (rev 349)
@@ -1,17 +1,32 @@
% vim: set isk=@,48-57,192-255,/,\:,.:
-\ifhas{COLOR}{
\definecolor{cmd}{rgb}{0,0,0.5}
\definecolor{scmd}{rgb}{0.2,0,0.9}
\definecolor{param}{rgb}{0.5,0,0}
\definecolor{err}{rgb}{1,0,0}
+
+\newcommand{\function}[1]{\emph{#1()}}
+\newcommand{\variable}[1]{\emph{#1}}
+
+\renewcommand{\bibname}{References}
+
+
+\newenvironment{commands}{%
+ \begin{description}%
+}{%
+ \end{description}%
}
+\newenvironment{errors}{\begin{description}}{\end{description}}
-\ifhaselse{DRAFT}{
-\newcommand{\comment}[1]{[\emph{#1}]}
-}{\newcommand{\comment}[1]{}}
+\newcommand{\eitem}[2]{\item[\error{#1}] \param{#2}}
+\newcommand{\cmdbullet}[1]{#1}
-\newcommand{\function}[1]{#1()}
-\newcommand{\variable}[1]{\emph{#1}}
+\newcommand{\param}[1]{\textcolor{param}{\emph{#1}}}
+\newcommand{\opt}[1]{[\param{#1}]}
+\newcommand{\params}[1]{\param{#1\ldots\ }}
+\newcommand{\opts}[1]{[\param{#1\ldots}]}
+\newcommand{\cmd}[1]{\textcolor{cmd}{{\bfseries #1}}}
+\newcommand{\scmd}[1]{\textcolor{scmd}{{\bfseries #1}}}
+\newcommand{\error}[1]{\textcolor{err}{#1}}
-\renewcommand{\bibname}{References}
+
