From 19bfa3712a53763b3d99b143d7d5b9012f0f71c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= <maieul@maieul.net>
Date: Tue, 22 Jan 2019 13:41:42 +0100
Subject: [PATCH] changelog, fix #791

---
 doc-include/migrate-mac.dtx |  4 ++++
 issue791.tex                | 19 -------------------
 reledmac.dtx                |  1 +
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 issue791.tex

diff --git a/doc-include/migrate-mac.dtx b/doc-include/migrate-mac.dtx
index cc932d7b..0b9df667 100644
--- a/doc-include/migrate-mac.dtx
+++ b/doc-include/migrate-mac.dtx
@@ -432,3 +432,7 @@ xx\hidenumbering\ xx
 \end{verbatim}
 
 To get the space after \verb+xx+.
+
+\subsection{Migration to \reledmac 2.30.0}
+
+If you have multiple annotations for the same line, there are now separated with a comma in the margin. You can use \cs{setlinenumannotationsep} to change the separator.
diff --git a/issue791.tex b/issue791.tex
deleted file mode 100644
index dcd87d26..00000000
--- a/issue791.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-
-\documentclass{article}
-\usepackage[total={3in, 4in}]{geometry}
-\usepackage[noresetlinenumannotation]{reledmac}
-\newcommand{\bv}[1]{\linenumannotation{#1}}
-\makeatletter
-\Xwraplinenumannotation{\@firstofone}
-\renewcommand{\linenumrep}[1]{}
-\makeatother
-\firstlinenum{1}
-\linenumincrement{1}
-\setlinenumannotationsep{+}
-\begin{document}
-  \beginnumbering
-  \pstart
-    \bv{1}Initium evangelii Iesu Christi, Dei filii.\bv{2} Ut scriptum in vatibus est: “Ego tibi meum praemittam nuntium, qui tibi viam praeparet.\bv{3} Vox clamantis in solitudine: ‘Parate viam Domini! Dirigite semitas eius!’”
-  \pend
-  \endnumbering
-\end{document}
diff --git a/reledmac.dtx b/reledmac.dtx
index d55a22ce..dfcbcc55 100644
--- a/reledmac.dtx
+++ b/reledmac.dtx
@@ -522,6 +522,7 @@
 % \changes{v2.29.0}{2019/01/08}{Really reset line number annotation at each line}
 % \changes{v2.29.0}{2018/01/08}{Add \protect\option{noresetlinenumannotation}}
 % \changes{v2.29.0}{2018/01/08}{Fix little bug with \protect\cs{msdata}}
+% \changes{v2.30.0}{2019/01/22}{Add separator between line number annotations in margin. Add \protect\cs{setlinenumannotationsep}}
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
 %