resolve merge

[lilypond.git] / Documentation / user / latex-example.latex

diff --git a/Documentation/user/latex-example.latex b/Documentation/user/latex-example.latex
deleted file mode 100644 (file)
index da9c12b..0000000
--- a/Documentation/user/latex-example.latex
+++ /dev/null
@@ -1,46 +0,0 @@
-\documentclass[a4paper]{article}
-
-%\def\preLilyPondExample{}}
-%\def\postLilyPondExample{}
-
-
-\begin{document}
-
-\begin{lilypond}
-\relative { c' d e f g a b c }
-\end{lilypond}
-
-
-\begin[fragment]{lilypond}
-c d e
-\end{lilypond}
-
-
-% show interaction of margins lilypond+verses
-
-% outdated
-% generate standard lilypond titles
-\input titledefs.tex
-\def\preLilyPondExample{\def\mustmakelilypondtitle{}}
-
-\begin{lilypond}
-\header {
-  title =      "Title"
-  subtitle =   "Subtitle"
-  subsubtitle =        "Subsubtitle"
-  opus =  "Opus 1"
-  piece = "Piece"
-  composer =    "Composer"
-  enteredby =   "JCN"
-  instrument = "instrument"
-}
-\layout { linewidth = -1. }
-\relative c'' { a b c d }
-\end{lilypond}
-
-\begin{enumerate}
-\item Vers one.  aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa
-\item Vers two.  bbb bbb bbb bbb bbb bbb bbb bbb bbb bbb
-\end{enumerate}
-
-\end{document}