Fix Issue 2146 "Illegal entry in bfrange block in ToUnicode CMap"

8 files changed, 39 insertions, 3 deletions

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index baff739e3c..1fda210772 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -10,6 +10,14 @@
 @set txicodequoteundirected
 @set txicodequotebacktick
 
+@c Trick to use with proper font mappings the same NCSB fonts as
+@c LilyPond instead of those provided by TeX distribution
+@tex
+\ifpdf
+  \pdfmapfile{=lilypond.map}
+\fi
+@end tex
+
 
 @c   ***** Displaying text *****
 
diff --git a/config.make.in b/config.make.in
index 3ed8e53b05..aa674379e3 100644
--- a/config.make.in
+++ b/config.make.in
@@ -90,6 +90,7 @@ vimdir = $(lilypond_datadir)/vim
 
 
 NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@
+NCSB_DIR = @NCSB_DIR@
 
 ################################################################
 ## PROGRAMS
diff --git a/configure.in b/configure.in
index 2050b87336..66799abd3b 100644
--- a/configure.in
+++ b/configure.in
@@ -62,13 +62,14 @@ STEPMAKE_COMPILE
 AC_CHECK_PROG(FCLIST, fc-list, fc-list)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 AC_SUBST(NCSB_SOURCE_FILES)
+AC_SUBST(NCSB_DIR)
+UNCHECKED_NCSB_SOURCE_FILES=""
 if test "$NCSB_DIR" != "" ;  then
-  NCSB_SOURCE_FILES=""
   for f in c059013l c059016l c059033l c059036l; do
     if test ! -f "$NCSB_DIR/$f.pfb"; then
       STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.)
     else
-      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
+      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES"
     fi
   done
 else
@@ -78,14 +79,23 @@ else
                 | head -n 1`
       NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
-      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
+      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES"
     done
+    NCSB_DIR=`AS_DIRNAME($NCSB_FILE)`
   else
     AC_MSG_RESULT(not found)
     echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
     echo "or use --with-ncsb-dir"
   fi
 fi
+NCSB_SOURCE_FILES=""
+for f in $UNCHECKED_NCSB_SOURCE_FILES; do
+  if test "`grep Cyrillic "$f"`" = ""; then
+    STEPMAKE_WARN($f does not have Cyrillic characters.)
+  else
+    NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES"
+  fi
+done
 AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 AC_LANG([C++])
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 69a863bdc8..5c5e1efe3e 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -75,6 +75,8 @@ endif
 
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS
+TEXFONTMAPS=$(top-build-dir)/tex/$(outdir)::
+export TEXFONTMAPS
 
 export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www
 
diff --git a/make/substitute.make b/make/substitute.make
index 74ba9f67d9..2da2f15091 100644
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -13,6 +13,7 @@ ATVARIABLES = \
   MICRO_VERSION\
   MAJOR_VERSION\
   MINOR_VERSION\
+  NCSB_DIR\
   PACKAGE\
   PATCH_LEVEL\
   PATHSEP\
diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py
index 7a8684f194..329b412a47 100644
--- a/scripts/build/lys-to-tely.py
+++ b/scripts/build/lys-to-tely.py
@@ -63,6 +63,14 @@ template = '''\input texinfo
 
 @finalout @c we do not want black boxes.
 
+@c Trick to use with proper font mappings the same NCSB fonts as
+@c LilyPond instead of those provided by TeX distribution
+@tex
+\\ifpdf
+  \\pdfmapfile{=lilypond.map}
+\\fi
+@end tex
+
 @c fool ls-latex
 @ignore
 @author %%(author)s
diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 51a54a43aa..5fa66c910f 100644
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -14,3 +14,5 @@ local-uninstall:
 	-rmdir $(DESTDIR)$(local_lilypond_datadir)/tex
 
 all: $(INSTALLATION_FILES)
+
+local-WWW-1: $(outdir)/lilypond.map
diff --git a/tex/lilypond.map.in b/tex/lilypond.map.in
new file mode 100644
index 0000000000..1e6e17869e
--- /dev/null
+++ b/tex/lilypond.map.in
@@ -0,0 +1,4 @@
+pncr8r CenturySchL-Roma <@NCSB_DIR@/c059013l.pfb
+pncb8r CenturySchL-Bold <@NCSB_DIR@/c059016l.pfb
+pncri8r CenturySchL-Ital <@NCSB_DIR@/c059033l.pfb
+pncbi8r CenturySchL-BoldItal <@NCSB_DIR@/c059036l.pfb