From 547a32b2fbaf533c4da03a490a316ce76085c1b1 Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Tue, 25 Oct 2011 08:15:30 -0400 Subject: [PATCH] Fix the links to music samples in web-big-page (issue 1663). We move all of Documentation/web/ly-examples to Documentation/ly-examples and rework the links for the split manuals. This puts the ly-examples subdir on par with e.g. the pictures subdir as a top-level subdir. --- Documentation/GNUmakefile | 6 +- .../{web => }/ly-examples/GNUmakefile | 3 +- .../{web => }/ly-examples/ancient-headword.ly | 3 +- .../{web => }/ly-examples/aucun-snippet.ly | 46 ++++++------- .../{web => }/ly-examples/bach-bwv610.ly | 0 .../{web => }/ly-examples/bach-schenker.ly | 0 .../{web => }/ly-examples/cary-layout.ily | 11 ++- Documentation/{web => }/ly-examples/cary.ly | 68 +++++++++---------- Documentation/{web => }/ly-examples/chart.ly | 5 +- .../{web => }/ly-examples/example-header.ily | 1 - .../{web => }/ly-examples/granados.ly | 0 .../{web => }/ly-examples/orchestra.ly | 1 - .../{web => }/ly-examples/sesto-full.ly | 2 - .../{web => }/ly-examples/sesto-piano.ly | 1 - .../{web => }/ly-examples/sesto-violin.ly | 0 Documentation/{web => }/ly-examples/sesto.ily | 3 +- .../{web => }/ly-examples/tab-example.ly | 0 Documentation/{web => }/ly-examples/theory.ly | 29 ++++---- Documentation/web/GNUmakefile | 2 +- python/auxiliar/postprocess_html.py | 3 + 20 files changed, 88 insertions(+), 96 deletions(-) rename Documentation/{web => }/ly-examples/GNUmakefile (97%) rename Documentation/{web => }/ly-examples/ancient-headword.ly (99%) rename Documentation/{web => }/ly-examples/aucun-snippet.ly (91%) rename Documentation/{web => }/ly-examples/bach-bwv610.ly (100%) rename Documentation/{web => }/ly-examples/bach-schenker.ly (100%) rename Documentation/{web => }/ly-examples/cary-layout.ily (97%) rename Documentation/{web => }/ly-examples/cary.ly (97%) rename Documentation/{web => }/ly-examples/chart.ly (95%) rename Documentation/{web => }/ly-examples/example-header.ily (99%) rename Documentation/{web => }/ly-examples/granados.ly (100%) rename Documentation/{web => }/ly-examples/orchestra.ly (99%) rename Documentation/{web => }/ly-examples/sesto-full.ly (99%) rename Documentation/{web => }/ly-examples/sesto-piano.ly (99%) rename Documentation/{web => }/ly-examples/sesto-violin.ly (100%) rename Documentation/{web => }/ly-examples/sesto.ily (99%) rename Documentation/{web => }/ly-examples/tab-example.ly (100%) rename Documentation/{web => }/ly-examples/theory.ly (79%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 9df5573532..00b4eeb4e4 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -12,7 +12,7 @@ LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) MANUALS_SUBDIRS = usage contributor essay \ web learning notation extending SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \ - included $(LANGS) + included ly-examples $(LANGS) STEPMAKE_TEMPLATES = documentation texinfo tex omf LOCALSTEPMAKE_TEMPLATES = lilypond ly @@ -232,8 +232,8 @@ $(outdir)/css: ln -sf ../css/$(outdir) $@ $(outdir)/ly-examples: - $(MAKE) -C web/ly-examples - ln -sf ../web/ly-examples/$(outdir) $@ + $(MAKE) -C ly-examples + ln -sf ../ly-examples/$(outdir) $@ endif diff --git a/Documentation/web/ly-examples/GNUmakefile b/Documentation/ly-examples/GNUmakefile similarity index 97% rename from Documentation/web/ly-examples/GNUmakefile rename to Documentation/ly-examples/GNUmakefile index 473d16b967..a3ee42280b 100644 --- a/Documentation/web/ly-examples/GNUmakefile +++ b/Documentation/ly-examples/GNUmakefile @@ -1,4 +1,4 @@ -depth=../../.. +depth=../.. LOCALSTEPMAKE_TEMPLATES=lilypond ly include $(depth)/make/stepmake.make @@ -19,4 +19,3 @@ $(outdir)/%.png: %.ly $(outdir)/%-small.png: $(outdir)/%.png pngtopnm $< | pnmscale -w=600 | pnmtopng > $@ - diff --git a/Documentation/web/ly-examples/ancient-headword.ly b/Documentation/ly-examples/ancient-headword.ly similarity index 99% rename from Documentation/web/ly-examples/ancient-headword.ly rename to Documentation/ly-examples/ancient-headword.ly index 22640e58dc..301c5bdff4 100644 --- a/Documentation/web/ly-examples/ancient-headword.ly +++ b/Documentation/ly-examples/ancient-headword.ly @@ -3,7 +3,7 @@ #(set-global-staff-size 15) -\include "gregorian.ly" +\include "gregorian.ly" \score { << @@ -121,4 +121,3 @@ \consists Custos_engraver } } - diff --git a/Documentation/web/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly similarity index 91% rename from Documentation/web/ly-examples/aucun-snippet.ly rename to Documentation/ly-examples/aucun-snippet.ly index ce484baaee..3dd1a642ed 100644 --- a/Documentation/web/ly-examples/aucun-snippet.ly +++ b/Documentation/ly-examples/aucun-snippet.ly @@ -7,7 +7,7 @@ } % Aucun ont trouvé, from Montpellier Codex -% +% % Put brackets in where the original has ligatures, using % "Analysis Brackets," and adjust the "bracket-flare" property % to make the ends vertical instead of slanted. @@ -22,7 +22,7 @@ incipitGlobal = { \override KeySignature #'style = #'mensural \override Rest #'style = #'mensural % \override Staff.TimeSignature #'style = #'mensural - \cadenzaOn + \cadenzaOn \override Score.Clef #'extra-offset = #'(-0.0 . 0.5) \override Score.Clef #'font-size = #3 \clef "vaticana-do1" @@ -51,7 +51,7 @@ incipitTriplum = \markup{ incipitMotetus = \markup{ \score{ - { + { \set Staff.instrumentName="Motetus" \incipitGlobal s1. @@ -71,7 +71,7 @@ incipitMotetus = \markup{ } incipitTenor = \markup{ - \score{ + \score{ { \set Staff.instrumentName = "Tenor " \incipitGlobal @@ -98,7 +98,7 @@ incipitBassus = \markup{ \override Accidental #'style = #'neomensural \override Rest #'style = #'neomensural \override Staff.TimeSignature #'style = #'neomensural - \cadenzaOn + \cadenzaOn \clef "petrucci-f3" \key f \major \time 3/2 @@ -126,31 +126,31 @@ global = { \time 3/4 \override Staff.BarLine #'transparent = ##t \override HorizontalBracket #'direction = #UP - \override HorizontalBracket #'bracket-flare = #'(0 . 0) + \override HorizontalBracket #'bracket-flare = #'(0 . 0) } %%%%%%%%% MACRO FOR MAKING SLASHES THROUGH STEMS %%%%%%%%%% -MakeSlash = #(define-music-function (parser location angle len-left len-right +MakeSlash = #(define-music-function (parser location angle len-left len-right thick y-factor offset) - (number? number? number? number? number? + (number? number? number? number? number? pair?) #{ \once \override Voice.Stem #'text = \markup { \postscript #(let ((x-off (car $offset)) (y-off (cdr $offset))) (string-append - (ly:number->string (car $offset)) " " (ly:number->string (cdr $offset)) " + (ly:number->string (car $offset)) " " (ly:number->string (cdr $offset)) " translate " (ly:number->string $angle) " rotate " - (ly:number->string (- x-off)) " " + (ly:number->string (- x-off)) " " (ly:number->string (- y-off)) " translate 0 setlinewidth " - (ly:number->string (- x-off $len-left)) " " (ly:number->string (+ y-off -$thick)) " moveto " + (ly:number->string (- x-off $len-left)) " " (ly:number->string (+ y-off +$thick)) " moveto " (ly:number->string (- x-off $len-left)) " " (ly:number->string y-off) - " " (ly:number->string $thick) " + " " (ly:number->string $thick) " 90 270 arc " (ly:number->string (+ x-off $len-right)) " " (ly:number->string y-off) - " " (ly:number->string $thick) " + " " (ly:number->string $thick) " 270 90 arc " " gsave fill grestore stroke")) } @@ -162,7 +162,7 @@ $thick)) " moveto " (ly:stencil-add sten1 (ly:stencil-translate sten2 - (cons 0 (+ (* $y-factor (cdr extent1)) + (cons 0 (+ (* $y-factor (cdr extent1)) (* (- 1 $y-factor) (car extent1)))))))) #}) @@ -175,7 +175,7 @@ triplumWords = \lyricmode { Au -- cun ont trou -- ve chant par u -- sa -- ge, mes a moi en doune o -- choi -- son __ a -- mours, qui res -- bou -- dist mon cou -- ra -- ge - si que m'ès -- tuet fai -- re _ chan -- _ _ çon + si que m'ès -- tuet fai -- re _ chan -- _ _ çon } triplumNotes = \relative c' { @@ -185,7 +185,7 @@ triplumNotes = \relative c' { \override StemTremolo #'beam-thickness = #.125 \override StemTremolo #'slope = #1.0 f8 f4 e8 d c f f f | % 1 - % the \scaleDurations command below makes 5 notes last the + % the \scaleDurations command below makes 5 notes last the % duration of a dotted quarter e8 c4 \scaleDurations #'(3 . 2) { \times 4/5{e16[ d e d e]} } e8 f4 | % 2 g2. ~ g4. | % 3 @@ -197,7 +197,7 @@ triplumNotes = \relative c' { motetusWords = \lyricmode { lonc tans _ _ me fiu -- te -- nu de chan -- _ _ ter __ - mes or ai _ _ + mes or ai _ _ } motetusNotes = \relative c' { @@ -220,7 +220,7 @@ tenorNotes = \relative c { \new StaffGroup << \new Staff = "triplum" << %\set Staff.instrumentName = "Triplum" - \set Staff.instrumentName = \incipitTriplum + \set Staff.instrumentName = \incipitTriplum \set Staff.shortInstrumentName = "Tr." \set Staff.timeSignatureFraction = #'(9 . 8) \scaleDurations #'(2 . 3) @@ -235,14 +235,14 @@ tenorNotes = \relative c { \set Staff.shortInstrumentName = "M." \set Staff.timeSignatureFraction = #'(9 . 8) \scaleDurations #'(2 . 3) - \context Voice = "motetus" { \global \motetusNotes } + \context Voice = "motetus" { \global \motetusNotes } \new Lyrics { \lyricsto "motetus" { \motetusWords }} >> - \new Staff = "tenor" { + \new Staff = "tenor" { %\set Staff.instrumentName = "Tenor" - \set Staff.instrumentName = \incipitTenor + \set Staff.instrumentName = \incipitTenor \set Staff.shortInstrumentName = "T." - \global \tenorNotes + \global \tenorNotes } >> %\midi {} diff --git a/Documentation/web/ly-examples/bach-bwv610.ly b/Documentation/ly-examples/bach-bwv610.ly similarity index 100% rename from Documentation/web/ly-examples/bach-bwv610.ly rename to Documentation/ly-examples/bach-bwv610.ly diff --git a/Documentation/web/ly-examples/bach-schenker.ly b/Documentation/ly-examples/bach-schenker.ly similarity index 100% rename from Documentation/web/ly-examples/bach-schenker.ly rename to Documentation/ly-examples/bach-schenker.ly diff --git a/Documentation/web/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily similarity index 97% rename from Documentation/web/ly-examples/cary-layout.ily rename to Documentation/ly-examples/cary-layout.ily index 480426c48c..8a393fc62d 100644 --- a/Documentation/web/ly-examples/cary-layout.ily +++ b/Documentation/ly-examples/cary-layout.ily @@ -6,7 +6,7 @@ ragged-right = ##t \context { \Score - + proportionalNotationDuration = #(ly:make-moment 1 64) \override Beam #'breakable = ##t autoBeaming = ##f @@ -26,11 +26,11 @@ \paper { oddHeaderMarkup = \markup \fill-line { " " } evenHeaderMarkup = \markup \fill-line { " " } - oddFooterMarkup = \markup { - \fill-line { + oddFooterMarkup = \markup { + \fill-line { \bold \fontsize #3 \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string } } - evenFooterMarkup = \markup { - \fill-line { + evenFooterMarkup = \markup { + \fill-line { \bold \fontsize #3 \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string } } printfirst-page-number = ##t print-page-number = ##t @@ -102,4 +102,3 @@ cross = #(define-music-function (parser location music) (ly:music?) white = #(define-music-function (parser location music) (ly:music?) #{ \once \override NoteHead #'duration-log = #1 $music #}) - diff --git a/Documentation/web/ly-examples/cary.ly b/Documentation/ly-examples/cary.ly similarity index 97% rename from Documentation/web/ly-examples/cary.ly rename to Documentation/ly-examples/cary.ly index 4f74b92de9..9ba60e7304 100644 --- a/Documentation/web/ly-examples/cary.ly +++ b/Documentation/ly-examples/cary.ly @@ -14,7 +14,7 @@ composer = "Trevor Bača" copyright = "Copyright 2006 Trevor Bača, licensed under the FDL 1.1 or higher" - + } % Verbatim from composer's score. @@ -30,9 +30,9 @@ \score { << - + \new StaffGroup << - + \new Staff \with { \override Stem #'direction = #down \override Beam #'positions = #'(-7 . -7) @@ -40,22 +40,22 @@ \override TupletBracket #'staff-padding = #5 \override TupletBracket #'padding = #2.25 } << - + \new Voice { - + \override Score.MetronomeMark #'extra-offset = #'(0 . 6) \override Score.MetronomeMark #'font-size = #3 \tempo 8=42 \time 5/16 s4 ~ s16 \noBreak % measure 6 \time 4/8 s2 \noBreak % measure 7 \time 4/8 s2 \noBreak % measure 8 - + } - + \new Voice \with { \remove Forbid_line_break_engraver } { - + % measure 6 \fraction \times 5/3 { \times 4/5 { @@ -74,7 +74,7 @@ } bf''16 % 46 } - + % measure 7 r8 % 47 \times 4/5 { @@ -85,15 +85,15 @@ b'32 ] % 52 } ef'''4 % 53 - + % measure 8 b''8 [ % 54 g''8 ] % 55 d''4 % 56 - + } >> - + \new Staff \with { \override Clef #'transparent = ##t \override StaffSymbol #'line-positions = #'(-4 -2 2 4) @@ -101,11 +101,11 @@ \override TupletBracket #'staff-padding = #5 \override TupletBracket #'padding = #2.25 } << - + \new Voice \with { \remove Forbid_line_break_engraver \override Stem #'direction = #up - \override Flag #'stroke-style = #"grace" + \override Flag #'stroke-style = #"grace" \override Stem #'font-size = #-3 \override Rest #'transparent = ##t \override NoteHead #'no-ledgers = ##t @@ -113,7 +113,7 @@ \override TupletBracket #'transparent = ##t \override TupletNumber #'transparent = ##t } { - + % measure 6 \fraction \times 5/3 { \square f''16 * 1/8 % 40 @@ -137,7 +137,7 @@ \square f''16 * 1/4 % 55 } } - + % measure 7 s8 % 56 \square g''16 * 2/1 % 57 @@ -151,7 +151,7 @@ f''16 * 1/4 % 64 f''16 * 1/4 % 65 } - + % measure 8 \times 4/5 { \times 4/7 { @@ -170,9 +170,9 @@ \triangle g''16 * 1/2 % 77 \triangle g''16 * 1/2 % 78 } - + } - + \new Voice \with { \remove Forbid_line_break_engraver \override Stem #'transparent = ##t @@ -184,7 +184,7 @@ \override TupletBracket #'transparent = ##t \override TupletNumber #'transparent = ##t } { - + % measure 6 \fraction \times 5/3 { \blackdiamond f'128 [ % 40 @@ -208,7 +208,7 @@ \blackdiamond f'64 % 55 } } - + % measure 7 s8 % 56 \harmonic a'8 \glissando % 57 @@ -222,7 +222,7 @@ \harmonic g'64 \glissando % 64 \blackdiamond g'64 % 65 } - + % measure 8 \times 4/5 { \times 4/7 { @@ -241,21 +241,21 @@ \harmonic e'32 \glissando % 77 \blackdiamond e'32 % 78 } - + } - + \new Voice \with { \remove Forbid_line_break_engraver \override Stem #'direction = #down \override Stem #'font-size = #-3 - \override Flag #'stroke-style = #"grace" + \override Flag #'stroke-style = #"grace" \override Rest #'transparent = ##t \override NoteHead #'no-ledgers = ##t \override Dots #'transparent = ##t \override TupletBracket #'transparent = ##t \override TupletNumber #'transparent = ##t } { - + % measure 6 \fraction \times 5/3 { s128 % 40 @@ -279,7 +279,7 @@ \semicircle a16 * 1/4 % 55 } } - + % measure 7 s8 % 56 s8 % 57 @@ -293,7 +293,7 @@ s64 % 64 \triangle a16 * 1/4 % 65 } - + % measure 8 \times 4/5 { \times 4/7 { @@ -312,9 +312,9 @@ s32 % 77 \semicircle a16 * 1/2 % 78 } - + } - + \new Voice \with { \remove Forbid_line_break_engraver \override Stem #'direction = #down @@ -331,7 +331,7 @@ \override TextSpanner #'(bound-details right padding) = #0.5 \override TextSpanner #'staff-padding = #4 } { - + % measure 6 \fraction \times 5/3 { \beam #0 #5 g,128 \sffp \< [ % 40 @@ -355,7 +355,7 @@ \beam #4 #0 g,64 \fX ] % 55 } } - + % measure 7 r8 % 56 g,8 \sf \< [ % 57 @@ -369,7 +369,7 @@ \beam #4 #4 g,64 % 64 \beam #4 #0 g,64 \fX ] % 65 } - + % measure 8 \times 4/5 { \times 4/7 { @@ -388,7 +388,7 @@ \beam #3 #3 g,32 % 77 \beam #3 #0 g,32 \ffX ] % 78 } - + } >> >> diff --git a/Documentation/web/ly-examples/chart.ly b/Documentation/ly-examples/chart.ly similarity index 95% rename from Documentation/web/ly-examples/chart.ly rename to Documentation/ly-examples/chart.ly index 871ea301a6..e2b5756110 100644 --- a/Documentation/web/ly-examples/chart.ly +++ b/Documentation/ly-examples/chart.ly @@ -22,7 +22,7 @@ melody = \relative c' { } harmonies = \chordmode { - \global + \global s4 g1 | c | a:m | d % 1-3 } @@ -35,10 +35,9 @@ text = \lyricmode { << \new ChordNames { \harmonies } \new FretBoards { \harmonies } - \new Staff { + \new Staff { \context Voice = "vocal" { \melody } } \new Lyrics \lyricsto "vocal" \text >> } - diff --git a/Documentation/web/ly-examples/example-header.ily b/Documentation/ly-examples/example-header.ily similarity index 99% rename from Documentation/web/ly-examples/example-header.ily rename to Documentation/ly-examples/example-header.ily index ab35243579..304c333456 100644 --- a/Documentation/web/ly-examples/example-header.ily +++ b/Documentation/ly-examples/example-header.ily @@ -9,4 +9,3 @@ bookTitleMarkup = ##f scoreTitleMarkup = ##f } - diff --git a/Documentation/web/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly similarity index 100% rename from Documentation/web/ly-examples/granados.ly rename to Documentation/ly-examples/granados.ly diff --git a/Documentation/web/ly-examples/orchestra.ly b/Documentation/ly-examples/orchestra.ly similarity index 99% rename from Documentation/web/ly-examples/orchestra.ly rename to Documentation/ly-examples/orchestra.ly index 4f8726da9e..56bdfb5208 100644 --- a/Documentation/web/ly-examples/orchestra.ly +++ b/Documentation/ly-examples/orchestra.ly @@ -571,4 +571,3 @@ R2. | } } } - diff --git a/Documentation/web/ly-examples/sesto-full.ly b/Documentation/ly-examples/sesto-full.ly similarity index 99% rename from Documentation/web/ly-examples/sesto-full.ly rename to Documentation/ly-examples/sesto-full.ly index 7f62973461..e7164fc63e 100644 --- a/Documentation/web/ly-examples/sesto-full.ly +++ b/Documentation/ly-examples/sesto-full.ly @@ -65,5 +65,3 @@ % \midi { } } } - - diff --git a/Documentation/web/ly-examples/sesto-piano.ly b/Documentation/ly-examples/sesto-piano.ly similarity index 99% rename from Documentation/web/ly-examples/sesto-piano.ly rename to Documentation/ly-examples/sesto-piano.ly index 0d2a5ffdd5..04fbfb9a4e 100644 --- a/Documentation/web/ly-examples/sesto-piano.ly +++ b/Documentation/ly-examples/sesto-piano.ly @@ -43,4 +43,3 @@ } } } - diff --git a/Documentation/web/ly-examples/sesto-violin.ly b/Documentation/ly-examples/sesto-violin.ly similarity index 100% rename from Documentation/web/ly-examples/sesto-violin.ly rename to Documentation/ly-examples/sesto-violin.ly diff --git a/Documentation/web/ly-examples/sesto.ily b/Documentation/ly-examples/sesto.ily similarity index 99% rename from Documentation/web/ly-examples/sesto.ily rename to Documentation/ly-examples/sesto.ily index 899d3cc0c7..5ef90eb591 100644 --- a/Documentation/web/ly-examples/sesto.ily +++ b/Documentation/ly-examples/sesto.ily @@ -213,7 +213,6 @@ bassi = { global = { \key c \minor \set Score . tempoWholesPerMinute = #(ly:make-moment (/ 80 4) 1 0 1) - \time 4/4 + \time 4/4 %s1*34 \bar "|." } - diff --git a/Documentation/web/ly-examples/tab-example.ly b/Documentation/ly-examples/tab-example.ly similarity index 100% rename from Documentation/web/ly-examples/tab-example.ly rename to Documentation/ly-examples/tab-example.ly diff --git a/Documentation/web/ly-examples/theory.ly b/Documentation/ly-examples/theory.ly similarity index 79% rename from Documentation/web/ly-examples/theory.ly rename to Documentation/ly-examples/theory.ly index cca033a6df..9f8adab952 100644 --- a/Documentation/web/ly-examples/theory.ly +++ b/Documentation/ly-examples/theory.ly @@ -4,27 +4,27 @@ #(ly:set-option 'point-and-click #f) global = { - \time 4/4 + \time 4/4 \numericTimeSignature \key c \major #(set-global-staff-size 24) } -cf = \relative c { +cf = \relative c { \clef bass \global - c4 c' b a | - g a f d | - e f g g, | - c1 + c4 c' b a | + g a f d | + e f g g, | + c1 } -upper = \relative c'' { +upper = \relative c'' { \global - r4 s4 s2 | - s1*2 | - s2 s4 s - \bar "||" + r4 s4 s2 | + s1*2 | + s2 s4 s + \bar "||" } bassFigures = \figuremode { @@ -35,14 +35,14 @@ bassFigures = \figuremode { \score { \new PianoStaff << - \new Staff { + \new Staff { \context Voice = "added voice" \with { \consists "Balloon_engraver" } \upper } - \new Staff = lower { + \new Staff = lower { << % \context Voice = "cantus firmus" \with { % \consists "Balloon_engraver" @@ -57,7 +57,6 @@ bassFigures = \figuremode { \context { \Score tempoWholesPerMinute = #(ly:make-moment 120 4) - } + } }%} } - diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile index 0435d91702..278256fb91 100644 --- a/Documentation/web/GNUmakefile +++ b/Documentation/web/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. LOCALSTEPMAKE_TEMPLATES = ly -SUBDIRS = ly-examples server +SUBDIRS = server include $(depth)/make/stepmake.make #OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py index 3ace451bf0..eed34d1586 100644 --- a/python/auxiliar/postprocess_html.py +++ b/python/auxiliar/postprocess_html.py @@ -103,6 +103,7 @@ def source_links_replace (m, source_val): # More hardcoding, yay! split_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets|contributor))/') +lily_examples_re = re.compile ('(href|src)="(ly-examples/.*?)"') lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"') pictures_re = re.compile ('src="(pictures/.*?)"') @@ -117,7 +118,9 @@ def hack_urls (s, prefix, target, is_development_branch): depth = (prefix.count ('/') - 1) * '../' # fix css links s = css_re.sub ('' % {'rel': depth}, s) + # fix image links if split_docs_re.match (prefix): + s = lily_examples_re.sub ('\\1="../\\2"', s) s = lily_snippets_re.sub ('\\1="../\\2"', s) s = pictures_re.sub ('src="../\\1"', s) -- 2.39.2