Clean up scanned images and use them in book.

diff --git a/Makefile b/Makefile
index 8141fc0e7d43a706258026c65f47cc4926a6b009..482d5dafbc93ee79c551ff7cb4e6263e537b6054 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DBLATEX = dblatex \
 
 DBTOEPUB = dbtoepub
 
 
 DBTOEPUB = dbtoepub
 

-IMAGES = images/cc.png
+IMAGES = images/cc.png images/pattern-modern-media-ownership.png images/tom-the-dancing-bug.png

 
 XSLT = \
   data/user_param.xsl
 
 XSLT = \
   data/user_param.xsl


@@ -163,3 +163,18 @@ images/cc.svg:
 
 images/cc.png: images/cc.svg
        inkscape -z -D --export-height=200 -D --export-png=$(shell pwd)/$@ $^
 
 images/cc.png: images/cc.svg
        inkscape -z -D --export-height=200 -D --export-png=$(shell pwd)/$@ $^

+
+.xcf.png:
+       convert $^ $@
+
+clean:
+       $(RM) *~
+
+distclean: clean
+       $(RM) freeculture-docbook-xsl.pdf \
+       freeculture-docbook-xsl.fo \
+       freeculture-dblatex-db2latex.pdf \
+       freeculture-dblatex.pdf \
+       freeculture-xmlto-fop.pdf
+
+.SUFFIXES: .png .xcf .svg .xml

diff --git a/freeculture.nb.po b/freeculture.nb.po
index a43fc654273d623a9fb59fe1be465647100ccc2e..8f7501b82918193229a459f4b09b0f4fb80d9091 100644 (file)
--- a/freeculture.nb.po
+++ b/freeculture.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Free Culture by Lawrence Lessig\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Free Culture by Lawrence Lessig\n"

-"POT-Creation-Date: 2015-04-25 08:42+0300\n"
+"POT-Creation-Date: 2015-04-27 13:00+0300\n"

 "PO-Revision-Date: 2015-04-03 14:38+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "PO-Revision-Date: 2015-04-03 14:38+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"


@@ -16316,10 +16316,10 @@ msgstr "Mønster for moderne mediaeierskap."
 
 #. type: Content of: <book><part><chapter><section><figure>
 msgid ""
 
 #. type: Content of: <book><part><chapter><section><figure>
 msgid ""

-"<graphic fileref=\"images/1761.png\" align=\"center\" width=\"90%\"></"
-"graphic>"
+"<graphic fileref=\"images/pattern-modern-media-ownership.png\" align=\"center"
+"\" width=\"90%\"></graphic>"

 msgstr ""
 msgstr ""

-"<graphic fileref=\"images/1761.png\" align=\"center\" width=\"90%\"></"
+"<graphic fileref=\"images/pattern-modern-media-ownership.png\" align=\"center\" width=\"90%\"></"

 "graphic>"
 
 #.  PAGE BREAK 175 
 "graphic>"
 
 #.  PAGE BREAK 175 


@@ -23568,10 +23568,10 @@ msgstr "Tom the Dancing Bug-tegneserie"
 
 #. type: Content of: <book><part><chapter><figure>
 msgid ""
 
 #. type: Content of: <book><part><chapter><figure>
 msgid ""

-"<graphic fileref=\"images/18.png\" align=\"center\" width=\"95%\"></graphic> "
-"<placeholder type=\"indexterm\" id=\"0\"/>"
+"<graphic fileref=\"images/tom-the-dancing-bug.png\" align=\"center\" width="
+"\"95%\"></graphic> <placeholder type=\"indexterm\" id=\"0\"/>"

 msgstr ""
 msgstr ""

-"<graphic fileref=\"images/18.png\" align=\"center\" width=\"95%\"></graphic> "
+"<graphic fileref=\"images/tom-the-dancing-bug.png\" align=\"center\" width=\"95%\"></graphic> "

 "<placeholder type=\"indexterm\" id=\"0\"/>"
 
 #. type: Content of: <book><part><chapter><para>
 "<placeholder type=\"indexterm\" id=\"0\"/>"
 
 #. type: Content of: <book><part><chapter><para>

diff --git a/freeculture.pot b/freeculture.pot
index d9d5fcec03e3ab42bac5efd53bca97d98a5b10b1..6d379b9fe15f96d4ab9ff9663803db448d3a9aaa 100644 (file)
--- a/freeculture.pot
+++ b/freeculture.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2015-04-25 08:42+0300\n"
+"POT-Creation-Date: 2015-04-27 13:00+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -12455,8 +12455,8 @@ msgstr ""
 #. type: Content of: <book><part><chapter><section><figure>
 #: freeculture.xml:8657
 msgid ""
 #. type: Content of: <book><part><chapter><section><figure>
 #: freeculture.xml:8657
 msgid ""

-"<graphic fileref=\"images/1761.png\" align=\"center\" "
-"width=\"90%\"></graphic>"
+"<graphic fileref=\"images/pattern-modern-media-ownership.png\" "
+"align=\"center\" width=\"90%\"></graphic>"

 msgstr ""
 
 #.  PAGE BREAK 175 
 msgstr ""
 
 #.  PAGE BREAK 175 


@@ -17746,8 +17746,8 @@ msgstr ""
 #. type: Content of: <book><part><chapter><figure>
 #: freeculture.xml:12747
 msgid ""
 #. type: Content of: <book><part><chapter><figure>
 #: freeculture.xml:12747
 msgid ""

-"<graphic fileref=\"images/18.png\" align=\"center\" width=\"95%\"></graphic> "
-"<placeholder type=\"indexterm\" id=\"0\"/>"
+"<graphic fileref=\"images/tom-the-dancing-bug.png\" align=\"center\" "
+"width=\"95%\"></graphic> <placeholder type=\"indexterm\" id=\"0\"/>"

 msgstr ""
 
 #. type: Content of: <book><part><chapter><para>
 msgstr ""
 
 #. type: Content of: <book><part><chapter><para>

diff --git a/freeculture.xml b/freeculture.xml
index afef24413133a45fc022acd590e0477d5e5c1fed..0bc4d5957dc8e253d581a204fc4ea78c751fa6f2 100644 (file)
--- a/freeculture.xml
+++ b/freeculture.xml
@@ -8654,7 +8654,7 @@ pattern better than a thousand words could do:
 </para>
 <figure id="fig-1761-pattern-modern-media-ownership">
 <title>Pattern of modern media ownership.</title>
 </para>
 <figure id="fig-1761-pattern-modern-media-ownership">
 <title>Pattern of modern media ownership.</title>

-<graphic fileref="images/1761.png" align="center" width="90%"></graphic>
+<graphic fileref="images/pattern-modern-media-ownership.png" align="center" width="90%"></graphic>

 </figure>
 <para>
 <!-- PAGE BREAK 175 -->
 </figure>
 <para>
 <!-- PAGE BREAK 175 -->


@@ -12744,7 +12744,7 @@ unfair. But the punch in the face felt exactly like that.
 </para>
 <figure id="fig-18">
 <title>Tom the Dancing Bug cartoon</title>
 </para>
 <figure id="fig-18">
 <title>Tom the Dancing Bug cartoon</title>

-<graphic fileref="images/18.png" align="center" width="95%"></graphic>
+<graphic fileref="images/tom-the-dancing-bug.png" align="center" width="95%"></graphic>

 <indexterm><primary>Bolling, Ruben</primary></indexterm>
 </figure>
 <para>
 <indexterm><primary>Bolling, Ruben</primary></indexterm>
 </figure>
 <para>

diff --git a/images/pattern-modern-media-ownership.xcf b/images/pattern-modern-media-ownership.xcf
new file mode 100644 (file)
index 0000000..5810c17
Binary files /dev/null and b/images/pattern-modern-media-ownership.xcf differ

diff --git a/images/tom-the-dancing-bug.xcf b/images/tom-the-dancing-bug.xcf
new file mode 100644 (file)
index 0000000..8e23f2c
Binary files /dev/null and b/images/tom-the-dancing-bug.xcf differ