Skip to content

Commit 05d513c

Browse files
skallerskaller
committed
hack references to fdoc to refer to html instead
1 parent 995e26b commit 05d513c

19 files changed

+247
-245
lines changed

‎GNUmakefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ tut:
88
for file in /Users/skaller/felix/src/web/tut/*.fdoc; do \
99
env DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH} flx_pretty --outdir=web "$${file}"; \
1010
done
11-
for file in web/*.html; do sed -i -e s/fdoc/html/g ${file}; done
11+
for file in web/*.html; do sed -i -e s/fdoc/html/g $${file}; done
1212
rm web/*.html-e
1313

1414

1515
packages:
1616
for file in /Users/skaller/felix/src/packages/*.fdoc; do \
1717
env DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH} flx_pretty --outdir=packages "$${file}"; \
1818
done
19+
for file in packages/*.html; do sed -i -e s/fdoc/html/g $${file}; done
20+
rm -rf packages/*.html-e
1921

2022
extract:
2123
flx_iscr embedc.fdoc

‎packages/algebra.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -479,21 +479,21 @@
479479
<h1 id='Synopsis._h'><img src='/share/src/web/images/minus.gif' id='Synopsis.' onclick='toggle(this,"Synopsis._d")' alt='+'/> 1 Synopsis.</h1><div id='Synopsis._d' style='display:block'>
480480
<pre class='inclusion'>
481481
share/lib/std/algebra/__init__.flx</pre>
482-
<p><pre class='flxbg'><span class="lineno" id=line1></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/predicate"</span>; <span class="comment">// in logic.fdoc</span>
483-
<span class="lineno" id=line2></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/set"</span>; <span class="comment">// in algebra.fdoc</span>
484-
<span class="lineno" id=line3></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/container"</span>; <span class="comment">// in algebra.fdoc</span>
485-
<span class="lineno" id=line4></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/equiv"</span>; <span class="comment">// in algebra.fdoc</span>
486-
<span class="lineno" id=line5></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/partialorder"</span>; <span class="comment">// in algebra.fdoc </span>
487-
<span class="lineno" id=line6></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/totalorder"</span>; <span class="comment">// in algebra.fdoc</span>
488-
<span class="lineno" id=line7></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/sequence"</span>; <span class="comment">// in algebra.fdoc</span>
489-
<span class="lineno" id=line8></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/group"</span>; <span class="comment">// in algebra.fdoc</span>
490-
<span class="lineno" id=line9></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/ring"</span>; <span class="comment">// in algebra.fdoc</span>
491-
<span class="lineno" id=line10></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/bits"</span>; <span class="comment">// in algebra.fdoc</span>
492-
<span class="lineno" id=line11></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/integer"</span>; <span class="comment">// in algebra.fdoc</span>
493-
<span class="lineno" id=line12></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/trig"</span>; <span class="comment">// in algebra.fdoc</span>
494-
<span class="lineno" id=line13></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/real"</span>; <span class="comment">// in algebra.fdoc</span>
495-
<span class="lineno" id=line14></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/complex"</span>; <span class="comment">// in algebra.fdoc</span>
496-
<span class="lineno" id=line15></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/monad"</span>; <span class="comment">// in algebra.fdoc</span>
482+
<p><pre class='flxbg'><span class="lineno" id=line1></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/predicate"</span>; <span class="comment">// in logic.html</span>
483+
<span class="lineno" id=line2></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/set"</span>; <span class="comment">// in algebra.html</span>
484+
<span class="lineno" id=line3></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/container"</span>; <span class="comment">// in algebra.html</span>
485+
<span class="lineno" id=line4></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/equiv"</span>; <span class="comment">// in algebra.html</span>
486+
<span class="lineno" id=line5></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/partialorder"</span>; <span class="comment">// in algebra.html </span>
487+
<span class="lineno" id=line6></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/totalorder"</span>; <span class="comment">// in algebra.html</span>
488+
<span class="lineno" id=line7></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/sequence"</span>; <span class="comment">// in algebra.html</span>
489+
<span class="lineno" id=line8></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/group"</span>; <span class="comment">// in algebra.html</span>
490+
<span class="lineno" id=line9></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/ring"</span>; <span class="comment">// in algebra.html</span>
491+
<span class="lineno" id=line10></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/bits"</span>; <span class="comment">// in algebra.html</span>
492+
<span class="lineno" id=line11></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/integer"</span>; <span class="comment">// in algebra.html</span>
493+
<span class="lineno" id=line12></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/trig"</span>; <span class="comment">// in algebra.html</span>
494+
<span class="lineno" id=line13></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/real"</span>; <span class="comment">// in algebra.html</span>
495+
<span class="lineno" id=line14></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/complex"</span>; <span class="comment">// in algebra.html</span>
496+
<span class="lineno" id=line15></span> <span class="big_keyword" title="Include a Felix file">include</span> <span class="fstring">"std/algebra/monad"</span>; <span class="comment">// in algebra.html</span>
497497
<span class="lineno" id=line16></span>
498498
</pre></p></div><h1 id='Description._h'><img src='/share/src/web/images/minus.gif' id='Description.' onclick='toggle(this,"Description._d")' alt='+'/> 2 Description.</h1><div id='Description._d' style='display:block'>
499499
<p>In this section we provide abstract definitions of some basic

‎packages/blake3.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,15 @@
354354
onmouseover="mouseover('collapse')"
355355
onmouseout="mouseout('collapse')"
356356
onclick="collapse_all('collapse')"
357-
><span id="collapse"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Collapse</text></svg></span><span id="collapse_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Collapse</text></svg></span></span><a href='blake2.fdoc'><span style="position:relative; bottom:6px"
357+
><span id="collapse"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Collapse</text></svg></span><span id="collapse_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Collapse</text></svg></span></span><a href='blake2.html'><span style="position:relative; bottom:6px"
358358
onmouseover="mouseover('prev')"
359359
onmouseout="mouseout('prev')"
360360
onclick="nop('prev')"
361-
><span id="prev"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Prev</text></svg></span><span id="prev_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Prev</text></svg></span></span></a> <a href='blake4.fdoc'><span style="position:relative; bottom:6px"
361+
><span id="prev"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Prev</text></svg></span><span id="prev_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Prev</text></svg></span></span></a> <a href='blake4.html'><span style="position:relative; bottom:6px"
362362
onmouseover="mouseover('next')"
363363
onmouseout="mouseout('next')"
364364
onclick="nop('next')"
365-
><span id="next"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Next</text></svg></span><span id="next_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Next</text></svg></span></span></a> <a href='blakeindex.fdoc'><span style="position:relative; bottom:6px"
365+
><span id="next"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:blue;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Next</text></svg></span><span id="next_mo" style="display:none"><svg height="30px" width="65px"><rect x="4px" y="6px" rx="4px" ry="40px" width="60px" height="20px" style="fill:red;opacity:0.2;stroke:black;stroke-width:2"/><text x="13px" y="21px" fill="black" style="font-size:12px;">Next</text></svg></span></span></a> <a href='blakeindex.html'><span style="position:relative; bottom:6px"
366366
onmouseover="mouseover('index')"
367367
onmouseout="mouseout('index')"
368368
onclick="nop('index')"

‎packages/buildtools.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ <h1 id='Tools_to_build_the_core_Felix_system._h'><img src='/share/src/web/images
10711071
<span class="lineno" id=line37></span> <span class="small_keyword" title="conditional">if</span> cmd.repo != cmd.target_dir/<span class="fstring">'share'</span> <span class="small_keyword" title="imperative code begins">do</span>
10721072
<span class="lineno" id=line38></span> <span class="library" title="Print a string to standard output with newline appended">println</span>$ <span class="fstring">"Copy repository "</span>+cmd.repo/<span class="fstring">'src -&gt; '</span> + cmd.target_dir/<span class="fstring">'share'</span>/<span class="fstring">'src'</span>;
10731073
<span class="lineno" id=line39></span> CopyFiles::copyfiles(cmd.repo/<span class="fstring">'src'</span>,
1074-
<span class="lineno" id=line40></span> <span class="fstring">'(.*\.(h|hpp|ml|mli|c|cpp|cxx|cc|flx|flxh|fdoc|fsyn|js|html|css|svg|png|gif|jpg|files|include|ttf))'</span>,
1074+
<span class="lineno" id=line40></span> <span class="fstring">'(.*\.(h|hpp|ml|mli|c|cpp|cxx|cc|flx|flxh|html|fsyn|js|html|css|svg|png|gif|jpg|files|include|ttf))'</span>,
10751075
<span class="lineno" id=line41></span> cmd.target_dir/<span class="fstring">'share'</span>/<span class="fstring">'src'</span>/<span class="fstring">'${1}'</span>,<span class="library" title="truth value">true</span>,cmd.debug);
10761076
<span class="lineno" id=line42></span> <span class="small_keyword" title="conditional">else</span>
10771077
<span class="lineno" id=line43></span> <span class="library" title="Print a string to standard output with newline appended">println</span>$ <span class="fstring">"Cannot copy repo because source = target"</span>;
@@ -1080,7 +1080,7 @@ <h1 id='Tools_to_build_the_core_Felix_system._h'><img src='/share/src/web/images
10801080
<span class="lineno" id=line46></span>
10811081
<span class="lineno" id=line47></span> <span class="small_keyword" title="conditional">if</span> cmd.copy_library <span class="small_keyword" title="imperative code begins">do</span>
10821082
<span class="lineno" id=line48></span> <span class="library" title="Print a string to standard output with newline appended">println</span>$ <span class="fstring">"Copy Felix library"</span>;
1083-
<span class="lineno" id=line49></span> CopyFiles::copyfiles (cmd.target_dir/<span class="fstring">'share'</span>/<span class="fstring">'src'</span>/<span class="fstring">'lib'</span>, r<span class="fstring">"(.*\.(flx|flxh|fsyn|fdoc|files))"</span>,
1083+
<span class="lineno" id=line49></span> CopyFiles::copyfiles (cmd.target_dir/<span class="fstring">'share'</span>/<span class="fstring">'src'</span>/<span class="fstring">'lib'</span>, r<span class="fstring">"(.*\.(flx|flxh|fsyn|html|files))"</span>,
10841084
<span class="lineno" id=line50></span> cmd.target_dir/<span class="fstring">'share'</span>/<span class="fstring">'lib/${1}'</span>,<span class="library" title="truth value">true</span>,cmd.debug);
10851085
<span class="lineno" id=line51></span> <span class="small_keyword" title="end of body">done</span>
10861086
<span class="lineno" id=line52></span>
@@ -1813,16 +1813,16 @@ <h1 id='Tools_to_build_the_core_Felix_system._h'><img src='/share/src/web/images
18131813
</p><pre class='inclusion'>
18141814
$PWD/src/config/build_boot.fpc</pre>
18151815
<p><pre class="prefmtbg">web_plugin: cpp2html
1816-
web_plugin: fdoc2html
1817-
web_plugin: fdoc_edit
1818-
web_plugin: fdoc_button
1819-
web_plugin: fdoc_fileseq
1820-
web_plugin: fdoc_heading
1821-
web_plugin: fdoc_paragraph
1822-
web_plugin: fdoc_scanner
1823-
web_plugin: fdoc_slideshow
1816+
web_plugin: html2html
1817+
web_plugin: html_edit
1818+
web_plugin: html_button
1819+
web_plugin: html_fileseq
1820+
web_plugin: html_heading
1821+
web_plugin: html_paragraph
1822+
web_plugin: html_scanner
1823+
web_plugin: html_slideshow
18241824
web_plugin: toc_menu
1825-
web_plugin: fdoc_frame
1825+
web_plugin: html_frame
18261826
web_plugin: flx2html
18271827
web_plugin: fpc2html
18281828
web_plugin: ocaml2html

‎packages/driver.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ <h2 id='Entry_points_h'><img src='/share/src/web/images/minus.gif' id='Entry poi
896896
# ------------------------------------------------------------------------------
897897

898898
def build( phase):
899-
#print("[fbuild:flx_drivers.py:build (in src/packages/driver.fdoc)] ********** BUILDING DRIVERS ***********************************************")
899+
#print("[fbuild:flx_drivers.py:build (in src/packages/driver.html)] ********** BUILDING DRIVERS ***********************************************")
900900
path = Path(phase.ctx.buildroot/'share'/'src/flx_drivers')
901901

902902
#dlfcn_h = config_call('fbuild.config.c.posix.dlfcn_h',

‎packages/filetools.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ <h1 id='File_System_Tools._h'><img src='/share/src/web/images/minus.gif' id='Fil
729729
</p><p>It was designed for document renumbering, especially Felix
730730
tutorial documents, since the Felix webserver automatically
731731
calculates Next and Prev links when it asked to display
732-
an <code>fdoc</code> file with a numerical suffix of two digits.
732+
an <code>html</code> file with a numerical suffix of two digits.
733733
However it can be used on any sequenced file set.
734734
</p><pre class='inclusion'>
735735
$PWD/src/tools/flx_renumber.flx</pre>
@@ -739,7 +739,7 @@ <h1 id='File_System_Tools._h'><img src='/share/src/web/images/minus.gif' id='Fil
739739
<span class="lineno" id=line4></span> <span class="library" title="Print a string to standard output with newline appended">println</span> <span class="fstring">"Usage: rentut dir regexp first dst"</span>;
740740
<span class="lineno" id=line5></span> <span class="library" title="Print a string to standard output with newline appended">println</span> <span class="fstring">"For tutorial try:"</span>;
741741
<span class="lineno" id=line6></span> <span class="library" title="Print a string to standard output with newline appended">println</span> r<span class="fstring">" dir = 'src/web'"</span>;
742-
<span class="lineno" id=line7></span> <span class="library" title="Print a string to standard output with newline appended">println</span> r<span class="fstring">" re = 'tut_(\d*)\\.fdoc'"</span>;
742+
<span class="lineno" id=line7></span> <span class="library" title="Print a string to standard output with newline appended">println</span> r<span class="fstring">" re = 'tut_(\d*)\\.html'"</span>;
743743
<span class="lineno" id=line8></span> System::exit(1);
744744
<span class="lineno" id=line9></span> <span class="small_keyword" title="end of body">done</span>
745745
<span class="lineno" id=line10></span>

0 commit comments

Comments
 (0)