[WIP] Comparison between doc2 and master for reviewing

.gitignore

@@ -40,3 +40,6 @@ lib/gwlib.ml
 
 # generated by Makefile
 hd/etc/version.txt
+*~
+/_opam
+doc/doc

Makefile

@@ -13,8 +13,10 @@ endif
 # Variables for packagers.
 PREFIX=/usr
 DISTRIB_DIR=distribution
-
 BUILD_DIR=_build/default
+ODOC_DIR=$(BUILD_DIR)/_doc/_html
+
+DOC_DIR=doc
 
 ###### [BEGIN] Generated files section
 
@@ -174,8 +176,17 @@ distrib: build
 
 doc: | $(GENERATED_FILES_DEP)
 	dune build @doc
+	if [ ! -d $(DOC_DIR)/doc ] ; then \
+    	mkdir -p $(DOC_DIR)/doc ; \
+		cp -r $(ODOC_DIR)/* $(DOC_DIR)/doc ; \
+	fi
 .PHONY: doc
 
+opendoc : doc
+	xdg-open $(DOC_DIR)/html/dev-doc/index.html
+.PHONY: opendoc
+
+
 test: | $(GENERATED_FILES_DEP)
 	dune build @runtest
 .PHONY: test
@@ -202,6 +213,7 @@ clean:
 	@echo -n "Cleaning..."
 	@$(RM) $(GENERATED_FILES_DEP) lib/*_piqi*.ml
 	@$(RM) -r $(DISTRIB_DIR)
+	@$(RM) -r $(DOC_DIR)/doc
 	@dune clean
 	@echo " Done!"
 .PHONY: clean

bin/ged2gwb/ged2gwb.ml

@@ -2786,10 +2786,10 @@ let pass3 gen fname =
           Some ('1'..'9') ->
             Stream.junk strm__;
             let (_ : string) = get_to_eoln 0 strm in loop ()
-        | Some _ ->
+        | Some c ->
             Stream.junk strm__;
             print_location !line_cnt;
-            Printf.fprintf !log_oc "Strange input.\n";
+            Printf.fprintf !log_oc "Strange input '%c' (%i).\n" c (Char.code c);
             flush !log_oc;
             let (_ : string) = get_to_eoln 0 strm in loop ()
         | _ -> ()

bin/gwb2ged/gwb2gedLib.mli

@@ -0,0 +1,11 @@
+(** [gwb2ged with_indexes opts sel]
+    Converts a Geneweb database to a GEDCOM file.
+    * `with_indexes` specifies if indexes are printed or not;
+    * `opts` are the export options
+    * `sel` is a pair of selectors returned by the database export
+*)
+val gwb2ged :
+  bool ->
+  Gwexport.gwexport_opts ->
+  (Gwdb.iper -> bool) * (Gwdb.ifam -> bool)
+  -> unit