Itstool experimental branch

Makefile.am

@@ -57,3 +57,54 @@ epub-recursive $(MOBI_RECURSIVE):
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; test -z "$$fail"
+
+pot: $(abs_top_srcdir)/po/gnucash-docs.pot
+
+$(abs_top_srcdir)/po/gnucash-docs.pot: $(abs_top_srcdir)/guide/C/*.xml $(abs_top_srcdir)/help/C/*.xml
+	mkdir -p $(abs_top_srcdir)/po
+	cd $(abs_top_srcdir)/po; \
+	itstool -dk -o gnucash-docs.pot $(subst $(abs_top_srcdir),..,$(sort $^))
+
+$(abs_top_srcdir)/po/%.po: $(abs_top_srcdir)/po/gnucash-docs.pot
+	msgmerge $(abs_top_srcdir)/po/$*.po $(abs_top_srcdir)/po/gnucash-docs.pot > $(abs_top_srcdir)/po/$*.po-new
+	mv $(abs_top_srcdir)/po/$*.po-new $(abs_top_srcdir)/po/$*.po
+
+# A set of temporary rules to help in the conversion from separate documents per
+# language to a single base document with translations in po format.
+LANGUAGES = de it ja pt ru
+fpots := $(foreach L,$(LANGUAGES),fpot-$(L))
+.PHONY: $(fpots)
+
+$(foreach L,$(LANGUAGES),$(eval fpot-$(L): po/gnucash-docs-$(L)-english.fpot po/gnucash-docs-$(L)-english.struct po/gnucash-docs-$(L)-native.fpot po/gnucash-docs-$(L)-native.struct))
+
+po/gnucash-docs-de-english.fpot po/gnucash-docs-it-english.fpot po/gnucash-docs-pt-english.fpot : $(abs_top_srcdir)/guide/C/*.xml $(abs_top_srcdir)/help/C/*.xml
+po/gnucash-docs-ja-english.fpot po/gnucash-docs-ru-english.fpot : $(abs_top_srcdir)/guide/C/*.xml
+po/gnucash-docs-de-native.fpot : $(abs_top_srcdir)/guide/de/*.xml $(abs_top_srcdir)/help/de/*.xml
+po/gnucash-docs-it-native.fpot : $(abs_top_srcdir)/guide/it/*.xml $(abs_top_srcdir)/help/it/*.xml
+po/gnucash-docs-ja-native.fpot : $(abs_top_srcdir)/guide/ja/*.xml
+po/gnucash-docs-pt-native.fpot : $(abs_top_srcdir)/guide/pt/*.xml $(abs_top_srcdir)/help/pt/*.xml
+po/gnucash-docs-ru-native.fpot : $(abs_top_srcdir)/guide/ru/*.xml
+
+po/gnucash-docs-%.fpot :
+	mkdir -p po
+	cd $(abs_top_srcdir)/po; \
+	itstool -dk -o $(abs_builddir)/$@ $(subst $(abs_top_srcdir),..,$(sort $^))
+
+po/gnucash-docs-%.struct: po/gnucash-docs-%.fpot
+	POTLANG=$(subst -native,,$(patsubst %-english,C,$*)); \
+	grep -E '[(]itstool[)]|^#:' $< | sed -E -e "s!/$${POTLANG}/!/<lang>/!" -e 's/xml:[0-9]*/xml:<line>/' > $@
+
+po/%.po: po/gnucash-docs-%-english.fpot po/gnucash-docs-%-native.fpot po/gnucash-docs-%-english.struct po/gnucash-docs-%-native.struct
+	@cd po; \
+	if diff -q gnucash-docs-$*-english.struct gnucash-docs-$*-native.struct >/dev/null; \
+	then \
+		$(abs_top_srcdir)/util/gen-pot.pl gnucash-docs-$*-english.fpot gnucash-docs-$*-native.fpot > $*.po; \
+		echo "Generation of $@ complete."; \
+	else \
+		echo "Error: Can't automatically generate $*.po."; \
+		echo "       Msgid order  differs differs between gnucash-docs-$*-english.fpot and gnucash-docs-$*-native.fpot."; \
+		echo "       Please adjust the original xml files such that the fpot msgid order aligns perfectly."; \
+		echo "       You can use gnucash-docs-$*-english.fpot, gnucash-docs-$*-native.fpot"; \
+		echo "       gnucash-docs-$*-english.struct and gnucash-docs-$*-native.struct in $(abs_top_builddir)/po"; \
+		echo "       to help determine where the adjustments need to be made."; \
+	fi

docbook/gnc-docbookx.dtd

@@ -13,6 +13,17 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY % local.common.attrib
 "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2001/XInclude'">
 
+<!-- HTML codes unknown to xmllint and xml2po: -->
+<!ENTITY lsquo "‘">
+<!ENTITY rsquo "’">
+<!ENTITY ldquo "“">
+<!ENTITY rdquo "”">
+<!ENTITY mdash "—">
+<!ENTITY ndash "–">
+<!ENTITY minus "−">
+<!ENTITY hellip "…">
+<!ENTITY euro "€">
+
 <!--
 ***** Include of the original DocBook DTD *****
 ***********************************************

guide/C/Makefile.am

@@ -9,31 +9,12 @@ docname = gnucash-guide
 lang = C
 omffile = $(docname)-C.omf
 entities = \
-	fdl-appendix.xml \
-	legal.xml \
 	ch_oview.xml \
 	ch_basics.xml \
 	ch_accts.xml \
 	ch_txns.xml \
-	ch_cbook.xml \
-	ch_cc.xml \
-	ch_expenses.xml \
-	ch_loans.xml \
-	ch_invest.xml \
-	ch_reports.xml \
-	ch_capgain.xml \
-	ch_currency.xml \
-	ch_dep.xml \
-	ch_bus_features.xml \
-	ch_budgets.xml \
-	ch_oth_assets.xml \
-	ch_python_bindings.xml \
-	ch_import_business_data.xml \
-	gnc-glossary.xml \
-	appendixa.xml \
-	appendixb.xml \
-	appendixc.xml \
-	appendixd.xml
+	ch_importing.xml \
+	ch_configuring.xml
 DISTCLEANFILES =  $(docname)-C.omf.out
 CLEANFILES =  $(DISTCLEANFILES)
 if GNC_WINDOWS