From 16e6a251b77f6ee0e6feaec9502a197502aee060 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 31 Jul 2011 21:43:31 +0200 Subject: [PATCH] s/splitted/split/ --- Documentation/GNUmakefile | 14 +++++++------- Documentation/essay/computer-notation.bib | 2 +- Documentation/lilypond-texi2html.init | 6 +++--- elisp/lilypond-mode.el | 8 ++++---- make/doc-i18n-root-vars.make | 10 +++++----- python/auxiliar/postprocess_html.py | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 19ae577698..9b598c923a 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -57,19 +57,19 @@ TEXI_FILES_FROM_TELY = $(outdir)/internals.texi PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf) TOPDIR_HTML_MANUALS = -UNSPLITTED_HTML_MANUALS = -SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\ - $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual))) -NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\ +UNSPLIT_HTML_MANUALS = +SPLIT_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\ + $(if $(findstring $(manual), $(UNSPLIT_HTML_MANUALS)),,$(manual))) +NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLIT_HTML_MANUALS),\ $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual))) -OUT_HTML_FILES = $(UNSPLITTED_HTML_MANUALS:%=$(outdir)/%.html)\ - $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html) +OUT_HTML_FILES = $(UNSPLIT_HTML_MANUALS:%=$(outdir)/%.html)\ + $(SPLIT_HTML_MANUALS:%=$(outdir)/%-big-page.html) DEEP_HTML_FILES = $(NOT_TOPDIR_HTML_MANUALS:%=$(outdir)/%/index.html) # Symlinks to refer to external source documents from split and non-split HTML source-links = $(outdir)/source\ - $(foreach manual, $(SPLITTED_HTML_MANUALS), $(outdir)/$(manual)/source) + $(foreach manual, $(SPLIT_HTML_MANUALS), $(outdir)/$(manual)/source) # Other out files diff --git a/Documentation/essay/computer-notation.bib b/Documentation/essay/computer-notation.bib index 547a990c81..23b0658066 100644 --- a/Documentation/essay/computer-notation.bib +++ b/Documentation/essay/computer-notation.bib @@ -159,7 +159,7 @@ SMDL. With a short example that is quite lengthy in SMDL} volume = 17, number = 3, note = {A categorisation of music representation systems (languages, -OO systems etc) splitted into high level and low level expressiveness. +OO systems etc) split into high level and low level expressiveness. The discussion of Charm and parallel processing for music representation is rather vague. HWN} } diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init index 1e75f54aa7..6814aafed7 100644 --- a/Documentation/lilypond-texi2html.init +++ b/Documentation/lilypond-texi2html.init @@ -1445,9 +1445,9 @@ sub remove_unneeded_anchor($) for ($i = 0; $i < @hrefsplit; $i++) { $item = @hrefsplit[$i]; if ($item =~ /#/) { - @splitted = split(".html#", $item); - if (@splitted[0] eq @splitted[1]) { - @hrefsplit[$i] = @splitted[0] . ".html"; + @split = split(".html#", $item); + if (@split[0] eq @split[1]) { + @hrefsplit[$i] = @split[0] . ".html"; } } } diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el index d39b0d1d2f..0b01c192f1 100644 --- a/elisp/lilypond-mode.el +++ b/elisp/lilypond-mode.el @@ -995,17 +995,17 @@ command." (defun LilyPond-menu-keywords () "Make Insert Tag menu. -The Insert Tag -menu is splitted into parts if it is long enough." +The Insert Tag -menu is split into parts if it is long enough." (let ((li (mapcar 'LilyPond-menu-keywords-item LilyPond-menu-keywords)) (w (round (sqrt (length LilyPond-menu-keywords)))) - (splitted '()) + (split '()) (imin 0) imax lw rw) (while (< imin (length LilyPond-menu-keywords)) (setq imax (- (min (+ imin w) (length LilyPond-menu-keywords)) 1)) (setq lw (nth imin LilyPond-menu-keywords)) (setq rw (nth imax LilyPond-menu-keywords)) - (add-to-list 'splitted + (add-to-list 'split (let ((l (list (concat (substring lw 0 (min 7 (length lw))) " ... " (substring rw 0 (min 7 (length rw))))))) @@ -1013,7 +1013,7 @@ The Insert Tag -menu is splitted into parts if it is long enough." (add-to-list 'l (nth imin li)) (setq imin (1+ imin))) (reverse l)))) - (if (> (length LilyPond-menu-keywords) 12) (reverse splitted) li))) + (if (> (length LilyPond-menu-keywords) 12) (reverse split) li))) ;;; LilyPond-mode-menu should not be interactive, via "M-x LilyPond-" (easy-menu-define LilyPond-mode-menu diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index 03bc122520..e6449d6fb5 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -13,14 +13,14 @@ TEXINFO_MANUALS =\ $(TEXI_FILES:%.texi=%) TOPDIR_HTML_MANUALS = -SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\ - $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual))) -NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\ +SPLIT_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\ + $(if $(findstring $(manual), $(UNSPLIT_HTML_MANUALS)),,$(manual))) +NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLIT_HTML_MANUALS),\ $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual))) -OUT_HTML_FILES += $(UNSPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html) \ +OUT_HTML_FILES += $(UNSPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html) \ $(TOPDIR_HTML_MANUALS:%=$(outdir)/index.$(ISOLANG).html) -BIG_PAGE_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html) +BIG_PAGE_HTML_FILES := $(SPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html) DEEP_HTML_FILES := $(NOT_TOPDIR_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html) PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf) diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py index 9c0d90dc2f..de3848537c 100644 --- a/python/auxiliar/postprocess_html.py +++ b/python/auxiliar/postprocess_html.py @@ -102,7 +102,7 @@ def source_links_replace (m, source_val): return 'href="' + os.path.join (source_val, m.group (1)) + '"' # More hardcoding, yay! -splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets|contributor))/') +split_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets|contributor))/') lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"') pictures_re = re.compile ('src="(pictures/.*?)"') @@ -110,11 +110,11 @@ docindex_link_re = re.compile (r'href="index.html"') manuals_page_link_re = re.compile (r'href="((?:\.\./)+)Documentation/web/manuals') ## Windows does not support symlinks. -# This function avoids creating symlinks for splitted HTML manuals +# This function avoids creating symlinks for split HTML manuals # Get rid of symlinks in GNUmakefile.in (local-WWW-post) # this also fixes missing PNGs only present in translated docs def hack_urls (s, prefix, target, is_development_branch): - if splitted_docs_re.match (prefix): + if split_docs_re.match (prefix): s = lily_snippets_re.sub ('\\1="../\\2"', s) s = pictures_re.sub ('src="../\\1"', s) -- 2.39.2