Merge pull request #2600 from TEIC/mobi-2574

WIP: remove mobi from the generated outputs; close #2574

Author: martindholmes

Documents/Editing/Jenkins/jobs/Guidelines-Link-Check/linkchecker.xsl

@@ -19,7 +19,7 @@
      do more sophisticated things. -->
 
     <xsl:param name="p5version"></xsl:param>
-  <xsl:variable name="ignore" select="if (matches($p5version, '[a-z]+$')) then '((readme-\d\.\d\.\d\.html$)|(Guidelines\.mobi)|(tei-c\.org/$)|(google\.com/search))' else '((Guidelines\.mobi)|(tei-c\.org/$)|(google\.com/search))'"/>
+  <xsl:variable name="ignore" select="if (matches($p5version, '[a-z]+$')) then '((readme-\d\.\d\.\d\.html$)|(tei-c\.org/$)|(google\.com/search))' else '((tei-c\.org/$)|(google\.com/search))'"/>
 
     <xsl:template match="/">
         <xsl:text>Broken external links:&#x0a;&#x0a;</xsl:text>

Documents/Editing/Jenkins/jobs/Guidelines-Link-Check/linkcheckerrcalphabeta

@@ -17,7 +17,6 @@ filename=checkResults/linkchecker-out.xml
 #In pre-release mode, we ignore the missing readme file for the next release.
 
 ignore=readme-\d\.\d\.\d\.html
-  Guidelines\.mobi
   tei-c.org/$
   google\.com/search
   #xpointer(id('chum'))

Documents/Editing/Jenkins/jobs/Guidelines-Link-Check/linkcheckerrcrelease

@@ -15,8 +15,7 @@ filename=checkResults/linkchecker-out.xml
 
 #This is a multiline thing; each line is a regex specifying something to be ignored.
 
-ignore=Guidelines\.mobi
-  tei-c\.org/$
+ignore=tei-c\.org/$
   google\.com/search
   #xpointer(id('chum'))
 

Documents/howtomakep5.xml

@@ -84,7 +84,7 @@
                 <p>You can of course run parts of the Makefile separately. For example, run "make
                     check" to run the TEI test suite; "make validate" to validate the P5 source;
                     "make exemplars" to check that all the TEI exemplars still work; run "make
-                    ebook" or "make mobi" to produce an Ebook or Mobi version of the Guidelines
+                    ebook" to produce an Ebook version of the Guidelines
                     respectively. "make pdf" will try to build the fancy PDF version of the
                     Guidelines, but it won't get far unless you have a working LiveTex environment
                     and the requisite fonts. (see <ptr target="#PDF"/> below) </p>

P5/Makefile

@@ -119,13 +119,6 @@ epub3: check.stamp p5.xml
 	${ANT}  -f ${XSL}/epub3/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=tei -DinputFile=`pwd`/p5.xml -DoutputFile=`pwd`/Guidelines.epub -Dcoverimage=`pwd`/Utilities/cover.jpg
 	java -jar Utilities/epubcheck3.jar Guidelines.epub
 
-mobi:  Guidelines.mobi
-
-Guidelines.mobi: check.stamp p5.xml
-	${ANT}  -f ${XSL}/epub/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=teikindle -DinputFile=`pwd`/p5.xml -DoutputFile=`pwd`/Guidelines-kindle.epub -Dcoverimage=`pwd`/Utilities/cover.jpg
-	-export PATH=/usr/share/kindlegen:$$PATH ; command -v  kindlegen && kindlegen Guidelines-kindle.epub -o Guidelines.mobi
-	rm Guidelines-kindle.epub
-
 fonttest:
 	-xelatex --interaction=batchmode Utilities/fonttest
 	if [ -f "missfont.log" ]  ; then  \
@@ -278,9 +271,7 @@ dist-doc.stamp:  check.stamp p5.xml
 	make pdf
 	@echo BUILD: make ePub and Kindle version of Guidelines
 	make epub
-	make mobi
 	cp Guidelines.pdf Guidelines.epub release/tei-p5-doc/share/doc/tei-p5-doc/en
-	-test -f Guidelines.mobi  && cp Guidelines.mobi release/tei-p5-doc/share/doc/tei-p5-doc/en
 	touch dist-doc.stamp
 
 dist-test.stamp: check.stamp p5.xml

P5/Utilities/guidelines.xsl.model

@@ -516,13 +516,6 @@
                                 alt="ePub version for mobile devices."
                                 title="ePub version for mobile devices."/>
                 </a>
-                <a href="../../en/Guidelines.mobi" class="ebookLink">
-                        <img src="icons/e-book-icons/mdh_mobi_doc_32x32.png" width="32" height="32" 
-                                alt="Mobi version (for Kindle)."
-                                title="Mobi version (for Kindle)."/>
-                </a>
-                
-                
         </p>
 
         <div class="col_left">

P5/debian-tei-p5-doc/debian/rules

@@ -39,7 +39,7 @@ binary-indep: build install
 #	dh_installcron
 	dh_installmenu
 	dh_installchangelogs 
-	dh_compress  --exclude=.xml --exclude=.html --exclude=.js --exclude=.pdf --exclude=.epub --exclude=.mobi
+	dh_compress  --exclude=.xml --exclude=.html --exclude=.js --exclude=.pdf --exclude=.epub
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol

P5/webnav/icons/e-book-icons/license.txt

@@ -1,14 +1,8 @@
 These logos were created by Martin Holmes in 2013, based on 
 these images in the public domain from Wikimedia Commons:
 
-https://commons.wikimedia.org/wiki/File:Amazon_Kindle_logo.svg
 https://commons.wikimedia.org/wiki/File:Adobe_PDF_Icon.svg
 
-This image from Wikimedia Commons available under the Creative 
-Commons Attribution-Share Alike 3.0 Unported license:
-
-https://commons.wikimedia.org/wiki/File:Amazon-icon.png
-
 This image from Wikimedia Commons which is non-free, but can be
 used for purposes of identification: