summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-21 00:27:30 +0000
committerKarl Berry <karl@freefriends.org>2017-02-21 00:27:30 +0000
commit2f9e984bb3ef9f5eec3cf91d020412f4bcf4a317 (patch)
treec0a24f6d81471c134f529b6715f6811b89ec002c
parentae587df3cc017af8deb1f84ce2a249b537c376ab (diff)
cjhebrew (20feb17)
git-svn-id: svn://tug.org/texlive/trunk@43276 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cjhebrew/manual.pdfbin114357 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjhebrew/README4
-rw-r--r--Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.pdfbin0 -> 108443 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.tex318
-rw-r--r--Master/texmf-dist/doc/latex/cjhebrew/cjhebtst.tex (renamed from Master/texmf-dist/doc/fonts/cjhebrew/cjhebtst.tex)0
-rw-r--r--Master/texmf-dist/tex/latex/cjhebrew/cjhebrew.sty63
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
7 files changed, 368 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/fonts/cjhebrew/manual.pdf b/Master/texmf-dist/doc/fonts/cjhebrew/manual.pdf
deleted file mode 100644
index 29fd5b3c9b7..00000000000
--- a/Master/texmf-dist/doc/fonts/cjhebrew/manual.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjhebrew/README b/Master/texmf-dist/doc/latex/cjhebrew/README
new file mode 100644
index 00000000000..a461dc7bf7d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjhebrew/README
@@ -0,0 +1,4 @@
+cjhebrew is a small package for typesetting Hebrew text. It provides
+Type1 fonts containing the Hebrew consonants, Hebrew vowels and a few
+accents. It is meant to be used by people who want to insert short
+Hebrew texts into a non-Hebrew document. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.pdf b/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.pdf
new file mode 100644
index 00000000000..15907e12d20
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.tex b/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.tex
new file mode 100644
index 00000000000..3b6d1bc07b1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjhebrew/cjhebrew.tex
@@ -0,0 +1,318 @@
+% This file is part of the cjhebrew package
+%
+% cjhebrew is subject to the LaTeX Project Public License (LPPL).
+% A copy of the LPPL can be found in lppl.txt.
+% For the most recent version of this license have a look at
+%
+% http://www.latex-project.org/lppl.txt
+%
+\documentclass[a4paper,10pt]{article}
+\usepackage[english]{babel}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{cjhebrew}
+\usepackage{mathpazo}
+\usepackage[scaled=0.9]{helvet}
+\usepackage[scaled=0.8]{luximono}
+\usepackage[%
+ pdfauthor={Christian Justen},
+ pdftitle={The CJHebrew manual},
+ pdfborder={0 0 0},
+ bookmarksnumbered=true,
+ pdfpagemode=None,
+ pdfstartview=FitH,
+ ]%
+ {hyperref}
+\usepackage{booktabs}
+
+\frenchspacing
+
+\def\cjh{\textsf{cjhebrew}}
+
+\def\cjhp{\texttt{cjhebrew}}
+
+\def\!#1!{\texttt{#1}}
+
+\newcommand{\bs}{\textbackslash}
+
+\def\showmacro#1{\marginpar{\texttt{{\bs}#1}}}
+
+\def\showother#1{\marginpar{\texttt{#1}}}
+
+\def\cjhebversion{0.2}
+
+\def\hinweis#1{\mbox{}\marginpar{\textsf{#1}}}
+
+\def\command#1{\medskip\par\texttt{#1}\medskip\par}
+
+\newcommand{\eTeX}{$\varepsilon$-\TeX}
+\newcommand{\eLaTeX}{$\varepsilon$-\LaTeX}
+
+\begin{document}
+
+\title{\cjh%
+ \footnote{\cjh\ is subject to the \textit{\LaTeX\ Project Public
+ License}. The most recent version of this license can be found at
+ \href{http://www.latex-project.org/lppl.txt}{\!www.latex-project.org/lppl.txt!}.}%
+}
+
+\author{Christian Justen\\
+\href{mailto:mail@christian-justen.de}{{\small\!mail@christian-justen.de!}}}
+
+\date{February 19\textsuperscript{th}, 2017 -- Version \cjhebversion}
+
+\maketitle
+
+
+\section{Overview}
+
+\cjh\ is a package which allows the typesetting of Hebrew text in
+\LaTeX\ documents. Hebrew text can be vocalised, also a few
+accents are available. \cjh\ makes it easy to insert Hebrew words,
+sentences or paragraphs into non-Hebrew text; so \cjh\ is quite
+appropriate e.\,g. for theological papers.
+
+When running \LaTeX, \cjh\ uses the extensions of \eTeX\ in order to
+typeset Hebrew text from right to left. Most modern \TeX\ systems use
+\eLaTeX\ by default when you run \LaTeX, so there should be nothing
+special you have to do (unless, of course, you fiddled with your
+system). This version of \cjh\ can also be used with lua\LaTeX.
+
+
+\section{Installation}
+
+\cjh\ is part of most modern \TeX\ distributions. Please, use your
+distribution's package manager to install \cjh. If no package manager
+is available, then have a look at your distribution's documentation,
+as it should tell you how to install packages manually.
+
+
+
+\section{Usage}
+
+To use \cjh\ simply put \verb!\usepackage{cjhebrew}! in the
+preamble of your document.
+
+\cjh\ provides the text font command
+\showmacro{textcjheb}\verb!\textcjheb! which switches to the hebrew
+font, but does not change the direction of typesetting. Thus, if you
+type \verb+\textcjheb{'bgd}+, the result will be \textcjheb{'bgd},
+which is in most cases not what you want. Instead you will normally
+use the command \showmacro{cjRL}\verb+\cjRL+, that also switches to
+the right direction of typesetting. The input \verb+\cjRL{'bgd}+ will
+have as result the ouput \cjRL{'bgd}. There is also an even shorter
+form: \showmacro{<>}\verb+\<>+; so, you can type \verb+\<'bgd>+
+instead of \verb+\cjRL{'bgd}+.
+
+If you want to typeset a complete passage of Hebrew text, you
+ought to use the \showother{cjhebrew}\!cjhebrew! environment.
+
+Finally, \cjh\ provides also the \verb+\cjLR+\showmacro{cjLR}
+command, which switches (inside a Hebrew piece of text) back to
+the ``normal'' direction of typesetting. Be careful: this command
+does not switch to a non-Hebrew font!
+
+\subsection{The consonants}
+
+\begin{table}
+
+\centering
+
+\begin{tabular}{ccccccccccccccc}
+
+\toprule\midrule
+
+\<'> & \<b> & \<g> & \<d> & \<h> & \<w> & \<z> & \<.h> &
+\<.t> & \<y> & \<k|> & \<k> & \<l> & \<m|> & \<m>\\
+
+\!'! & \!b! & \!g! & \!d! & \!h! & \!w! & \!z! & \!.h! & \!.t! &
+\!y! & \!k! & \!K! & \!l! & \!m! & \!M!\\
+
+\midrule
+
+\<n|> & \<n> & \<s> & \<`> & \<p|> & \<p> & \<.s|> & \<.s> & \<q>
+& \<r> & \</s>
+& \<,s> & \<+s> & \<t> &\\
+
+\!n! & \!N! & \!s! & \!`! & \!p! & \!P! & \!.s! & \!.S! & \!q! &
+\!r! & \!/s!
+& \!,s! & \!+s! & \!t! &\\
+
+\midrule\bottomrule
+
+\end{tabular}
+
+\medskip
+
+\textit{Note: \!'!~= semicolon, \!`!~= grave accent}
+
+\caption{Coding of the consonants}
+
+\label{coding:consonants}
+
+\end{table}
+
+How the Hebrew consonants are coded in your input file, is shown
+in table~\ref{coding:consonants}. Normally the final letters are
+used automatically; \verb+\<mlk>+ will become \<mlk>. Sometimes it
+is necessary to use final letters in places where they will not be
+set automatically, e.\,g. in the middle of a word. To do this you
+either use the coding according to table~\ref{coding:consonants}
+or you put an exclamation mark (\showother{!}\verb+!+) after the
+consonant; alternatively you can use the
+\showmacro{endofword}\verb+\endofword+ command. For example, a
+\textit{final mem} could be achieved by typing \verb+\<M>+,
+\verb+\<m!>+ or \verb+\<m\endofword>+.
+
+On the other hand, sometimes you will not want this automatic
+replacement. In these cases you put \showother{|}\!|! after the
+consonant or use the \showmacro{zeronojoin}\verb+\zeronojoin+
+command. Both \verb+\<m|>+ and \verb+\<m\zeronojoin>+ will give
+you a normal \textit{mem}.
+
+\subsection{The vowels}
+
+\begin{table}
+
+\def\dc{\verb+\dottedcircle+}
+
+\centering
+
+\begin{tabular}{ccccccccccccccc}
+
+\toprule\midrule
+
+\<\dottedcircle i> & \<\dottedcircle e> & \<\dottedcircle E> &
+\<\dottedcircle E:> & \<\dottedcircle a> & \</a\dottedcircle> &
+\<\dottedcircle a:> & \<\dottedcircle A> & \<\dottedcircle A:> &
+\<\dottedcircle o> & \<\dottedcircle u> &
+\<\dottedcircle *> & \<\dottedcircle :> & \<O> & \<U>\\
+
+\!i! & \!e! & \!E! & \!E:! & \!a! & \!/a! & \!a:! & \!A! & \!A:! &
+\!o! & \!u! & \!*! & \!:! & \!O! / \!wo! & \!U!
+/ \!w*!\\
+
+\midrule
+
+\<;> & \<--> & \<\dottedcircle> \\
+\!;! & \!-\/-! & \multicolumn{6}{l}{\texttt{\bs dottedcircle}}\\
+
+\midrule\bottomrule
+
+\end{tabular}
+
+\caption{Coding of the vowels, accents and symbols}
+
+\label{coding:vowels}
+
+\end{table}
+
+How to code the vowels in your input file is shown in
+table~\ref{coding:vowels}. The vowels have to be typed
+\textit{after} the consonant they belong to (for example
+\<'E:lohiym> is coded as \verb+\<'E:lohiym>+). The only exception
+is the \textit{pata\d{h} furtivum} as in \<rU/a.h>
+(\verb+\<rU/a.h>+). Always use \verb+*+ for \textit{dage\v{s}};
+\cjh\ does not distinguish between \textit{dage\v{s} lene} and
+\textit{dage\v{s} forte}. The \textit{dage\v{s}} has to follow its
+consonant \textit{immediately} (\verb+\<b*:>+ becomes \<b*:>),
+otherwise you will get a wrong result (\verb+\<b:*>+ becomes
+\<b:*>).
+
+\subsection{More accents and symbols}
+
+There are some more accents and symbols available, as shown in
+table~\ref{coding:vowels}. I hope to add some more in the future.
+
+
+\section{An example}
+
+Here is the beginning of the Bible:
+
+\bigskip
+
+\begin{cjhebrew}
+
+b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s;
+w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al--p*:ney t:hOm
+w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney ham*Ayim;
+
+\end{cjhebrew}
+
+\bigskip
+
+\bgroup
+
+\raggedright
+
+\verb+\begin{cjhebrew}+
+
+\!b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s;
+w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al-\/-p*:ney t:hOm
+w:rU/a.h 'E:lohiym m:ra.hEpEt `al-\/-p*:ney ham*Ayim;!
+
+\verb+\end{cjhebrew}+
+
+\egroup
+
+\section{What is new in this version?}
+
+\subsection*{v 0.2}
+
+\begin{enumerate}
+\item \cjh\ can now be used with lua\LaTeX. The neccessary code was
+ provided by Axel Kielhorn.
+\end{enumerate}
+
+\subsection*{v 0.1a}
+
+\begin{enumerate}
+
+ \item A typo in \!cjhebrew.sty! was corrected. It would cause
+ trouble if you used a Hebrew font in 7pt size or smaller.
+
+\end{enumerate}
+
+
+\subsection*{v 0.1}
+
+\begin{enumerate}
+
+ \item You can use \cjh\ now, even if \eLaTeX\ is not available
+ (but the Hebrew text will be typeset in the ``wrong''
+ direction, i.\,e. from left to right).%
+ \footnote{This feature was suggested by Malte
+ Rosenau.}
+
+ \item The documentation was rewritten. Instead of a German and
+ an English documentation there is now only this English
+ manual.
+
+ \item Some bugs in \!cjhebrew.sty! are fixed.\footnote{Thanks to Walter Schmidt.}
+
+ \item A problem with the letter ``qof'' is fixed (\<q|A:q|E:q|a:>
+ does not look \textit{that} good \ldots\ \<qA:qE:qa:> is much better).
+
+ \item There are also some changes regarding the font names and
+ the encoding. If you use an older version of
+ \cjh\ make sure that all old files are removed before you
+ install the new version!
+
+\end{enumerate}
+
+Probably, some new bugs have crept into any new version. Please do
+report them as you discover them!
+
+
+\section{Finally}
+
+The version number of \cjh\ is \cjhebversion, it is far from being
+finished. Especially the fonts still need a lot of work; many
+letters look rather imperfect. If you have any ideas how to
+improve \cjh, please do send me an email.
+
+\end{document}
+
+% Local Variables:
+% coding: utf-8-unix
+% End: \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/cjhebrew/cjhebtst.tex b/Master/texmf-dist/doc/latex/cjhebrew/cjhebtst.tex
index f65130691ef..f65130691ef 100644
--- a/Master/texmf-dist/doc/fonts/cjhebrew/cjhebtst.tex
+++ b/Master/texmf-dist/doc/latex/cjhebrew/cjhebtst.tex
diff --git a/Master/texmf-dist/tex/latex/cjhebrew/cjhebrew.sty b/Master/texmf-dist/tex/latex/cjhebrew/cjhebrew.sty
index cf4058d5513..887d37f4169 100644
--- a/Master/texmf-dist/tex/latex/cjhebrew/cjhebrew.sty
+++ b/Master/texmf-dist/tex/latex/cjhebrew/cjhebrew.sty
@@ -6,9 +6,11 @@
%
% http://www.latex-project.org/lppl.txt
%
+% Contains code provided by Axel Kielhorn (from lfgwluabidi.sty)
-\ProvidesPackage{cjhebrew}
- [2004/08/27 v. 0.1a cjhebrew Hebrew Typesetting System]
+\ProvidesPackage{xcjhebrew}
+ [2017/02/19 v. 0.2 cjhebrew Hebrew Typesetting System]
+\RequirePackage{ifluatex}
\DeclareFontFamily{U}{cjheb}{}
@@ -27,20 +29,47 @@
\chardef\zeronojoin=124
\chardef\dottedcircle=203
-\@ifundefined{eTeXrevision}%
- {%
- \PackageWarningNoLine{cjhebrew}{\MessageBreak
- Hebrew text will be typeset from left to right!\MessageBreak
- You really should use e-TeX}
- \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup}
- \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup}
- \newenvironment{cjhebrew}{\cjhebfamily}{}
- }%
- {%
- \TeXXeTstate=1
- \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup}
- \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup}
- \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{}
- }
+\ifluatex
+ \RequirePackage{luabidi}
+
+ % The following lines patch luabidi.sty. As soon as luabidi.sty
+ % itself is patched, these lines can and should be removed.
+ \def\setRTLmain{\pagedir TRT \bodydir TRT \pardir TRT \textdir TRT}
+ \def\setRTL{\@RTLtrue\pardir TRT \textdir TRT}
+ \let\setRL=\setRTL
+ \def\setLTR{\@RTLfalse\pardir TLT \textdir TLT}
+ \let\setLR=\setLTR
+ \let\unsetRTL=\setLTR
+ \let\unsetLTR=\setRTL
+ \def\RTL{\@RTLtrue\trivlist \pardir TRT \textdir TRT\item\relax}
+ \def\LTR{\trivlist \pardir TLT \textdir TLT\item\relax}
+ \def\Footnote#1{%
+ \begingroup
+ \footnotemark
+ \renewcommand{\thefootnote}{\@arabic\c@footnote}%
+ \pardir TLT \textdir TLT\footnotetext{#1}%
+ \endgroup
+ }
+
+ \newcommand{\cjRL}[1]{\RLE{\textcjheb{#1\endofword}}}
+ \newcommand{\cjLR}[1]{\LRE{\textcjheb{\endofword#1}}}
+ \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\setRTL}{\unsetRTL}
+\else
+ \@ifundefined{eTeXrevision}%
+ {%
+ \PackageWarningNoLine{cjhebrew}{\MessageBreak
+ Hebrew text will be typeset from left to right!\MessageBreak
+ You really should use e-TeX}
+ \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup}
+ \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup}
+ \newenvironment{cjhebrew}{\cjhebfamily}{}
+ }%
+ {%
+ \TeXXeTstate=1
+ \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup}
+ \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup}
+ \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{}
+ }
+\fi
\def\<#1>{\cjRL{#1}}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d89eabb27d1..fd28403e4d4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -242,7 +242,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'circuitikz', "&MAKEcopy",
'cirth', "die 'skipping, nosell license'",
'citeref', "die 'skipping, noinfo license, lots of authors'",
- 'cjhebrew', "&MAKEflatten",
'cjk', "&MAKEcjk",
'cjw', "die 'skipping, nosell license'",
'clarendo', "die 'skipping, nonfree font'",