From 14bd7e660f59c1ce1373424a877a70ec576a93d3 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Sun, 13 Mar 2016 23:41:37 +0100
Subject: Issue 4799: Let musicxml2py generate current override/revert syntax

---
 scripts/musicxml2ly.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 5cf53339a4..b1cc496f6e 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -331,7 +331,7 @@ def staff_attributes_to_lily_staff (mxl_attr):
         staff = musicexp.Staff ()
         # TODO: Handle case with lines <> 5!
         if (lines != 5):
-            staff.add_context_modification ("\\override StaffSymbol #'line-count = #%s" % lines)
+            staff.add_context_modification ("\\override StaffSymbol.line-count = #%s" % lines)
 
 
     return staff
-- 
cgit v1.2.3


From 9580a231b3d3f912f46066009114a2929ecbb16a Mon Sep 17 00:00:00 2001
From: Federico Bruni <fede@inventati.org>
Date: Fri, 25 Mar 2016 14:54:20 +0100
Subject: issue 4813: replace urchin.js with analytics.js and fix redundant
 hostnames

This patch aims at fixing two warnings reported by Google Analytics:

1. analytics.js is the new javascript library which replaces urchin.js
2. the website should be available at one hostname only and we chose
   lilypond.org over www.lilypond.org
---
 Documentation/web/server/lilypond.org.htaccess |  4 ++++
 scripts/build/website_post.py                  | 15 +++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/Documentation/web/server/lilypond.org.htaccess b/Documentation/web/server/lilypond.org.htaccess
index c6da26a1bb..29d9028411 100644
--- a/Documentation/web/server/lilypond.org.htaccess
+++ b/Documentation/web/server/lilypond.org.htaccess
@@ -16,6 +16,10 @@
 
 RewriteEngine On
 
+# Permanent redirect from www.lilypond.org to lilypond.org
+RewriteCond "%{HTTP_HOST}" "^www\.(.+)$" [NC]
+RewriteRule "^/?(.*)$"     "http://%1/$1" [R=301,L,NE]
+
 # Deny following of symlinks by robots.
 # HTTrack is a known offender.
 # better yet, to redirect this to page that tells adminstrator
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
-- 
cgit v1.2.3


From c833e91ac8b976b7bc0f4fcb4a903c728310b369 Mon Sep 17 00:00:00 2001
From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Wed, 30 Mar 2016 20:40:15 +0900
Subject: Issue 4816: Add xdvipdfmx option for PDF destination names

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,
this commit adds xdvipdfmx commandline option.
---
 configure.ac                        | 4 ++++
 scripts/build/xetex-with-options.sh | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100755 scripts/build/xetex-with-options.sh

(limited to 'scripts')

diff --git a/configure.ac b/configure.ac
index a34bbc580e..0a753325d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,10 @@ STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
 STEPMAKE_PROGS(PDFLATEX, xelatex pdflatex, $DOCUMENTATION_REQUIRED)
 if test "$PDFLATEX" = "xelatex"; then
     STEPMAKE_PROGS(PDFTEX, xetex, $DOCUMENTATION_REQUIRED)
+    if test "$PDFTEX" = "xetex"; then
+        # For avoiding PDF destination name replacement.
+        PDFTEX=$ugh_ugh_autoconf250_builddir/scripts/build/out$CONFIGSUFFIX/xetex-with-options
+    fi
 else
     STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED)
 fi
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' "$@"
-- 
cgit v1.2.3