diff --git a/GNUmakefile b/GNUmakefile --- a/GNUmakefile +++ b/GNUmakefile @@ -3,15 +3,15 @@ # hardcode some bits RUBBER=rubber +DARCS = dist/build/darcs/darcs PREPROC=./dist/build/darcs/darcs --preprocess-manual PREPROCHTML=--html TEXSOURCES = src/darcs.tex $(wildcard src/*.tex) $(filter %.lhs,$(DARCS_FILES)) -doc/manual/*.tex: dist/build/darcs/darcs -doc/manual/darcs.tex: $(TEXSOURCES) +doc/manual/darcs.tex: $(TEXSOURCES) $(DARCS) $(PREPROC) darcs.tex $(PREPROCHTML) >$@ -doc/manual/darcs_print.tex: $(TEXSOURCES) +doc/manual/darcs_print.tex: $(TEXSOURCES) $(DARCS) $(PREPROC) darcs.tex >$@ -doc/manual/patch-theory.tex: $(TEXSOURCES) $(UNIT_FILES) +doc/manual/patch-theory.tex: $(TEXSOURCES) $(UNIT_FILES) $(DARCS) $(PREPROC) Darcs/Patch/Properties.lhs >$@ %.pdf: %.tex diff --git a/Setup.lhs b/Setup.lhs --- a/Setup.lhs +++ b/Setup.lhs @@ -5,10 +5,12 @@ import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) +import Distribution.ModuleName( toFilePath ) import Distribution.PackageDescription ( PackageDescription(executables), Executable(buildInfo, exeName) , BuildInfo(customFieldsBI), emptyBuildInfo - , updatePackageDescription, cppOptions, ccOptions ) + , updatePackageDescription, cppOptions, ccOptions + , library, libBuildInfo, otherModules ) import Distribution.Package ( packageVersion ) import Distribution.Version @@ -108,8 +110,13 @@ y <- context verb pkgVer rewriteFile "release/distributed-version" $ show x rewriteFile "release/distributed-context" $ show y + putStrLn "about to hand over" + let pkg' = pkg { library = sanity (library pkg) } + sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } + sanity _ = error "eh" + sanity' bi = bi { otherModules = [ m | m <- otherModules bi, toFilePath m /= "Version" ] } - sDistHook simpleUserHooks pkg lbi hooks flags + sDistHook simpleUserHooks pkg' lbi hooks flags } -- | For @./Setup build@ and @./Setup haddock@, do some unusual @@ -117,17 +124,13 @@ commonBuildHook :: (UserHooks -> PackageDescription -> LocalBuildInfo -> t -> a) -> PackageDescription -> LocalBuildInfo -> t -> Verbosity -> IO a commonBuildHook runHook pkg lbi hooks verbosity = do - -- Autoconf may have generated a context file. Remove it before - -- building, as its existence inexplicably breaks Cabal. - removeFile "src/Context.hs" - `catch` (\e -> unless (isDoesNotExistError e) (ioError e)) + (version, state) <- determineVersion verbosity pkg -- Create our own context file. - writeGeneratedModules verbosity pkg lbi + generateVersionModule verbosity pkg lbi version state -- Add custom -DFOO[=BAR] flags to the cpp (for .hs) and cc (for .c) -- invocations, doing a dance to make the base hook aware of them. - (version, state) <- determineVersion verbosity pkg littleEndian <- testEndianness let args = ("-DPACKAGE_VERSION=" ++ show' version) : ("-DPACKAGE_VERSION_STATE=" ++ show' state) : @@ -168,14 +171,6 @@ (mandir (absoluteInstallDirs pkg lbi copy) "man1") [(buildDir lbi "darcs", "darcs.1")] -writeGeneratedModules :: Verbosity - -> PackageDescription -> LocalBuildInfo -> IO () -writeGeneratedModules verbosity pkg lbi = do - createDirectoryIfMissingVerbose verbosity True (autogenModulesDir lbi) - - let contextModulePath = autogenModulesDir lbi "Context.hs" - generateContextModule verbosity contextModulePath pkg - determineVersion :: Verbosity -> PackageDescription -> IO (String, String) determineVersion verbosity pkg = do let darcsVersion = packageVersion pkg @@ -216,12 +211,16 @@ where versionFile = "release/distributed-version" -generateContextModule :: (Package pkg) => Verbosity -> FilePath -> pkg -> IO () -generateContextModule verbosity targetFile pkg = do +generateVersionModule :: Verbosity -> PackageDescription -> LocalBuildInfo + -> String -> String -> IO () +generateVersionModule verbosity pkg lbi version state = do + let dir = autogenModulesDir lbi + createDirectoryIfMissingVerbose verbosity True dir ctx <- context verbosity (packageVersion pkg) - rewriteFile targetFile $ unlines - ["module Context where" - ,"context :: String" + rewriteFile (dir "Version.hs") $ unlines + ["module Version where" + ,"version, context :: String" + ,"version = \"" ++ version ++ " (" ++ state ++ ")\"" ,"context = " ++ case ctx of Just x -> show x Nothing -> show "context not available" diff --git a/darcs-beta-2.3.98.1.tar.gz b/darcs-beta-2.3.98.1.tar.gz deleted file mode 100644 Binary files a/darcs-beta-2.3.98.1.tar.gz and /dev/null differ diff --git a/darcs-beta.cabal b/darcs-beta.cabal --- a/darcs-beta.cabal +++ b/darcs-beta.cabal @@ -1,5 +1,5 @@ -Name: darcs-beta -version: 2.3.98.1 +Name: darcs-beta +version: 2.3.98.2 License: GPL License-file: COPYING Author: David Roundy , @@ -48,7 +48,7 @@ -- documentation files src/best_practices.tex, src/building_darcs.tex, src/configuring_darcs.tex, src/features.tex, src/formats.tex, src/gpl.tex, src/switching.tex, src/darcs.tex - doc/manual/patch-theory.tex, + doc/manual/images.tex, doc/manual/bigimages.tex, doc/manual/patch-theory.tex, doc/darcs.css README, NEWS @@ -295,7 +295,7 @@ URL Workaround - other-modules: ThisVersion + other-modules: Version c-sources: src/atomic_create.c src/fpstring.c @@ -323,7 +323,7 @@ html == 1.0.*, filepath == 1.1.*, haskeline >= 0.6.1 && < 0.7, - hashed-storage >= 0.4.2 && < 0.5 + hashed-storage >= 0.4.5 && < 0.5 if !os(windows) build-depends: unix >= 1.0 && < 2.5 @@ -453,7 +453,7 @@ html == 1.0.*, filepath == 1.1.*, haskeline >= 0.6.1 && < 0.7, - hashed-storage >= 0.4.2 && < 0.5 + hashed-storage >= 0.4.4 && < 0.5 if !os(windows) build-depends: unix >= 1.0 && < 2.5 diff --git a/doc/manual/bigimages.tex b/doc/manual/bigimages.tex new file mode 100644 --- /dev/null +++ b/doc/manual/bigimages.tex @@ -0,0 +1,605 @@ +\batchmode + + +\documentclass{book} +\RequirePackage{ifthen} + + + + +\usepackage{verbatim} +\usepackage{html} +\usepackage{fancyvrb} + +% +\newenvironment{code}{\comment}{\endcomment} + + + + +\usepackage[dvips]{color} + + +\pagecolor[gray]{.7} + +\usepackage[latin1]{inputenc} + + + +\makeatletter + +\makeatletter +\count@=\the\catcode`\_ \catcode`\_=8 +\newenvironment{tex2html_wrap}{}{}% +\catcode`\<=12\catcode`\_=\count@ +\newcommand{\providedcommand}[1]{\expandafter\providecommand\csname #1\endcsname}% +\newcommand{\renewedcommand}[1]{\expandafter\providecommand\csname #1\endcsname{}% + \expandafter\renewcommand\csname #1\endcsname}% +\newcommand{\newedenvironment}[1]{\newenvironment{#1}{}{}\renewenvironment{#1}}% +\let\newedcommand\renewedcommand +\let\renewedenvironment\newedenvironment +\makeatother +\let\mathon=$ +\let\mathoff=$ +\ifx\AtBeginDocument\undefined \newcommand{\AtBeginDocument}[1]{}\fi +\newbox\sizebox +\setlength{\hoffset}{0pt}\setlength{\voffset}{0pt} +\addtolength{\textheight}{\footskip}\setlength{\footskip}{0pt} +\addtolength{\textheight}{\topmargin}\setlength{\topmargin}{0pt} +\addtolength{\textheight}{\headheight}\setlength{\headheight}{0pt} +\addtolength{\textheight}{\headsep}\setlength{\headsep}{0pt} +\setlength{\textwidth}{349pt} +\newwrite\lthtmlwrite +\makeatletter +\let\realnormalsize=\normalsize +\global\topskip=2sp +\def\preveqno{}\let\real@float=\@float \let\realend@float=\end@float +\def\@float{\let\@savefreelist\@freelist\real@float} +\def\liih@math{\ifmmode$\else\bad@math\fi} +\def\end@float{\realend@float\global\let\@freelist\@savefreelist} +\let\real@dbflt=\@dbflt \let\end@dblfloat=\end@float +\let\@largefloatcheck=\relax +\let\if@boxedmulticols=\iftrue +\def\@dbflt{\let\@savefreelist\@freelist\real@dbflt} +\def\adjustnormalsize{\def\normalsize{\mathsurround=0pt \realnormalsize + \parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}% + \def\phantompar{\csname par\endcsname}\normalsize}% +\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}% +\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }% +\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }% +\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup % + \let\ifinner=\iffalse \let\)\liih@math }% +\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}% + \expandafter\box\next\egroup}% +\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}% +\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox + \ifdim\dimen0>.95\vsize + \lthtmltypeout{% +*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}% + \ht\sizebox.95\vsize \dp\sizebox\z@ \fi + \lthtmltypeout{l2hSize % +:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}% +\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist + \lthtmlmathtype{#1}\lthtmlvboxmathA}% +\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}% +\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup + \let\@savefreelist\@freelist \lthtmlhboxmathB}% +\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}% +\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox + \global\let\@freelist\@savefreelist}% +\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}% +\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}% +\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}% + \lthtmldisplayA{#1}\let\@eqnnum\relax}% +\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}% +\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB} +\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA + \vrule height1.5ex width0pt }% +\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}% +\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}% +\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % + \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline} +\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % + \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath} +\newcommand\lthtmlindisplaymathZ{\egroup % + \centerinlinemath\lthtmllogmath\lthtmlsetmath} +\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{% + \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi + \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} +\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{% + \kern.1em\kern0.8 pt\hbox{\hglue.17em\copy\sizebox\hglue0.8 pt}}\kern.3pt% + \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.8 pt% + \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} +\def\centerinlinemath{% + \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi + \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1 + \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax} + +\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize + \ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill + \else\expandafter\vss\fi}% +\providecommand{\selectlanguage}[1]{}% +\makeatletter \tracingstats = 1 + + +\begin{document} +\pagestyle{empty}\thispagestyle{empty}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength hsize=\the\hsize}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength vsize=\the\vsize}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength hoffset=\the\hoffset}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength voffset=\the\voffset}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength topmargin=\the\topmargin}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength topskip=\the\topskip}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength headheight=\the\headheight}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength headsep=\the\headsep}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength parskip=\the\parskip}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength oddsidemargin=\the\oddsidemargin}\lthtmltypeout{}% +\makeatletter +\if@twoside\lthtmltypeout{latex2htmlLength evensidemargin=\the\evensidemargin}% +\else\lthtmltypeout{latex2htmlLength evensidemargin=\the\oddsidemargin}\fi% +\lthtmltypeout{}% +\makeatother +\setcounter{page}{1} +\onecolumn + +% !!! IMAGES START HERE !!! + +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2771}% +$<$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2773}% +$>$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{section} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2775}% +$+$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2777}% +$R_{c}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2779}% +$f_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2781}% +$R_c$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2783}% +$R_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2787}% +$f_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2795}% +$R_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2835}% +$R_p$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2839}% +$R_l$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{chapter} +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2841}% +$\backslash$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2847}% +$ R_1 \bigcup R_2 +\bigcup R_3 \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2849}% +$ R_1 \bigcap R_2 \bigcap R_3 \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2851}% +$ S +\backslash S \rightarrow \emptyset $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2853}% +$ R_1 +\backslash (R_2 \bigcup R_3 \bigcup \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} + +% +\providecommand{\pullwarning}[1]{ +\textbf{WARNING:} #1 should not be run when there is a possibility +that another user may be pulling from the same repository. Attempting to do so +may cause repository corruption.}% + +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsection} +\appendix +\stepcounter{section} +\stepcounter{paragraph} + + +\addtolength{\itemsep}{-0.5\baselineskip}% + +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} + + +\addtolength{\itemsep}{-0.5\baselineskip}% + +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{section} +\stepcounter{chapter} + + +\newtheorem{thm}{Theorem}% + + + +\newtheorem{dfn}{Definition}% + +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2863}% +$P_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2865}% +$P_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2867}% +$P_2P_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2873}% +$P_1\parallel P_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2875}% +$P^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2877}% +$P$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2759}% +\( P^{ -1} P \)% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2763}% +\begin{displaymath} (P_2 P_1)^{ -1} = P_1^{ -1} P_2^{ -1}. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2881}% +$O(n)$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} + +% +\providecommand{\commutex}{\longleftrightarrow}% + + +% +\providecommand{\commutes}{\longleftrightarrow}% + +{\newpage\clearpage +\lthtmldisplayA{displaymath2764}% +\begin{displaymath} P_2 P_1 \longleftrightarrow {P_1}' {P_2}'. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2887}% +$P_1'$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2893}% +$P_2'$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2897}% +$\longleftrightarrow $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2899}% +$==$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2901}% +$\ddot\frown$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} + +% +\providecommand{\merge}{\Longrightarrow}% + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2760}% +\( \Longrightarrow \)% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2765}% +\begin{displaymath} P_2 \parallel P_1 \Longrightarrow {P_2}' P_1 \longleftrightarrow {P_1}' P_2. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2911}% +$ P_2' P_1 \longleftrightarrow P_1' P_2 $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2913}% +$ P_1'^{ -1} +P_2' \longleftrightarrow P_2 P_1^{ -1} $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2915}% +$P_1'^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2917}% +$P_1^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2766}% +\begin{displaymath} +A^{ -1} C \longleftrightarrow C' A'^{ -1} +\end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{chapter} +\addtocounter{enumi}{-1} +\stepcounter{section} + +\end{document} diff --git a/doc/manual/images.tex b/doc/manual/images.tex new file mode 100644 --- /dev/null +++ b/doc/manual/images.tex @@ -0,0 +1,605 @@ +\batchmode + + +\documentclass{book} +\RequirePackage{ifthen} + + + + +\usepackage{verbatim} +\usepackage{html} +\usepackage{fancyvrb} + +% +\newenvironment{code}{\comment}{\endcomment} + + + + +\usepackage[dvips]{color} + + +\pagecolor[gray]{.7} + +\usepackage[latin1]{inputenc} + + + +\makeatletter + +\makeatletter +\count@=\the\catcode`\_ \catcode`\_=8 +\newenvironment{tex2html_wrap}{}{}% +\catcode`\<=12\catcode`\_=\count@ +\newcommand{\providedcommand}[1]{\expandafter\providecommand\csname #1\endcsname}% +\newcommand{\renewedcommand}[1]{\expandafter\providecommand\csname #1\endcsname{}% + \expandafter\renewcommand\csname #1\endcsname}% +\newcommand{\newedenvironment}[1]{\newenvironment{#1}{}{}\renewenvironment{#1}}% +\let\newedcommand\renewedcommand +\let\renewedenvironment\newedenvironment +\makeatother +\let\mathon=$ +\let\mathoff=$ +\ifx\AtBeginDocument\undefined \newcommand{\AtBeginDocument}[1]{}\fi +\newbox\sizebox +\setlength{\hoffset}{0pt}\setlength{\voffset}{0pt} +\addtolength{\textheight}{\footskip}\setlength{\footskip}{0pt} +\addtolength{\textheight}{\topmargin}\setlength{\topmargin}{0pt} +\addtolength{\textheight}{\headheight}\setlength{\headheight}{0pt} +\addtolength{\textheight}{\headsep}\setlength{\headsep}{0pt} +\setlength{\textwidth}{349pt} +\newwrite\lthtmlwrite +\makeatletter +\let\realnormalsize=\normalsize +\global\topskip=2sp +\def\preveqno{}\let\real@float=\@float \let\realend@float=\end@float +\def\@float{\let\@savefreelist\@freelist\real@float} +\def\liih@math{\ifmmode$\else\bad@math\fi} +\def\end@float{\realend@float\global\let\@freelist\@savefreelist} +\let\real@dbflt=\@dbflt \let\end@dblfloat=\end@float +\let\@largefloatcheck=\relax +\let\if@boxedmulticols=\iftrue +\def\@dbflt{\let\@savefreelist\@freelist\real@dbflt} +\def\adjustnormalsize{\def\normalsize{\mathsurround=0pt \realnormalsize + \parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}% + \def\phantompar{\csname par\endcsname}\normalsize}% +\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}% +\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }% +\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }% +\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup % + \let\ifinner=\iffalse \let\)\liih@math }% +\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}% + \expandafter\box\next\egroup}% +\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}% +\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox + \ifdim\dimen0>.95\vsize + \lthtmltypeout{% +*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}% + \ht\sizebox.95\vsize \dp\sizebox\z@ \fi + \lthtmltypeout{l2hSize % +:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}% +\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist + \lthtmlmathtype{#1}\lthtmlvboxmathA}% +\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}% +\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup + \let\@savefreelist\@freelist \lthtmlhboxmathB}% +\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}% +\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox + \global\let\@freelist\@savefreelist}% +\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}% +\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}% +\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}% + \lthtmldisplayA{#1}\let\@eqnnum\relax}% +\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}% +\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB} +\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA + \vrule height1.5ex width0pt }% +\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}% +\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}% +\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % + \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline} +\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % + \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath} +\newcommand\lthtmlindisplaymathZ{\egroup % + \centerinlinemath\lthtmllogmath\lthtmlsetmath} +\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{% + \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi + \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} +\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{% + \kern.1em\kern0.8 pt\hbox{\hglue.17em\copy\sizebox\hglue0.8 pt}}\kern.3pt% + \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.8 pt% + \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} +\def\centerinlinemath{% + \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi + \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1 + \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax} + +\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize + \ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill + \else\expandafter\vss\fi}% +\providecommand{\selectlanguage}[1]{}% +\makeatletter \tracingstats = 1 + + +\begin{document} +\pagestyle{empty}\thispagestyle{empty}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength hsize=\the\hsize}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength vsize=\the\vsize}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength hoffset=\the\hoffset}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength voffset=\the\voffset}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength topmargin=\the\topmargin}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength topskip=\the\topskip}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength headheight=\the\headheight}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength headsep=\the\headsep}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength parskip=\the\parskip}\lthtmltypeout{}% +\lthtmltypeout{latex2htmlLength oddsidemargin=\the\oddsidemargin}\lthtmltypeout{}% +\makeatletter +\if@twoside\lthtmltypeout{latex2htmlLength evensidemargin=\the\evensidemargin}% +\else\lthtmltypeout{latex2htmlLength evensidemargin=\the\oddsidemargin}\fi% +\lthtmltypeout{}% +\makeatother +\setcounter{page}{1} +\onecolumn + +% !!! IMAGES START HERE !!! + +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2771}% +$<$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2773}% +$>$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{section} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2775}% +$+$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2777}% +$R_{c}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2779}% +$f_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2781}% +$R_c$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2783}% +$R_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2787}% +$f_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2795}% +$R_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2835}% +$R_p$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2839}% +$R_l$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{chapter} +\stepcounter{chapter} +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2841}% +$\backslash$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2847}% +$ R_1 \bigcup R_2 +\bigcup R_3 \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2849}% +$ R_1 \bigcap R_2 \bigcap R_3 \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2851}% +$ S +\backslash S \rightarrow \emptyset $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2853}% +$ R_1 +\backslash (R_2 \bigcup R_3 \bigcup \ldots$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} + +% +\providecommand{\pullwarning}[1]{ +\textbf{WARNING:} #1 should not be run when there is a possibility +that another user may be pulling from the same repository. Attempting to do so +may cause repository corruption.}% + +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{subsubsection} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{subsubsection} +\stepcounter{subsection} +\appendix +\stepcounter{section} +\stepcounter{paragraph} + + +\addtolength{\itemsep}{-0.5\baselineskip}% + +\stepcounter{paragraph} +\stepcounter{section} +\stepcounter{paragraph} + + +\addtolength{\itemsep}{-0.5\baselineskip}% + +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{section} +\stepcounter{section} +\stepcounter{chapter} + + +\newtheorem{thm}{Theorem}% + + + +\newtheorem{dfn}{Definition}% + +\stepcounter{section} +\stepcounter{section} +\stepcounter{section} +\stepcounter{subsection} +\stepcounter{subsection} +\stepcounter{section} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2863}% +$P_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2865}% +$P_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2867}% +$P_2P_1$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2873}% +$P_1\parallel P_2$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2875}% +$P^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2877}% +$P$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2759}% +\( P^{ -1} P \)% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2763}% +\begin{displaymath} (P_2 P_1)^{ -1} = P_1^{ -1} P_2^{ -1}. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{subsection} +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2881}% +$O(n)$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{subsection} + +% +\providecommand{\commutex}{\longleftrightarrow}% + + +% +\providecommand{\commutes}{\longleftrightarrow}% + +{\newpage\clearpage +\lthtmldisplayA{displaymath2764}% +\begin{displaymath} P_2 P_1 \longleftrightarrow {P_1}' {P_2}'. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2887}% +$P_1'$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2893}% +$P_2'$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2897}% +$\longleftrightarrow $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2899}% +$==$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2901}% +$\ddot\frown$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{paragraph} + +% +\providecommand{\merge}{\Longrightarrow}% + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2760}% +\( \Longrightarrow \)% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2765}% +\begin{displaymath} P_2 \parallel P_1 \Longrightarrow {P_2}' P_1 \longleftrightarrow {P_1}' P_2. \end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{subsection} +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2911}% +$ P_2' P_1 \longleftrightarrow P_1' P_2 $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2913}% +$ P_1'^{ -1} +P_2' \longleftrightarrow P_2 P_1^{ -1} $% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2915}% +$P_1'^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmlinlinemathA{tex2html_wrap_inline2917}% +$P_1^{ -1}$% +\lthtmlinlinemathZ +\lthtmlcheckvsize\clearpage} + +{\newpage\clearpage +\lthtmldisplayA{displaymath2766}% +\begin{displaymath} +A^{ -1} C \longleftrightarrow C' A'^{ -1} +\end{displaymath}% +\lthtmldisplayZ +\lthtmlcheckvsize\clearpage} + +\stepcounter{section} +\stepcounter{section} +\stepcounter{paragraph} +\stepcounter{paragraph} +\stepcounter{chapter} +\stepcounter{chapter} +\addtocounter{enumi}{-1} +\stepcounter{section} + +\end{document} diff --git a/release/distributed-context b/release/distributed-context --- a/release/distributed-context +++ b/release/distributed-context @@ -1,1 +1,1 @@ -Just "\nContext:\n\n[TAG 2.3.98.1\nReinier Lamers **20100103150819\n Ignore-this: def816d83bf49dc3bc16c7473323385f\n] \n" +Just "\nContext:\n\n[TAG 2.3.98.2\nReinier Lamers **20100117211225\n Ignore-this: 6b00150eff9b4cbf81db6e2dabd336ad\n] \n" diff --git a/src/Darcs/Commands/Help.lhs b/src/Darcs/Commands/Help.lhs --- a/src/Darcs/Commands/Help.lhs +++ b/src/Darcs/Commands/Help.lhs @@ -38,7 +38,7 @@ import Printer ( text ) import Ssh ( environmentHelpSsh, environmentHelpScp, environmentHelpSshPort ) import System.Exit ( ExitCode(..), exitWith ) -import ThisVersion ( darcs_version ) +import Version ( version ) import URL (environmentHelpProxy, environmentHelpProxyPassword) import Workaround ( getCurrentDirectory ) import qualified Darcs.TheCommands as TheCommands @@ -99,7 +99,7 @@ isRight _ = False printVersion :: IO () -printVersion = putStrLn $ "darcs version " ++ darcs_version +printVersion = putStrLn $ "darcs version " ++ version -- avoiding a module import cycle between Help and TheCommands commandControlList :: [CommandControl] @@ -148,7 +148,7 @@ -- | The lines of the manpage to be printed. manpageLines :: [String] manpageLines = [ - ".TH DARCS 1 \"" ++ darcs_version ++ "\"", + ".TH DARCS 1 \"" ++ version ++ "\"", ".SH NAME", "darcs \\- an advanced revision control system", ".SH SYNOPSIS", diff --git a/src/Darcs/Repository/Prefs.lhs b/src/Darcs/Repository/Prefs.lhs --- a/src/Darcs/Repository/Prefs.lhs +++ b/src/Darcs/Repository/Prefs.lhs @@ -124,7 +124,7 @@ as \verb!manual/index.html!) matches any of the boring regular expressions is considered boring. The boring file is used to filter the files provided to darcs add, to allow you to use a -simple \verb-darcs add newdir newdir/*- +simple \verb-darcs add newdir newdir/-\verb-*- % cabal haddock barfs on adjacent / * without accidentally adding a bunch of object files. It is also used when the \verb!--look-for-adds! flag is given to whatsnew or record. diff --git a/src/Preproc.hs b/src/Preproc.hs --- a/src/Preproc.hs +++ b/src/Preproc.hs @@ -27,7 +27,7 @@ import Darcs.Arguments ( optionsLatex ) import Darcs.Commands.Help ( commandControlList, environmentHelp ) import English ( andClauses ) -import ThisVersion ( darcs_version ) +import Version ( version ) the_commands :: [DarcsCommand] the_commands = extractCommands commandControlList @@ -80,7 +80,7 @@ else return $ "\\end{Verbatim}" : rest preproc ("\\darcsVersion":ss) = do rest <- preproc ss - return $ darcs_version:rest + return $ version:rest preproc (s:ss) = do rest <- preproc ss let rx = mkRegex "^\\\\(input|darcs(Command|Env))\\{(.+)\\}$" diff --git a/src/ThisVersion.hs b/src/ThisVersion.hs deleted file mode 100644 --- a/src/ThisVersion.hs +++ /dev/null @@ -1,13 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# OPTIONS -cpp #-} - -module ThisVersion ( darcs_version ) where - -#ifndef PACKAGE_VERSION -#define PACKAGE_VERSION "0" -#define PACKAGE_VERSION_STATE "no version info" -#endif - -{-# NOINLINE darcs_version #-} -darcs_version :: String -darcs_version = PACKAGE_VERSION ++ " (" ++ PACKAGE_VERSION_STATE ++ ")" diff --git a/src/darcs.hs b/src/darcs.hs --- a/src/darcs.hs +++ b/src/darcs.hs @@ -29,9 +29,8 @@ import Darcs.RunCommand ( run_the_command ) import Darcs.Flags ( DarcsFlag(Verbose) ) import Darcs.Commands.Help ( helpCmd, listAvailableCommands, printVersion ) -import ThisVersion ( darcs_version ) import Darcs.SignalHandler ( withSignalsHandled ) -import Context ( context ) +import Version ( version, context ) import Darcs.Global ( with_atexit ) import Preproc( preproc_main ) import Exec ( ExecException(..) ) @@ -61,8 +60,8 @@ ["--help"] -> helpCmd [] [] ["--overview"] -> helpCmd [Verbose] [] ["--commands"] -> listAvailableCommands - ["-v"] -> putStrLn darcs_version - ["--version"] -> putStrLn darcs_version + ["-v"] -> putStrLn version + ["--version"] -> putStrLn version ["--exact-version"] -> do putStrLn $ "darcs compiled on "++__DATE__++", at "++__TIME__ putStrLn context diff --git a/src/witnesses.hs b/src/witnesses.hs --- a/src/witnesses.hs +++ b/src/witnesses.hs @@ -1,6 +1,5 @@ -import Context +import Version -- import Preproc -- imports Darcs.Commands.Help -import ThisVersion -- import Darcs.ArgumentDefaults -- imports Darcs.Commands.Help import Darcs.Patch.Real import Darcs.Patch.Properties