Mercurial > pub > dyncall > dyncall

changeset 69:43675cb378ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- work on html doc generation
author cslag
date Sun, 06 Mar 2016 16:28:01 +0100
parents b36a2fe30602
children 33c333ec5ad2
files ToDo autovar/README.txt doc/manual/manual_literature.tex doc/manual/manual_tex4ht.cfg doc/manual/manual_title.tex
diffstat 5 files changed, 84 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/ToDo	Sun Mar 06 12:53:02 2016 +0100
+++ b/ToDo	Sun Mar 06 16:28:01 2016 +0100
@@ -4,18 +4,18 @@
   fiddle to dyncall_macros.h, clean this all up, eventually (Tassilo: for now, I
   removed out of sync files to avoid confusion; but still probably duped code)
 - ppc32 callback fixes on bsd
-- make install should install manpages
+- add portable "make install"
+  * make install should also install manpages
 - mailing list announcements (html email?)
 - fix for NDS:
-    * ARM:
-      - callback_plain retval wrong (not only platform)
-    * THUMB:
-      - ellipsis (might be test itself, not respecting fixed part of args)
-      - callback_plain retval
-      - callf
+  * ARM:
+    - callback_plain retval wrong (not only platform)
+  * THUMB:
+    - ellipsis (might be test itself, not respecting fixed part of args)
+    - callback_plain retval
+    - callf
 - fix Minix/x86 callbacks (see callback_suite)
 - armhf ellipsis: fix weirdness with long long as first ... arg
-- add portable "make install"
 - support Solaris11 CFLAGS with -D_FILE_OFFSET_BITS=64
 - make sure selinux works (esp. regarding NX bits, asm might need (or similar): .section .note.GNU-stack,"",@progbits)
   Daniel has a patch for it, if needed, implementing allocwx with two memory blocks, one for w^x, mmaped to one for r|x
--- a/autovar/README.txt	Sun Mar 06 12:53:02 2016 +0100
+++ b/autovar/README.txt	Sun Mar 06 16:28:01 2016 +0100
@@ -59,6 +59,7 @@
 OSFAMILY: 
   Windows
   Unix
+  GameConsole
 
 CC:
   INTEL
--- a/doc/manual/manual_literature.tex	Sun Mar 06 12:53:02 2016 +0100
+++ b/doc/manual/manual_literature.tex	Sun Mar 06 16:28:01 2016 +0100
@@ -19,9 +19,10 @@
 
 \newpage
 
-\section{Literature}
+% Force a cut for html output, here.
+\ifhtml{\CutAt{likesection}}
 
-\begin{thebibliography}{14}
+\begin{thebibliography}{99}
 \bibitem{Erlang}
 	Erlang/OTP\\
 	\url{http://www.erlang.org}
--- a/doc/manual/manual_tex4ht.cfg	Sun Mar 06 12:53:02 2016 +0100
+++ b/doc/manual/manual_tex4ht.cfg	Sun Mar 06 16:28:01 2016 +0100
@@ -1,8 +1,25 @@
-\Preamble{xhtml,index=2,2,next,pic-tabular,charset="utf-8",p-width,pic-align}
-\Configure{VERSION}{} 
-\Configure{VERSION}{} 
-\Configure{DOCTYPE}{\HCode{<!DOCTYPE html>\Hnewline}} 
+% Set html output type and how the pages will be organized; index=a,b,c means a
+% column index, b depth partitioning per page, and if c is present and 'next',
+% that next-links recurses.
+% Use b=1 for outputting one big html page. b=2 would partition by sections, b=3
+% by sections and subsections, and so on...
+\Preamble{html,info,index=2,1,next,pic-tabular,charset="utf-8",p-width,pic-align}
+% For manual partitioning we use b=1 above, then \CutAt
+%\CutAt{subsubsection,subsection,likesubsection,section,likesection,part}
+\CutAt{section}
+
+%% Don't want TOC to be on own page.
+%\ConfigureToc{likesubsubsection}{}{~}{}{ }
+
+% Here goes stuff that should be *before* <head>...</head>
+% Use it for configurations, no actual output.
+
+\Configure{VERSION}{}
+\Configure{DOCTYPE}{\HCode{<!DOCTYPE html>\Hnewline}}
 \Configure{HTML}{\HCode{<html>\Hnewline}}{\HCode{\Hnewline</html>}}
+\Configure{BODY}{\HCode{<body><div class="mainDiv">\Hnewline}}{\HCode{\Hnewline</div></body>}}
+
+% Clear default header, define our custom one. Using @HEAD will make this be used on all pages generated.
 \Configure{@HEAD}{}
 \Configure{@HEAD}{\HCode{<meta http-equiv="content-type" content="text/html; charset=utf-8"/>\Hnewline}}
 \Configure{@HEAD}{\HCode{<meta name="resource-type" content="document"/>\Hnewline}}
@@ -11,12 +28,33 @@
 \Configure{@HEAD}{\HCode{<link rel="stylesheet" id="dyn-fonts-css" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700&amp;subset=latin,latin-ext" type="text/css" media="all"/>\Hnewline}}
 % should this really rely on online content (dyncall's .css) even for an offline build? @@@
 \Configure{@HEAD}{\HCode{<link rel="stylesheet" href="http://dyncall.org/data/main.css" type="text/css" media="all"/>\Hnewline}}
-\Configure{@HEAD}{\HCode{<title>dyncall.org - dyncall Manual</title>\Hnewline}}
+
+%\ConfigureEnv{titlepage}
+%{\ifvmode \IgnorePar\fi
+%  \EndP
+%  \HCode{<h1>}\IgnorePar }
+%{\ifvmode \IgnorePar\fi
+%  \EndP \HCode{</h1>}}
+%{}
+%{}
+%\ConfigureList{enumerate}
+%{\HCode{<div>}}
+%{\HCode{</div>}}
+%{\HCode{<span class="mark">}}
+%{\HCode{</span>} }
+
+% Configure element translations.
+
+% Sections (to include number, use \thesection)
+\Configure{section}       {} {} {\HCode{<h1>}} {\HCode{</h1>}}
+\Configure{subsection}    {} {} {\HCode{<h2>}} {\HCode{</h2>}}
+\Configure{subsubsection} {} {} {\HCode{<h3>}} {\HCode{</h3>}}
 
 %\DeclareMathSizes{12}{11}{7}{6}
-%\DeclareMathSizes{10}{9}{5}{4} 
+%\DeclareMathSizes{10}{9}{5}{4}
 %\DeclareMathSizes{11}{10}{6}{5}
 
-\begin{document} 
+
+\begin{document} % After this comes stuff that should be *in* <head>...</head>, however only for main generated page.
 
 \EndPreamble
--- a/doc/manual/manual_title.tex	Sun Mar 06 12:53:02 2016 +0100
+++ b/doc/manual/manual_title.tex	Sun Mar 06 16:28:01 2016 +0100
@@ -17,18 +17,8 @@
 %
 %//////////////////////////////////////////////////////////////////////////////
 
-\begin{titlepage}
-\begin{center}%
-	{\Huge {\bf \product{dyncall}}}\\%
-        \ \\%
-        Version 0.9\\%
-        \ \\%
-        \ \\%
-	\ \\%
-	Daniel {\sc Adler} \small{\tt{(dadler@uni-goettingen.de)}}\\%
-	Tassilo {\sc Philipp} \small{\tt{(tphilipp@potion-studios.com)}}%
-\end{center}
-%
+\newcommand{\dyncallversion}{0.9}
+\newcommand{\titlelogo}{%
 \begingroup%
 \setlength{\unitlength}{1mm}%
 \begin{picture}(0,0)(-38,110)%
@@ -70,9 +60,34 @@
 %\put(32,10){\circle*{4}}
 %\put(37,12){\circle*{5}}
 %\end{picture}
+}
+
+% Don't output a dedicated title page for html
+\ifnhtml{
+
+\begin{titlepage}
+\begin{center}%
+	{\Huge {\bf \product{dyncall}}}\\%
+        \ \\%
+        Version \dyncallversion\\%
+        \ \\%
+        \ \\%
+	\ \\%
+	Daniel {\sc Adler} \small{\tt{(dadler@uni-goettingen.de)}}\\%
+	Tassilo {\sc Philipp} \small{\tt{(tphilipp@potion-studios.com)}}%
+\end{center}
 %
+\titlelogo
 \begin{center}
 	\today
 \end{center}
 \end{titlepage}
 
+} %ifnhtml
+
+% For html, this will just become a title/date, etc.
+\ifhtml{
+	\HCode{<h1>Manual <small>dyncall \dyncallversion</small></h1>}
+	\today
+}
+