mccode-dev · willend · Sep 18, 2026 · Sep 15, 2026 · Sep 15, 2026 · Sep 16, 2026
diff --git a/buildscripts/build_manuals_mcstas b/buildscripts/build_manuals_mcstas
@@ -14,6 +14,7 @@ echo
 echo LaTeX build of McStas manuals v $1 done!
 echo
 cp dist/mcstas-manuals-$1-noarch-not-packaged.work/*pdf docpkg/manuals/mcstas
+cp dist/mcstas-manuals-$1-noarch-not-packaged.work/*-html.tgz docpkg/manuals/mcstas 2>/dev/null || echo "(no HTML manual .tgz archives found -- htlatex/tex4ht not available during this build?)"
 echo
-echo Consider doing a git commit for the PDF files in docpkg/manuals/mcstas, as these have now been updated:
+echo Consider doing a git commit for the PDF and HTML-manual files in docpkg/manuals/mcstas, as these have now been updated:
 git status docpkg/manuals/mcstas
diff --git a/buildscripts/build_manuals_mcxtrace b/buildscripts/build_manuals_mcxtrace
@@ -14,6 +14,7 @@ echo
 echo LaTeX build of McXtrace manuals v $1 done!
 echo
 cp dist/mcxtrace-manuals-$1-noarch-not-packaged.work/*pdf docpkg/manuals/mcxtrace
+cp dist/mcxtrace-manuals-$1-noarch-not-packaged.work/*-html.tgz docpkg/manuals/mcxtrace 2>/dev/null || echo "(no HTML manual .tgz archives found -- htlatex/tex4ht not available during this build?)"
 echo
-echo Consider doing a git commit for the PDF files in docpkg/manuals/mcxtrace, as these have now been updated:
+echo Consider doing a git commit for the PDF and HTML-manual files in docpkg/manuals/mcxtrace, as these have now been updated:
 git status docpkg/manuals/mcxtrace
diff --git a/docpkg/manuals/mcstas/CMakeLists.txt b/docpkg/manuals/mcstas/CMakeLists.txt
@@ -54,3 +54,31 @@ install(FILES "${PROJECT_SOURCE_DIR}/Component_manual.pdf"
   DESTINATION "${MANDEST}"
   RENAME "${CMANUAL}"
 )
+
+# --- HTML manuals: ship the .tgz archives alongside the PDFs, and extract
+# each into its own subdirectory under ${DEST_DATADIR_DOC} at install time.
+install(FILES "${PROJECT_SOURCE_DIR}/manual-html.tgz"
+  DESTINATION "${MANDEST}"
+)
+
+install(FILES "${PROJECT_SOURCE_DIR}/Component_manual-html.tgz"
+  DESTINATION "${MANDEST}"
+)
+
+install(CODE "
+  set(_extract_dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDEST}/${FLAVOR}-manual\")
+  file(MAKE_DIRECTORY \"\${_extract_dir}\")
+  execute_process(
+    COMMAND \"${CMAKE_COMMAND}\" -E tar xzf \"${PROJECT_SOURCE_DIR}/manual-html.tgz\"
+    WORKING_DIRECTORY \"\${_extract_dir}\"
+  )
+")
+
+install(CODE "
+  set(_extract_dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDEST}/${FLAVOR}-components\")
+  file(MAKE_DIRECTORY \"\${_extract_dir}\")
+  execute_process(
+    COMMAND \"${CMAKE_COMMAND}\" -E tar xzf \"${PROJECT_SOURCE_DIR}/Component_manual-html.tgz\"
+    WORKING_DIRECTORY \"\${_extract_dir}\"
+  )
+")
diff --git a/docpkg/manuals/mcstas/Component_manual-html.tgz b/docpkg/manuals/mcstas/Component_manual-html.tgz
diff --git a/docpkg/manuals/mcstas/Component_manual.pdf b/docpkg/manuals/mcstas/Component_manual.pdf
diff --git a/docpkg/manuals/mcstas/manual-html.tgz b/docpkg/manuals/mcstas/manual-html.tgz
diff --git a/docpkg/manuals/mcstas/manual.pdf b/docpkg/manuals/mcstas/manual.pdf
diff --git a/docpkg/manuals/mcxtrace/CMakeLists.txt b/docpkg/manuals/mcxtrace/CMakeLists.txt
@@ -54,3 +54,31 @@ install(FILES "${PROJECT_SOURCE_DIR}/Component_manual.pdf"
   DESTINATION "${MANDEST}"
   RENAME "${CMANUAL}"
 )
+
+# --- HTML manuals: ship the .tgz archives alongside the PDFs, and extract
+# each into its own subdirectory under ${DEST_DATADIR_DOC} at install time.
+install(FILES "${PROJECT_SOURCE_DIR}/manual-html.tgz"
+  DESTINATION "${MANDEST}"
+)
+
+install(FILES "${PROJECT_SOURCE_DIR}/Component_manual-html.tgz"
+  DESTINATION "${MANDEST}"
+)
+
+install(CODE "
+  set(_extract_dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDEST}/${FLAVOR}-manual\")
+  file(MAKE_DIRECTORY \"\${_extract_dir}\")
+  execute_process(
+    COMMAND \"${CMAKE_COMMAND}\" -E tar xzf \"${PROJECT_SOURCE_DIR}/manual-html.tgz\"
+    WORKING_DIRECTORY \"\${_extract_dir}\"
+  )
+")
+
+install(CODE "
+  set(_extract_dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDEST}/${FLAVOR}-components\")
+  file(MAKE_DIRECTORY \"\${_extract_dir}\")
+  execute_process(
+    COMMAND \"${CMAKE_COMMAND}\" -E tar xzf \"${PROJECT_SOURCE_DIR}/Component_manual-html.tgz\"
+    WORKING_DIRECTORY \"\${_extract_dir}\"
+  )
+")
diff --git a/docpkg/manuals/mcxtrace/Component_manual-html.tgz b/docpkg/manuals/mcxtrace/Component_manual-html.tgz
diff --git a/docpkg/manuals/mcxtrace/Component_manual.pdf b/docpkg/manuals/mcxtrace/Component_manual.pdf
diff --git a/docpkg/manuals/mcxtrace/manual-html.tgz b/docpkg/manuals/mcxtrace/manual-html.tgz
diff --git a/docpkg/manuals/mcxtrace/manual.pdf b/docpkg/manuals/mcxtrace/manual.pdf
diff --git a/docs/GRAMMAR/Component/COMPONENT_Grammar.html b/docs/GRAMMAR/Component/COMPONENT_Grammar.html
@@ -6,7 +6,7 @@
 <title>McStas / McXtrace COMPONENT grammar</title>
 <style>
 :root {
-  color-scheme: light dark;
+  color-scheme: light;
   --bg: #ffffff;
   --fg: #1b1f24;
   --muted: #57606a;
@@ -18,20 +18,6 @@
   --th-bg: #f0f2f4;
   --hr: #d0d7de;
 }
-@media (prefers-color-scheme: dark) {
-  :root {
-    --bg: #0d1117;
-    --fg: #e6edf3;
-    --muted: #9198a1;
-    --border: #30363d;
-    --code-bg: #161b22;
-    --code-border: #30363d;
-    --link: #4493f8;
-    --toc-bg: #161b22;
-    --th-bg: #171b21;
-    --hr: #30363d;
-  }
-}
 * { box-sizing: border-box; }
 html { background: var(--bg); }
 body {
@@ -154,7 +140,7 @@ <h1 id="mcstas-mcxtrace-component-grammar">McStas / McXtrace COMPONENT grammar</
 <strong>instrument</strong> files. Each is written to stand alone — a little material (the
 reserved-keyword table, the particle-terminology note, the shared-grammar note) is
 intentionally duplicated in both. Keywords are case-insensitive but conventionally written in UPPERCASE; identifiers
-are case-sensitive C identifiers. Sources are listed at the end of the document (§13).</p>
+are case-sensitive C identifiers. Sources are listed at the end of the document (§12).</p>
 <p><strong>On "McStas" vs "McXtrace" vs "particle":</strong> the instrument/component grammar itself —
 every keyword and syntax rule in this document — is identical between the two codes; it's
 one shared parser. What differs is the physics carried by the traced entity: McStas

diff --git a/docs/GRAMMAR/Component/COMPONENT_Grammar.md b/docs/GRAMMAR/Component/COMPONENT_Grammar.md
@@ -5,7 +5,7 @@ files; the companion [`INSTRUMENT grammar`](../Instrument/INSTRUMENT_Grammar.md)
 **instrument** files. Each is written to stand alone — a little material (the
 reserved-keyword table, the particle-terminology note, the shared-grammar note) is
 intentionally duplicated in both. Keywords are case-insensitive but conventionally written in UPPERCASE; identifiers
-are case-sensitive C identifiers. Sources are listed at the end of the document (§13).
+are case-sensitive C identifiers. Sources are listed at the end of the document (§12).
 
 **On "McStas" vs "McXtrace" vs "particle":** the instrument/component grammar itself —
 every keyword and syntax rule in this document — is identical between the two codes; it's

diff --git a/docs/GRAMMAR/Instrument/INSTRUMENT_Grammar.html b/docs/GRAMMAR/Instrument/INSTRUMENT_Grammar.html
@@ -6,7 +6,7 @@
 <title>McStas / McXtrace INSTRUMENT grammar</title>
 <style>
 :root {
-  color-scheme: light dark;
+  color-scheme: light;
   --bg: #ffffff;
   --fg: #1b1f24;
   --muted: #57606a;
@@ -18,20 +18,6 @@
   --th-bg: #f0f2f4;
   --hr: #d0d7de;
 }
-@media (prefers-color-scheme: dark) {
-  :root {
-    --bg: #0d1117;
-    --fg: #e6edf3;
-    --muted: #9198a1;
-    --border: #30363d;
-    --code-bg: #161b22;
-    --code-border: #30363d;
-    --link: #4493f8;
-    --toc-bg: #161b22;
-    --th-bg: #171b21;
-    --hr: #30363d;
-  }
-}
 * { box-sizing: border-box; }
 html { background: var(--bg); }
 body {
@@ -154,7 +140,7 @@ <h1 id="mcstas-mcxtrace-instrument-grammar">McStas / McXtrace INSTRUMENT grammar
 files. Each is written to stand alone — a little material (the reserved-keyword table,
 the particle-terminology note, the shared-grammar note) is intentionally duplicated in
 both. Keywords are case-insensitive but conventionally written in UPPERCASE; identifiers
-are case-sensitive C identifiers. Sources are listed at the end of the document (§18).</p>
+are case-sensitive C identifiers. Sources are listed at the end of the document (§17).</p>
 <p><strong>On "McStas" vs "McXtrace" vs "particle":</strong> the instrument/component grammar itself —
 every keyword and syntax rule in this document — is identical between the two codes; it's
 one shared parser. What differs is the physics carried by the traced entity: McStas
@@ -848,9 +834,9 @@ <h2 id="17-source-material-for-this-reference">17. Source-material for this refe
   <code>Tests_grammar/</code> folder (<code>Unittest_JUMP_ITERATE</code>, <code>Unittest_JUMP_WHEN</code>,
   <code>Test_Jump_Iterate</code>, <code>Test_GROUP</code>, <code>Unittest_SPLIT</code>), plus <code>ILL_H25.instr</code>,
   <code>SNS_BASIS.instr</code>, <code>templateTAS.instr</code>, <code>Test_FZP_simple.instr</code>, and <code>test_File.instr</code>.</li>
-<li><code>01_Advanced_grammar.pptx</code> (uploaded slide deck) — cross-checked, gaps noted in §17.</li>
+<li><code>01_Advanced_grammar.pptx</code> (uploaded slide deck) — used as a baseline and cross-checked against the grammar sources above.</li>
 </ul>
-<p>See also: <code>McStas_McXtrace_COMPONENT_Grammar.md</code> (<a href="../Component/COMPONENT_Grammar.html"><code>COMPONENT grammar</code></a>, <code>.comp</code> grammar).</p>
+<p>See also: <a href="../Component/COMPONENT_Grammar.html"><code>COMPONENT grammar</code></a> (<code>.comp</code> grammar).</p>
 <footer>Generated from <code>INSTRUMENT_Grammar.md</code> — McCode grammar documentation.</footer>
 </article>
 </body>

diff --git a/docs/GRAMMAR/Instrument/INSTRUMENT_Grammar.md b/docs/GRAMMAR/Instrument/INSTRUMENT_Grammar.md
@@ -5,7 +5,7 @@ files; the companion [`COMPONENT grammar`](../Component/COMPONENT_Grammar.md) co
 files. Each is written to stand alone — a little material (the reserved-keyword table,
 the particle-terminology note, the shared-grammar note) is intentionally duplicated in
 both. Keywords are case-insensitive but conventionally written in UPPERCASE; identifiers
-are case-sensitive C identifiers. Sources are listed at the end of the document (§18).
+are case-sensitive C identifiers. Sources are listed at the end of the document (§17).
 
 **On "McStas" vs "McXtrace" vs "particle":** the instrument/component grammar itself —
 every keyword and syntax rule in this document — is identical between the two codes; it's
@@ -516,6 +516,6 @@ written against, predates the current McStas/McXtrace.
   `Tests_grammar/` folder (`Unittest_JUMP_ITERATE`, `Unittest_JUMP_WHEN`,
   `Test_Jump_Iterate`, `Test_GROUP`, `Unittest_SPLIT`), plus `ILL_H25.instr`,
   `SNS_BASIS.instr`, `templateTAS.instr`, `Test_FZP_simple.instr`, and `test_File.instr`.
-* `01_Advanced_grammar.pptx` (uploaded slide deck) — cross-checked, gaps noted in §17.
+* `01_Advanced_grammar.pptx` (uploaded slide deck) — used as a baseline and cross-checked against the grammar sources above.
 
-See also: `McStas_McXtrace_COMPONENT_Grammar.md` ([`COMPONENT grammar`](../Component/COMPONENT_Grammar.md), `.comp` grammar).
+See also: [`COMPONENT grammar`](../Component/COMPONENT_Grammar.md) (`.comp` grammar).
diff --git a/docs/manuals/mcstas/CMakeLists.txt b/docs/manuals/mcstas/CMakeLists.txt
@@ -18,6 +18,16 @@ include(UseLATEX)
 # set(PDFLATEX_COMPILER "/usr/bin/xelatex")
 message( "setup MCCODE" )
 setupMCCODE("${FLAVOR}")
+
+# Generate title.tex / title_comp.tex from their .in templates, substituting
+# the actual build version (@MCCODE_VERSION@) -- this is the version passed
+# as argument 1 to build_manuals_mcstas, already threaded through by
+# setupMCCODE() above via mkdist, with no changes needed there. Runs at
+# configure time, landing in ${CMAKE_CURRENT_BINARY_DIR} (== LATEX_OUTPUT_PATH
+# below), so the LaTeX build finds them there like any other input.
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/title.tex.in" "${CMAKE_CURRENT_BINARY_DIR}/title.tex" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/title_comp.tex.in" "${CMAKE_CURRENT_BINARY_DIR}/title_comp.tex" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/preamble_common.tex.in" "${CMAKE_CURRENT_BINARY_DIR}/preamble_common.tex" @ONLY)
 # CPack configuration
 message( "CPack configuration" )
 set(CPACK_PACKAGE_NAME          "${FLAVOR}-manuals")
@@ -58,21 +68,27 @@ file(GLOB LIST CONFIGURE_DEPENDS RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "*.tex" "*
 
 # TeX snippets
 foreach(NAME sources samples optics monitors misc union sasmodels contrib obsolete)
-   # PWFIXME: ONLY SEMI-FUNCTIONAL
+   file(GLOB ${NAME}_COMP_SOURCES CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/../../../mcstas-comps/${NAME}/*.comp")
    add_custom_command(
      OUTPUT "${NAME}.done"
-     COMMAND "mcdoc" "--tex" "--in-repo" "--dir=${CMAKE_SOURCE_DIR}/../../../mcstas-comps/${NAME}" "--outdir=${PROJECT_BINARY_DIR}"
+     COMMAND "mcdoc" "--tex" "--in-repo" "--dir=${CMAKE_SOURCE_DIR}/../../../mcstas-comps/${NAME}" "--outdir=${CMAKE_CURRENT_SOURCE_DIR}"
+     COMMAND "${CMAKE_COMMAND}" "-E" "touch" "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.done"
+     DEPENDS "${CMAKE_SOURCE_DIR}/../../../tools/Python/mcdoc/mcdoc.py" ${${NAME}_COMP_SOURCES}
      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
+     COMMENT "Regenerating ${NAME} LaTeX component/instrument doc snippets (in-place in the source tree)"
      )
 endforeach()
 
 # MD files
 foreach(NAME sources samples optics monitors misc union sasmodels contrib obsolete)
-   # PWFIXME: ONLY SENMI-FUNCTIONAL
+   file(GLOB ${NAME}_COMP_SOURCES_MD CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/../../../mcstas-comps/${NAME}/*.comp")
    add_custom_command(
      OUTPUT "${NAME}.mddone"
      COMMAND "mcdoc" "--md" "--in-repo" "--dir=${CMAKE_SOURCE_DIR}/../../../mcstas-comps/${NAME}"
+     COMMAND "${CMAKE_COMMAND}" "-E" "touch" "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.mddone"
+     DEPENDS "${CMAKE_SOURCE_DIR}/../../../tools/Python/mcdoc/mcdoc.py" ${${NAME}_COMP_SOURCES_MD}
      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
+     COMMENT "Regenerating ${NAME} Markdown component/instrument doc snippets"
      )
 endforeach()
 
@@ -103,3 +119,47 @@ install(FILES "${PROJECT_BINARY_DIR}/Component_manual.pdf"
   DESTINATION "${MANDEST}"
   RENAME "${CMANUAL}"
 )
+
+# --- HTML manual generation (tex4ht, MathJax math rendering), packaged as .tgz ---
+# Multi-pass build: htlatex -> bibtex -> makeindex -> htlatex x2 (to settle
+# cross-references and citations across the split HTML pages), then tar/gzip
+# the resulting page set. Requires texlive-plain-generic (htlatex/tex4ht) and
+# dvipng; skipped with a warning if htlatex isn't available rather than
+# failing the whole manuals build.
+find_program(HTLATEX_EXECUTABLE htlatex)
+find_program(BASH_EXECUTABLE bash)
+find_program(PYTHON3_EXECUTABLE python3)
+if(HTLATEX_EXECUTABLE AND BASH_EXECUTABLE AND PYTHON3_EXECUTABLE)
+  foreach(DOC manual Component_manual)
+    add_custom_command(
+      OUTPUT "${PROJECT_BINARY_DIR}/${DOC}-html.tgz"
+      COMMAND "${BASH_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/generate-xbb-files.sh"
+      COMMAND "${HTLATEX_EXECUTABLE}" "${DOC}.tex" "html,3,mathjax,charset=utf-8" " -cvalidate -cunihtf -utf8" ""
+      COMMAND "bibtex" "${DOC}"
+      COMMAND "makeindex" "${DOC}.idx"
+      COMMAND "${HTLATEX_EXECUTABLE}" "${DOC}.tex" "html,3,mathjax,charset=utf-8" " -cvalidate -cunihtf -utf8" ""
+      COMMAND "${HTLATEX_EXECUTABLE}" "${DOC}.tex" "html,3,mathjax,charset=utf-8" " -cvalidate -cunihtf -utf8" ""
+      COMMAND "${PYTHON3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/inject-toc-sidebar.py" "${DOC}"
+      COMMAND "${BASH_EXECUTABLE}" "-c" "cat '${CMAKE_CURRENT_SOURCE_DIR}/html-style-overrides.css' >> '${DOC}.css'"
+      COMMAND "${BASH_EXECUTABLE}" "-c" "tar czf '${DOC}-html.tgz' ${DOC}*.html ${DOC}.css figures 2>/dev/null || tar czf '${DOC}-html.tgz' ${DOC}*.html ${DOC}.css"
+      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
+      DEPENDS "${PROJECT_BINARY_DIR}/${DOC}.pdf" "${CMAKE_CURRENT_SOURCE_DIR}/html-style-overrides.css" "${CMAKE_CURRENT_SOURCE_DIR}/generate-xbb-files.sh" "${CMAKE_CURRENT_SOURCE_DIR}/inject-toc-sidebar.py"
+      COMMENT "Building HTML version of ${DOC} (tex4ht/MathJax), injecting TOC sidebar, and packaging as ${DOC}-html.tgz"
+      VERBATIM
+      )
+    add_custom_target("${DOC}_html" ALL DEPENDS "${PROJECT_BINARY_DIR}/${DOC}-html.tgz")
+  endforeach()
+
+  install(FILES "${PROJECT_BINARY_DIR}/manual-html.tgz"
+    DESTINATION "${MANDEST}"
+    RENAME "${FLAVOR}-manual-html.tgz"
+    OPTIONAL
+  )
+  install(FILES "${PROJECT_BINARY_DIR}/Component_manual-html.tgz"
+    DESTINATION "${MANDEST}"
+    RENAME "${FLAVOR}-components-html.tgz"
+    OPTIONAL
+  )
+else()
+  message(WARNING "htlatex, bash and/or python3 not found -- skipping HTML manual generation. Install texlive-plain-generic (htlatex/tex4ht) and dvipng to enable the .tgz HTML manuals.")
+endif()
diff --git a/docs/manuals/mcstas/abstractpage.tex b/docs/manuals/mcstas/abstractpage.tex
@@ -12,7 +12,7 @@
 \label{p:authors}
 \index{McStas!authors|textbf}
 \index{Authors|textbf}
-Peter Kj\ae r Willendrup \verb+<pkwi@fysik.dtu.dk>+ \\
+Peter Kjær Willendrup \verb+<pkwi@fysik.dtu.dk>+ \\
 Physics Department, Technical University of Denmark, Kongens Lyngby, Denmark 
 
 Emmanuel Farhi \verb+<emmanuel.farhi@synchrotron-soleil.fr>+ \\
@@ -31,13 +31,13 @@
 Jonas Stein \verb+<Jonas.Stein@uni-koeln.de>+ \\
 Institute of Physics II, University of Cologne, Germany
 Peter Christiansen \verb+<pchristi@hep.lu.se>+\\
-Materials Research Department, Ris{\o} National Laboratory, Roskilde, Denmark\\
+Materials Research Department, Risø National Laboratory, Roskilde, Denmark\\
 Present address: University of Lund, Lund, Sweden\\
 Klaus Lieutenant \verb+<k.lieutenant@fz-juelich.de>+ \\
 Institut Laue-Langevin, Grenoble, France \\
-Present address: Forschungs-Zentrum J\"ulich, Germany \\
+Present address: Forschungs-Zentrum Jülich, Germany \\
 Kristian Nielsen \verb+<kristian-nielsen@mail.tele.dk>+ \\
-Materials Research Department, Ris{\o} National Laboratory, Roskilde, Denmark\\
+Materials Research Department, Risø National Laboratory, Roskilde, Denmark\\
 Presently associated with: MySQL AB, Sweden
 \end{quote}
 %Front page illustration:\\[\baselineskip]
@@ -49,7 +49,7 @@
 \par\noindent ISSN 0106--2840
 \par\noindent\hbox{}\hfill
     Physics Department $\cdot$ DTU $\cdot$ \number\year
-%    Information Service Department $\cdot$ Ris{\o} $\cdot$ \number\year
+%    Information Service Department $\cdot$ Risø $\cdot$ \number\year
 \par
 \thispagestyle{empty}\clearpage
 

diff --git a/docs/manuals/mcstas/abstractpage_comp.tex b/docs/manuals/mcstas/abstractpage_comp.tex
@@ -10,7 +10,7 @@
 The authors are:
 \begin{quote}
 \label{p:authors}
-Peter Kj\ae r Willendrup \verb+<pkwi@fysik.dtu.dk>+ \\
+Peter Kjær Willendrup \verb+<pkwi@fysik.dtu.dk>+ \\
 Physics Department, Technical University of Denmark, Kongens Lyngby, Denmark 
 
 Emmanuel Farhi \verb+<emmanuel.farhi@synchrotron-soleil.fr>+ \\
@@ -27,13 +27,13 @@
 Jakob Garde \verb+<jaga@fysik.dtu.dk>+\\
 Physics Department, Technical University of Denmark, Kongens Lyngby, Denmark
 Peter Christiansen \verb+<pchristi@hep.lu.se>+\\
-Materials Research Department, Ris{\o} National Laboratory, Roskilde, Denmark\\
+Materials Research Department, Risø National Laboratory, Roskilde, Denmark\\
 Present address: University of Lund, Lund, Sweden\\
 Klaus Lieutenant \verb+<k.lieutenant@fz-juelich.dee>+ \\
 Institut Laue-Langevin, Grenoble, France \\
-Present address: Forschungs-Zentrum J\"ulich, Germany \\
+Present address: Forschungs-Zentrum Jülich, Germany \\
 Kristian Nielsen \verb+<kristian-nielsen@mail.tele.dk>+ \\
-Materials Research Department, Ris{\o} National Laboratory, Roskilde, Denmark\\
+Materials Research Department, Risø National Laboratory, Roskilde, Denmark\\
 Presently associated with: MySQL AB, Sweden
 \end{quote}
 %Front page illustration:\\[\baselineskip]
@@ -45,7 +45,7 @@
 \par\noindent ISSN 0106--2840
 \par\noindent\hbox{}\hfill
     Physics Department $\cdot$ DTU $\cdot$ \number\year
-%    Information Service Department $\cdot$ Ris{\o} $\cdot$ \number\year
+%    Information Service Department $\cdot$ Risø $\cdot$ \number\year
 \par
 \thispagestyle{empty}\clearpage
 

diff --git a/docs/manuals/mcstas/contrib/Al_window.tex b/docs/manuals/mcstas/contrib/Al_window.tex
@@ -3,21 +3,17 @@ \section{The \texttt{Al\_window} McStas Component}
 
 \subsection*{Identification}
 \begin{itemize}
-  \item \textbf{Site:} 
   \item \textbf{Author:} S. Roth
   \item \textbf{Origin:} FRM-II
   \item \textbf{Date:} Jul 31, 2001
 \end{itemize}
 
 \subsection*{Description}
-\begin{lstlisting}
 Aluminium window in the beam
 
-Example: Al_window(thickness=0.002)
+Example: Al\_window(thickness=0.002)
 
-%BUGS
-Only handles the absorption, and window has infinite width/height
-\end{lstlisting}
+\%BUGS Only handles the absorption, and window has infinite width/height
 
 \subsection*{Input parameters}
 Parameters in \textbf{boldface} are required; the others are optional.
@@ -33,6 +29,6 @@ \subsection*{Input parameters}
 
 \subsection*{Links}
 \begin{itemize}
-  \item \href{run:/home/willend/willend-McCode/mcstas-comps/contrib/Al_window.comp}{Source code} for \texttt{Al\_window.comp}.
+  \item Component source code found in file \texttt{Al\_window.comp}.
 \end{itemize}
-\IfFileExists{Al_window_static.tex}{\input{Al_window_static.tex}}{}
+\IfFileExists{contrib/Al_window_static.tex}{\input{contrib/Al_window_static.tex}}{}