[commit: ghc] ghc-7.10: docs: Fix #10416 (e6eaa9e)

git at git.haskell.org git at git.haskell.org
Fri Jun 12 18:56:42 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/e6eaa9e44bc077189f3750b1b9bebdf8b204cfab/ghc

>---------------------------------------------------------------

commit e6eaa9e44bc077189f3750b1b9bebdf8b204cfab
Author: Austin Seipp <austin at well-typed.com>
Date:   Wed Jun 10 16:43:23 2015 -0500

    docs: Fix #10416
    
    This commit fixes #10416 by using an EPS-based file-format for embedding
    images in the users guide, as opposed to a png. This is because 'latex'
    in some distributions is actually 'pdflatex', which supports reading the
    size of PNGs in DVI mode, while traditional latex does not.
    
    Rather than fiddle with the build a whole bunch, it's easy and simple to
    just convert the png into a eps file and embed that instead.
    
    But apparently we already had an EPS file, added in
    1cce2f51656cfbd8c7933a914a4bd981792aa1e6! But it was quite large, so
    instead I used `convert` to shrink it down from 1.7MB to about 20kb, the
    same size as the original PDF (by using level3 postscript, which is not
    as wasteful.)
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    
    Differential Revision: https://phabricator.haskell.org/D970
    
    GHC Trac Issues: #10416
    
    (cherry picked from commit ca39b96ee783e124909a89ea3ad366bf99defa7b)


>---------------------------------------------------------------

e6eaa9e44bc077189f3750b1b9bebdf8b204cfab
 docs/users_guide/ghc.mk        |   6 +++---
 docs/users_guide/prof_scc.eps  | Bin 1685125 -> 17580 bytes
 docs/users_guide/prof_scc.png  | Bin 16815 -> 0 bytes
 docs/users_guide/profiling.xml |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk
index 4737b5c..eb7eb6a 100644
--- a/docs/users_guide/ghc.mk
+++ b/docs/users_guide/ghc.mk
@@ -27,10 +27,10 @@ $(eval $(call docbook,docs/users_guide,users_guide))
 
 $(eval $(call clean-target,docs/users_guide,gen,$(docs/users_guide_GENERATED_DOCBOOK_SOURCES)))
 
-html_docs/users_guide : docs/users_guide/users_guide/prof_scc.png
+html_docs/users_guide : docs/users_guide/users_guide/prof_scc.eps
 
-docs/users_guide/users_guide/prof_scc.png : \
-		docs/users_guide/prof_scc.png \
+docs/users_guide/users_guide/prof_scc.eps : \
+		docs/users_guide/prof_scc.eps \
 		docs/users_guide/users_guide/index.html
 	$(CP) $< $@
 # dep. on d/u/u/index.html is to make sure that the d/u/u dir is created first
diff --git a/docs/users_guide/prof_scc.eps b/docs/users_guide/prof_scc.eps
index db6e8d0..beac36f 100644
Binary files a/docs/users_guide/prof_scc.eps and b/docs/users_guide/prof_scc.eps differ
diff --git a/docs/users_guide/prof_scc.png b/docs/users_guide/prof_scc.png
deleted file mode 100644
index 5e4157d..0000000
Binary files a/docs/users_guide/prof_scc.png and /dev/null differ
diff --git a/docs/users_guide/profiling.xml b/docs/users_guide/profiling.xml
index 4971a7d..26d18a0 100644
--- a/docs/users_guide/profiling.xml
+++ b/docs/users_guide/profiling.xml
@@ -625,7 +625,7 @@ MAIN            MAIN                    102           0    0.0    0.0   100.0  1
            other than making the PS file generation work, rather than
            falling over.  The result seems to be broken PS on the page
            with the image. -->
-      <imagedata fileref="prof_scc" contentwidth="645px"
+      <imagedata fileref="prof_scc.eps" contentwidth="645px"
       contentdepth="428px"/>
 
     <para>You might also want to take a look



More information about the ghc-commits mailing list