Manual updates.

diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore
new file mode 100644 (file)
index 0000000..8b8714f
--- /dev/null
+++ b/doc/manual/.gitignore
@@ -0,0 +1,3 @@
+dcpomatic_create.xml
+dcpomatic_kdm_cli.xml
+dcpomatic_cli.xml
\ No newline at end of file

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index cb8c9bc01c20d05dfc8152bded2707645fc445f5..8d9ee9149907c2dd8365437f5d5bbec9ead8e663 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -66,13 +66,22 @@ diagrams/%.pdf:     diagrams/%.svg
        inkscape -z -f $< --export-pdf $@ --export-area-drawing
 
 config.xml:    ../../src/lib/config.cc config.py
-       python config.py ../../src/lib/config.cc > config.xml
+       python3 config.py ../../src/lib/config.cc > config.xml
+
+dcpomatic_create.xml:  ../../src/tools/dcpomatic_create.cc cli.py
+       python3 cli.py dcpomatic_create > dcpomatic_create.xml
+
+dcpomatic_cli.xml:     ../../src/tools/dcpomatic_cli.cc cli.py
+       python3 cli.py dcpomatic_cli > dcpomatic_cli.xml
+
+dcpomatic_kdm_cli.xml: ../../src/tools/dcpomatic_kdm_cli.cc cli.py
+       python3 cli.py dcpomatic_kdm_cli > dcpomatic_kdm_cli.xml
 
 #
 # HTML
 #
 
-html:  $(XML) config.xml dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
+html:  $(XML) config.xml dcpomatic-html.xsl extensions-html.ent dcpomatic.css dcpomatic_create.xml dcpomatic_cli.xml dcpomatic_kdm_cli.xml \
        $(addprefix html/screenshots/,$(SCREENSHOTS)) \
        $(subst .svg,.png,$(addprefix diagrams/,$(DIAGRAMS))) \
 
@@ -92,7 +101,7 @@ html:        $(XML) config.xml dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
 # PDF
 #
 
-pdf:   $(XML) config.xml dcpomatic-pdf.xsl extensions-pdf.ent \
+pdf:   $(XML) config.xml dcpomatic-pdf.xsl extensions-pdf.ent dcpomatic_create.xml dcpomatic_cli.xml dcpomatic_kdm_cli.xml \
        $(addprefix screenshots/,$(SCREENSHOTS)) \
        $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
 

diff --git a/doc/manual/cli.py b/doc/manual/cli.py
new file mode 100644 (file)
index 0000000..3a2493b
--- /dev/null
+++ b/doc/manual/cli.py
@@ -0,0 +1,49 @@
+#!/usr/bin/python3
+import subprocess
+import os
+import sys
+
+print('<para>')
+print('<itemizedlist>')
+
+os.chdir('../..')
+for l in subprocess.run(['run/%s' % sys.argv[1], '--help'], stderr=subprocess.PIPE).stderr.splitlines():
+    l = l.strip().decode('UTF-8')
+    if not l.startswith('-'):
+        continue
+
+    s = l.split()
+    print('<listitem>', end='')
+
+    e = 0
+    n = 0
+    if l.startswith('-') and not l.startswith('--'):
+        print('<code>%s</code>, ' % s[0][:-1], end='')
+        n = 1
+        e = len(s[0]) + 2
+
+    if l.find('<') != -1:
+        print('<code>%s %s</code>' % (s[n], s[n+1].replace('<', '&lt;').replace('>', '&gt;')), end='')
+        e += len(s[n]) + len(s[n+1]) + 1
+    else:
+        print('<code>%s</code>' % s[n], end='')
+        e += len(s[n])
+
+    desc = l[e:].strip()
+    fixed_desc = ''
+    t = False
+    for i in desc:
+        if i == '"' and t == False:
+            fixed_desc += '&#8220;'
+            t = True
+        elif i == '"' and t == True:
+            fixed_desc += '&#8221;'
+            t = False
+        else:
+            fixed_desc += i
+
+    print(' &#8212; %s</listitem>' % fixed_desc)
+
+print('</itemizedlist>')
+print('</para>', end='')
+os.chdir('doc/manual')

diff --git a/doc/manual/config.py b/doc/manual/config.py
index 673174bf2688d47df65576087f3520da6ce8ec2d..9b3c8e20f15900c9b58c44de500cc593c54845d7 100644 (file)
--- a/doc/manual/config.py
+++ b/doc/manual/config.py
@@ -2,7 +2,7 @@ import sys
 current_tag = None
 current_doc = None
 current_opt = False
-print '<itemizedlist>'
+print('<itemizedlist>')
 with open(sys.argv[1]) as f:
     for line in f:
         line = line.strip();
@@ -19,6 +19,6 @@ with open(sys.argv[1]) as f:
                 optional = ' (optional)'
             else:
                 optional = ''
-            print '<listitem><code>&lt;%s&gt;</code>%s &#8212; %s</listitem>' % (current_tag, optional, current_doc.strip())
+            print('<listitem><code>&lt;%s&gt;</code>%s &#8212; %s</listitem>' % (current_tag, optional, current_doc.strip()))
             current_tag = None
-print '</itemizedlist>'
+print('</itemizedlist>')

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index 1ee817b5d6171ad75c8870657c0fc33e1dc05fdd..72bbedb56c89ea7aa812fb0fa505eec1448202c7 100644 (file)
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -107,7 +107,8 @@ version.
 <para>
 If you are still using Windows XP, download the specific XP version as
 it should be more stable on your machine than the &lsquo;normal&rsquo;
-Windows version.
+Windows version.  Be aware, though, that support for Windows XP will
+not last forever and you should plan to upgrade if at all possible.
 </para>
 
 </section>
@@ -224,7 +225,7 @@ directory:
 </para>
 
 <programlisting>
-./waf configure
+./waf configure --disable-tests
 ./waf build
 sudo ./waf install
 </programlisting>
@@ -240,11 +241,40 @@ dcpomatic2
 <para>
 in a shell.
 </para>
+</section>
+
+<!-- ============================================================== -->
+<section>
+<title>&lsquo;Simple&rsquo; and &lsquo;Full&rsquo; modes</title>
+
+<para>When you start DCP-o-matic for the first time it will ask you if
+you want to use &lsquo;simple&rsquo; or &lsquo;full&rsquo; mode.
+</para>
+
+<para>The difference between these two is that some of DCP-o-matic's
+more complex or less-used controls are hidden from view in
+&lsquo;Simple&rsquo; mode.  This makes the interface simpler to
+navigate.  You may wish to choose this mode if you do not have much
+experience with video processing.
+</para>
+
+<para>Even if you choose &lsquo;Simple&rsquo; mode you can always go
+back to &lsquo;Full&rsquo; mode by changing the <guilabel>Interface
+complexity</guilabel> setting in the <guilabel>General</guilabel> tab
+of <guilabel>Preferences</guilabel>.
+</para>
+
+<para>
+All the screenshots in this manual are from a copy of DCP-o-matic in &lsquo;Full&rsquo; mode.
+</para>
 
 </section>
+
 </chapter>
 
 
+
+
 <!-- ============================================================== -->
 <chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
 <title>Creating a DCP from a video</title>
@@ -500,21 +530,21 @@ to encode a single frame which it can then repeat.
 <title>Manipulating existing DCPs</title>
 
 <para>
-Frequently DCP-o-matic is used to take content in formats such as MP4
-and convert it to JPEG2000 for a DCP.  It can also be used
-to take existing DCPs and modify them in various ways.
+DCP-o-matic is often used to take content in formats such as MP4 and
+make it into a DCP.  It can also be used to take existing DCPs and
+modify them in various ways.
 </para>
 
 <section>
 <title>Importing a DCP into DCP-o-matic</title>
 
 <para>
-If you want to do something to an existing DCP the first step is to
-import it.  Click <guilabel>Add DCP...</guilabel> and select your
-DCP's folder.  It will be added to the DCP-o-matic project.  If the
-DCP is unencrypted you can preview it in the normal way, though
-playback will be very slow as decoding of DCPs is almost as
-computationally intensive as encoding them.
+The first step in manipulating an existing DCP is to import it.  Click
+<guilabel>Add DCP...</guilabel> and select your DCP's folder.  It will
+be added to the DCP-o-matic project.  If the DCP is unencrypted you
+can preview it in the normal way, though playback will be slow as
+decoding of DCPs is almost as computationally intensive as encoding
+them.
 </para>
 
 <para>
@@ -602,8 +632,8 @@ the following content settings:
 </itemizedlist>
 
 <para>
-If you do change any of these settings on a piece of DCP content
-DCP-o-matic will decode and then re-encode the JPEG2000 data.
+DCP-o-matic will be forced to decode and re-encode your JPEG2000 data
+if you change any of these settings on a piece of DCP content.
 </para>
 
 </section>
@@ -989,7 +1019,7 @@ linkend="tab-colour-conversion"/>.
 <colspec colwidth='5*'/>
 <tbody>
 <row>
-<entry>sRGB</entry><entry>Still images in RGB, e.g. photographs</entry>.
+<entry>sRGB</entry><entry>Still images in RGB, e.g. photographs.</entry>
 </row>
 <row>
 <entry>Rec. 601</entry><entry>Standard-definition content (fewer than about 1000 pixels across) including DVD rips.</entry>
@@ -2177,7 +2207,7 @@ linkend="fig-kdm"/>.
   <title>KDM dialog</title>
   <mediaobject>
     <imageobject>
-      <imagedata scale="40" fileref="screenshots/kdm&scs;"/>
+      <imagedata scale="35" fileref="screenshots/kdm&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -2317,7 +2347,7 @@ DCP-o-matic.  Its window is shown in <xref linkend="fig-kdm-creator"/>.
   <title>The KDM creator</title>
   <mediaobject>
     <imageobject>
-      <imagedata scale="35" fileref="screenshots/kdm-creator&scs;"/>
+      <imagedata scale="30" fileref="screenshots/kdm-creator&scs;"/>
     </imageobject>
   </mediaobject>
 </figure>
@@ -3137,8 +3167,8 @@ The <guilabel>Frame Rate</guilabel> control in the
 <guilabel>DCP</guilabel> tab sets the video frame rate that the DCP
 will use.  Clicking <guilabel>Use best</guilabel> sets the rate to
 what DCP-o-matic thinks is the best for your content.  With this
-button, DCP-o-matic assumes that the whole range of frame rates (24,
-25, 30 and 48fps) are allowable.
+button, DCP-o-matic assumes that the most commonly-working frame rates (24,
+25 and 30fps) are allowed.
 </para>
 
 <para>
@@ -3362,7 +3392,7 @@ to the cinema which is showing your DCP.
     </para>
 
     <para>
-      <code>dcpomatic2_create [OPTION] [CONTENT] [&lt;CONTENT&gt; ...]</code>
+      <code>dcpomatic2_create [OPTION] &lt;CONTENT&gt; [[OPTION] &lt;CONTENT&gt; ...]</code>
     </para>
 
     <para>
@@ -3380,20 +3410,7 @@ to the cinema which is showing your DCP.
       The options are:
     </para>
 
-    <itemizedlist>
-      <listitem><code>-v</code>, <code>--version</code> &#8212; show DCP-o-matic version</listitem>
-      <listitem><code>-h</code>, <code>--help</code> &#8212; show this help</listitem>
-      <listitem><code>-n</code>, <code>--name</code> &#8212; &lt;name&gt; film name</listitem>
-      <listitem><code>-t, --template &lt;name&gt;</code> &#8212; template name</listitem>
-      <listitem><code>-c, --dcp-content-type &lt;type&gt;</code> &#8212; FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV</listitem>
-      <listitem><code>--container-ratio &lt;ratio&gt;</code> &#8212; 119, 133, 137, 138, 166, 178, 185 or 239</listitem>
-      <listitem><code>--content-ratio &lt;ratio&gt;</code> &#8212; 119, 133, 137, 138, 166, 178, 185 or 239</listitem>
-      <listitem><code>-s, --still-length &lt;n&gt;</code> &#8212; number of seconds that still content should last</listitem>
-      <listitem><code>--standard &lt;standard&gt;</code> &#8212; SMPTE or interop (default SMPTE)</listitem>
-      <listitem><code>--no-use-isdcf-name&gt;</code> &#8212; do not use an ISDCF name; use the specified name unmodified</listitem>
-      <listitem><code>--no-sign</code>&#8212; do not sign the DCP</listitem>
-      <listitem><code>-o</code>, <code>--output &lt;dir&gt;</code> &#8212; output directory</listitem>
-    </itemizedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dcpomatic_create.xml"/>
 
     <para>
       For example, to setup a film using a MP4 file you might do:
@@ -3423,21 +3440,7 @@ to the cinema which is showing your DCP.
       <code>dcpomatic2_cli [OPTION] [FILM]</code>
     </para>
 
-    <para>
-      <itemizedlist>
-       <listitem><code>-v</code>, <code>--version</code> &#8212; show DCP-o-matic version</listitem>
-       <listitem><code>-h</code>, <code>--help</code> &#8212; show this help</listitem>
-       <listitem><code>-f</code>, <code>--flags</code> &#8212; show flags passed to C++ compiler on build</listitem>
-       <listitem><code>-n</code>, <code>--no-progress</code> &#8212; do not print progress to stdout</listitem>
-       <listitem><code>-r</code>, <code>--no-remote</code> &#8212; do not use any remote servers</listitem>
-       <listitem><code>-t</code>, <code>--threads</code> &#8212; specify number of local encoding threads (overriding configuration)</listitem>
-       <listitem><code>-j</code>, <code>--json</code> &lt;port&gt; &#8212; run a JSON server on the specified port</listitem>
-       <listitem><code>-k</code>, <code>--keep-going</code> &#8212; keep running even when the job is complete</listitem>
-       <listitem><code>-s</code>, <code>--servers</code> &#8212; just display a list of encoding servers that DCP-o-matic is configured to use; don't encode</listitem>
-       <listitem><code>-d</code>, <code>--dcp-path</code> &#8212; echo DCP's path to stdout on successful completion (implies -n)</listitem>
-       <listitem><code>--dump</code> &#8212; just dump a summary of the film's settings; don't encode</listitem>
-      </itemizedlist>
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dcpomatic_cli.xml"/>
 
     <para>
       For example, to encode a film called <code>my_film</code> you might do:
@@ -3459,21 +3462,7 @@ to the cinema which is showing your DCP.
       <code>dcpomatic2_kdm_cli [OPTION] &lt;FILM|CPL-ID&gt;</code>
     </para>
 
-    <para>
-      <itemizedlist>
-       <listitem><code>-o</code>, <code>--output</code> &#8212; output file or directory</listitem>
-       <listitem><code>-f</code>, <code>--valid-from</code> &#8212; valid from time (in local time zone of the cinema) (e.g. "2013-09-28 01:41:51") or "now"</listitem>
-       <listitem><code>-t</code>, <code>--valid-to</code> &#8212; valid to time (in local time zone of the cinema) (e.g. "2014-09-28 01:41:51")</listitem>
-       <listitem><code>-d</code>, <code>--valid-duration</code> &#8212; valid duration (e.g. "1 day", "4 hours", "2 weeks")</listitem>
-       <listitem><code>--formulation</code> &#8212; modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]</listitem>
-       <listitem><code>-z</code>, <code>--zip</code> &#8212; ZIP each cinema's KDMs into its own file</listitem>
-       <listitem><code>-v</code>, <code>--verbose</code> &#8212; be verbose</listitem>
-       <listitem><code>-c</code>, <code>--cinema</code> &#8212; specify a cinema, either by name or email address</listitem>
-       <listitem><code>--certificate</code> &#8212; file containing projector certificate</listitem>
-       <listitem><code>--cinemas</code> &#8212; list known cinemas from the DCP-o-matic settings</listitem>
-       <listitem><code>--dkdm-cpls</code> &#8212; list CPLs for which DCP-o-matic has DKDMs</listitem>
-      </itemizedlist>
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dcpomatic_kdm_cli.xml"/>
 
   </section>
 </chapter>

diff --git a/doc/manual/diagrams/dcp-refer.svg b/doc/manual/diagrams/dcp-refer.svg
index d9a6024a711f4aa2a8cfd84d6c1c846dc70eefe0..6fb5a0c3572126579e160189456b4ee65e52ae9c 100644 (file)
--- a/doc/manual/diagrams/dcp-refer.svg
+++ b/doc/manual/diagrams/dcp-refer.svg
@@ -14,7 +14,7 @@
    height="1052.3622047"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="dcp-refer.svg">
   <sodipodi:namedview
      id="base"
@@ -25,12 +25,12 @@
      inkscape:pageshadow="2"
      inkscape:zoom="2.0193438"
      inkscape:cx="245.62749"
-     inkscape:cy="981.53645"
+     inkscape:cy="961.72804"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="970"
+     inkscape:window-width="1680"
+     inkscape:window-height="995"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -152,37 +152,37 @@
        y="163.1144" />
     <text
        xml:space="preserve"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="103.20419"
        y="100.85927"
-       id="text3784"
-       sodipodi:linespacing="125%"><tspan
+       id="text3784"><tspan
          sodipodi:role="line"
          id="tspan3786"
          x="103.20419"
-         y="100.85927">Picture</tspan></text>
+         y="100.85927"
+         style="font-size:14px;line-height:1.25">Picture</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="106.26537"
        y="153.35434"
-       id="text3788"
-       sodipodi:linespacing="125%"><tspan
+       id="text3788"><tspan
          sodipodi:role="line"
          id="tspan3790"
          x="106.26537"
-         y="153.35434">Sound</tspan></text>
+         y="153.35434"
+         style="font-size:14px;line-height:1.25">Sound</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
-       x="101.22516"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       x="89.917862"
        y="181.92085"
-       id="text3792"
-       sodipodi:linespacing="125%"><tspan
+       id="text3792"><tspan
          sodipodi:role="line"
          id="tspan3794"
-         x="101.22516"
-         y="181.92085">Subtitle</tspan></text>
+         x="89.917862"
+         y="181.92085"
+         style="font-size:14px;line-height:1.25">Subtitle #1</tspan></text>
     <rect
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1.99999999;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3807"
@@ -192,15 +192,15 @@
        y="42.628242" />
     <text
        xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="77.5177"
        y="38.171349"
-       id="text3821"
-       sodipodi:linespacing="125%"><tspan
+       id="text3821"><tspan
          sodipodi:role="line"
          id="tspan3823"
          x="77.5177"
-         y="38.171349">Content DCP</tspan></text>
+         y="38.171349"
+         style="font-size:16px;line-height:1.25">Content DCP</tspan></text>
     <rect
        style="color:#000000;fill:#87deaa;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect2985-4-7"
@@ -210,15 +210,15 @@
        y="93.289734" />
     <text
        xml:space="preserve"
-       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
-       x="366.48407"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       x="354.96677"
        y="112.09619"
-       id="text3792-5"
-       sodipodi:linespacing="125%"><tspan
+       id="text3792-5"><tspan
          sodipodi:role="line"
          id="tspan3794-2"
-         x="366.48407"
-         y="112.09619">Subtitle</tspan></text>
+         x="354.96677"
+         y="112.09619"
+         style="font-size:14px;line-height:1.25">Subtitle #2</tspan></text>
     <rect
        style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999998, 2;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3807-6"
@@ -228,26 +228,26 @@
        y="42.628242" />
     <text
        xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="354.58395"
        y="38.171349"
-       id="text3821-6"
-       sodipodi:linespacing="125%"><tspan
+       id="text3821-6"><tspan
          sodipodi:role="line"
          id="tspan3823-0"
          x="354.58395"
-         y="38.171349">New DCP</tspan></text>
+         y="38.171349"
+         style="font-size:16px;line-height:1.25">New DCP</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;color:#000000;fill:#e9afaf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;display:inline;overflow:visible;visibility:visible;fill:#e9afaf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        x="338.72388"
        y="61.941441"
-       id="text4609"
-       sodipodi:linespacing="125%"><tspan
+       id="text4609"><tspan
          sodipodi:role="line"
          id="tspan4611"
          x="338.72388"
-         y="61.941441">Refer to picture</tspan></text>
+         y="61.941441"
+         style="font-size:16px;line-height:1.25">Refer to picture</tspan></text>
     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#e9afaf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -260,16 +260,15 @@
        transform="translate(97.061233,-132.22117)" />
     <text
        xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;color:#000000;fill:#00aad4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:latin modern roman;-inkscape-font-specification:latin modern roman;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;display:inline;overflow:visible;visibility:visible;fill:#00aad4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        x="338.72388"
        y="81.651878"
-       id="text4609-1"
-       sodipodi:linespacing="125%"><tspan
+       id="text4609-1"><tspan
          sodipodi:role="line"
          id="tspan4611-6"
          x="338.72388"
          y="81.651878"
-         style="fill-opacity:1;fill:#00aad4;stroke:none;color:#000000;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:latin modern roman;font-family:latin modern roman">Refer to sound</tspan></text>
+         style="color:#000000;font-size:16px;line-height:1.25;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';display:inline;overflow:visible;visibility:visible;fill:#00aad4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate">Refer to sound</tspan></text>
     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#00aad4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@@ -299,14 +298,14 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:latin modern roman;-inkscape-font-specification:latin modern roman"
+       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:'latin modern roman';-inkscape-font-specification:'latin modern roman';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="213.10968"
        y="109.97685"
-       id="text4428"
-       sodipodi:linespacing="125%"><tspan
+       id="text4428"><tspan
          sodipodi:role="line"
          id="tspan4430"
          x="213.10968"
-         y="109.97685">Make DCP</tspan></text>
+         y="109.97685"
+         style="font-size:16px;line-height:1.25">Make DCP</tspan></text>
   </g>
 </svg>