Use the new texinfo documentation instead of the old txt files

Makefile

-# $Id: Makefile,v 1.279 2003-03-28 02:43:19 geuzaine Exp $
+# $Id: Makefile,v 1.280 2003-04-14 22:46:58 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -82,6 +82,18 @@ parser:
 utilities:
 	cd utils && ${MAKE}
 
+doc-info:
+	cd doc/texinfo && ${MAKE} info
+	cp doc/texinfo/gmsh.info* doc/
+
+doc-ps:
+	cd doc/texinfo && ${MAKE} ps
+	cp doc/texinfo/gmsh.ps doc/
+
+doc-pdf:
+	cd doc/texinfo && ${MAKE} pdf
+	cp doc/texinfo/gmsh.pdf doc/
+
 purge:
 	for i in . bin lib utils archives demos tutorial doc ${GMSH_DIRS}; \
         do (cd $$i && rm -f *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \
@@ -211,13 +223,11 @@ package-mac:
         "    <key>CFBundleGetInfoString</key><string>Gmsh ${GMSH_RELEASE},"\
               "(c) C. Geuzaine and J.-F. Remacle, 1997-2003</string>\n"\
         "    <key>CFBundleIdentifier</key><string>org.geuz.Gmsh</string>\n"\
-        "    <key>NSHelpFile</key><string>tutorial.html</string>\n"\
         "  </dict>\n"\
         "</plist>" > gmsh-${GMSH_RELEASE}/Gmsh.app/Contents/Info.plist
 	strip bin/gmsh
 	cp bin/gmsh gmsh-${GMSH_RELEASE}/Gmsh.app/Contents/MacOS/Gmsh
 	cp Fltk/MacIcons.icns gmsh-${GMSH_RELEASE}/Gmsh.app/Contents/Resources/gmsh.icns
-	cp tutorial/tutorial.html gmsh-${GMSH_RELEASE}/Gmsh.app/Contents/Resources
 	cp -R doc/gmsh.1 tutorial demos gmsh-${GMSH_RELEASE}
 	cp doc/FORMATS gmsh-${GMSH_RELEASE}/FORMATS.txt
 	cp doc/VERSIONS gmsh-${GMSH_RELEASE}/VERSIONS.txt

doc/Makefile

-# $Id: Makefile,v 1.7 2003-03-21 00:52:47 geuzaine Exp $
+# $Id: Makefile,v 1.8 2003-04-14 22:46:58 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -24,5 +24,5 @@ all:
 	cd texinfo && ${MAKE} all
 
 clean:
-	rm -f *~ .*~
+	rm -f *~ .*~ gmsh.ps gmsh.pdf gmsh.info*
 	cd texinfo && ${MAKE} clean

tutorial/README

-$Id: README,v 1.20 2003-03-07 18:28:28 geuzaine Exp $
-
-Here are the examples in the Gmsh tutorial. These examples are
-commented (both C and C++-style comments can be used in Gmsh input
-files) and should introduce new features gradually, starting with
-t1.geo.
-
-[NOTE: This tutorial does not explain the mesh and post-processing
-file formats. See the FORMATS file for this.]
-
-There are two ways to actually run these examples with Gmsh. (The
-operations to run Gmsh may vary according to your operating system. In
-the following examples, we will assume that you're working with a
-UNIX-like shell.) The first working mode of Gmsh is the interactive
-graphical mode. To launch Gmsh in interactive mode, just type
-
-> gmsh
-
-at the prompt on the command line. This will open two windows: the
-graphic window (with a status bar at the bottom) and the menu window
-(with a menu bar and some context dependent buttons). To open the
-first tutorial file, select the 'File->Open' menu, and choose 't1.geo'
-in the input field. To perform the mesh generation, go to the mesh
-module (by selecting 'Mesh' in the module menu) and choose the
-required dimension in the context-dependent buttons ('1D' will mesh
-all the curves; '2D' will mesh all the surfaces ---as well as all the
-curves if '1D' was not called before; '3D' will mesh all the volumes
----and all the surfaces if '2D' was not called before). To save the
-resulting mesh in the current mesh format, choose 'Save' in the
-context-dependent buttons, or select the appropriate format with the
-'File->Save as' menu. The default mesh file name is based on the name
-of the first input file on the command line (or 'untitled' if there
-wasn't any input file given), with an appended extension depending on
-the mesh format.
-
-[NOTE: Nearly all the interactive commands have shortcuts. Select
-'Help->Shortcuts' in the menu bar to learn about these shortcuts.]
-
-Instead of opening the tutorial with the 'File->Open' menu, it is
-often more convenient to put the file name on the command line, for
-example with:
-
-> gmsh t1.geo
-
-[NOTE: Even if it is often handy to define the variables and the
-points directly in the input files (you may use any text editor for
-this purpose, e.g. Wordpad on Windows, or Emacs on Unix), it is almost
-always more simple to define the curves, the surfaces and the volumes
-interactively. To do so, just follow the context dependent buttons in
-the Geometry module. For example, to create a spline, select
-'Geometry' in the module menu, and then select 'Elementary, Add, New,
-Spline'. You will then be asked (in the status bar of the graphic
-window) to select a list of points, and to click 'e' to finish the
-selection (or 'q' to abort it). Once the interactive command is
-completed, a string is automatically added at the end of the currently
-opened project file.]
-
-The second operating mode for Gmsh is the non-interactive mode. In
-this mode, there is no graphical user interface, and all operations
-are performed without any interaction. To mesh the first tutorial in
-non-interactive mode, just type:
-
-> gmsh t1.geo -2
-
-To mesh the same example, but with the background mesh available in the
-file 'bgmesh.pos', just type:
-
-> gmsh t1.geo -2 -bgm bgmesh.pos
-
-[NOTE: You should read the notes in the file 'bgmesh.pos' if you
-intend to use background meshes.]
-
-Several files can be loaded simultaneously in Gmsh. The first one
-defines the project, while the others are appended ("merged") to this
-project. You can merge such files with the 'File->Merge' menu, or by
-directly specifying the names of the files on the command line. This
-is most useful for post-processing purposes. For example, to merge the
-post-processing views contained in the files 'view1.pos' and
-'view2.pos' together with the first tutorial 't1.geo', you can type
-the following command:
-
-> gmsh t1.geo view1.pos view2.pos
-
-In the Post-Processing module (select 'Post_Processing' in the module
-menu), two view buttons will appear, respectively labeled "a scalar
-map" and "a vector map". A mouse click on the name will toggle the
-visibility of the selected view, while a click on the arrow button on
-the right will provide access to the view's options. If you want the
-modifications made to one view to affect also all the other views,
-select the 'Apply next changes to all views' or 'Force same options
-for all views' option in the 'Tools->Options->Post-processing' menu.
-
-[NOTE: All the options specified interactively can also be directly
-specified in the ASCII input files. All available options, with their
-current values, can be saved into a file by selecting 'File->Save
-as->Gmsh options', or simply viewed by pressing the '?' button in the
-status bar. To save the current options as your default preferences
-for all future Gmsh sessions, use the 'Tools->Options->Save' button.]
-
-
-OK, that's all, folks. Enjoy the tutorial.
-

utils/gmsh.spec

@@ -32,24 +32,31 @@ and/or post-processor.
 %build
 make distrib-unix
 make utilities
+make doc-pdf
+make doc-info
 rm -rf CVS */CVS */*/CVS
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+mkdir -p $RPM_BUILD_ROOT/usr/share/info
 
 install -m 755 bin/gmsh $RPM_BUILD_ROOT/usr/bin/gmsh
 install -m 755 bin/dxf2geo $RPM_BUILD_ROOT/usr/bin/dxf2geo
 install -m 644 doc/gmsh.1 $RPM_BUILD_ROOT/usr/share/man/man1/gmsh.1
+install -m 644 doc/texinfo/gmsh.info* $RPM_BUILD_ROOT/usr/share/info/
+
+%post
+/sbin/install-info /usr/share/info/gmsh.info /usr/share/info/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc doc/COPYING doc/FORMATS doc/VERSIONS doc/FAQ doc/CONTRIBUTORS demos tutorial
+%doc doc/gmsh.pdf doc/COPYING doc/FORMATS doc/VERSIONS doc/FAQ doc/CONTRIBUTORS demos tutorial
 /usr/bin/gmsh
 /usr/bin/dxf2geo
 /usr/share/man/man1/gmsh*
-
+/usr/share/info/gmsh*