Merge branch 'master' into philomelos

Conflicts resolved in:
	python/musicexp.py
	python/musicxml.py
	scripts/musicxml2ly.py

2 files changed, 18 insertions, 6 deletions

diff --git a/scripts/build/website_post.py b/scripts/build/website_post.py
index a6fafdc012..9fba75445f 100644
--- a/scripts/build/website_post.py
+++ b/scripts/build/website_post.py
@@ -198,12 +198,15 @@ for file in html_files:
         ### add google tracker header
         if (line.find("</head>") >= 0):
             outfile.write("""<!-- Google tracking !-->
-<script src="http://www.google-analytics.com/urchin.js"
-type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-68969-1";
-urchinTracker();
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-68969-1', 'auto');
+  ga('send', 'pageview');
+
 </script>
 """);
         #### add google tracker goals
diff --git a/scripts/build/xetex-with-options.sh b/scripts/build/xetex-with-options.sh
new file mode 100755
index 0000000000..f53ba0d0b8
--- /dev/null
+++ b/scripts/build/xetex-with-options.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# By the default settings,
+# XeTeX (xdvipdfmx) replaces link destination names with integers.
+# In this case, the replaced destination names of
+# remote PDF cannot be known. In order to avoid replacement,
+# we can use commandline option `-C 0x0010' for xdvipdfmx.
+
+exec xetex --output-driver='xdvipdfmx -C 0x0010' "$@"