From 6ab412e8cf56ec9ef37ce49fc15886a3289da81a Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 6 Jan 2021 17:05:31 -0700 Subject: [PATCH 1/1] SGE work to get Glossary working + --- common/settings.tex | 4 ---- latex2html-init | 2 +- parts/Advanced.tex | 3 ++- parts/Editing.tex | 2 +- parts/Overlays.tex | 3 ++- parts/Plugins.tex | 5 +++-- parts/Real-World.tex | 9 ++++++++- parts/Recording.tex | 4 ++-- translate_manual | 21 ++++++++++++--------- 9 files changed, 31 insertions(+), 22 deletions(-) diff --git a/common/settings.tex b/common/settings.tex index c95c3d4..63baf04 100644 --- a/common/settings.tex +++ b/common/settings.tex @@ -147,10 +147,6 @@ \renewcommand{\nomname}{Glossary} % glossary name -% \nameref emulation for LaTeX2HTML -\begin{htmlonly} -\renewcommand{\nameref}[1]{\ref{#1}} -\end{htmlonly} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Define the Cinnelerra-GG wordmark - a rough draft that can be diff --git a/latex2html-init b/latex2html-init index 7179ab8..6300ef9 100644 --- a/latex2html-init +++ b/latex2html-init @@ -28,7 +28,7 @@ $NO_SUBDIR = 0; # Supply your own string if you don't like the default #$ADDRESS = "$address_data[0]
\n$address_data[1]"; -$ADDRESS = "The CINELERRA-GG Community, 2020
https://www.cinelerra-gg.org"; +$ADDRESS = "The CINELERRA-GG Community, 2021
https://www.cinelerra-gg.org"; $NO_NAVIGATION = 0; # 1 = do not put a navigation panel at the top of each page diff --git a/parts/Advanced.tex b/parts/Advanced.tex index 50baadf..87eecea 100644 --- a/parts/Advanced.tex +++ b/parts/Advanced.tex @@ -859,7 +859,8 @@ Repeat steps 2 through 7 for each of the mixer viewers you need going down the p Sometimes the association does not stick initially. If not, highlight the mixer viewer with the problem, change the mixer arrows to point up, and reassociate. -\section{Audio/Video sync via Waveforms/Timecodes}% +% For html, make sure using below is different from via in subsection +\section{Audio/Video sync using Waveforms/Timecodes}% \label{sec:audio_video_sync} \index{audio/video sync} diff --git a/parts/Editing.tex b/parts/Editing.tex index a8dc415..00e4a45 100644 --- a/parts/Editing.tex +++ b/parts/Editing.tex @@ -1154,7 +1154,7 @@ If using certain operating systems (for example Ubuntu and Arch) that might fiel \item Release the Alt key \end{enumerate} -\section{Inter-View Mode\;/\;Identifying Source Targets}% +\section{Inter-View Mode -- Identifying Source Targets}% \label{sec:inter-view_identifying_source_target} \index{inter-view} diff --git a/parts/Overlays.tex b/parts/Overlays.tex index aee54c1..34b202f 100644 --- a/parts/Overlays.tex +++ b/parts/Overlays.tex @@ -138,7 +138,8 @@ The previous math forms are the only truly accurate description of each blending Note: the Graphic Art group operates principally on color, and the others operate principally on alpha. -\subsection*{Normal}% +% Leave the word Group in due to latex2html dual name conflict +\subsection*{Normal Group}% \label{sub:normal2} \index{overlays!normal} diff --git a/parts/Plugins.tex b/parts/Plugins.tex index e0c069a..73bdfa9 100644 --- a/parts/Plugins.tex +++ b/parts/Plugins.tex @@ -638,7 +638,7 @@ Live audio has been most reliable when ALSA is the recording driver and the play Loop some number of samples of audio over and over. -\subsection{Overlay}% +\subsection{Overlay (Audio)}% \label{sub: overlay} \index{overlay audio} @@ -2456,7 +2456,8 @@ Uses X/Y camera automation vectors to apply a linear blur trailing camera direct This effect makes video tracks appears as a painting. It can be controlled by \textit{Radius} slider and \textit{intensity of colors} can be chosen as an option. -\subsection{Overlay}% +% Leave the Video and Audio parenthesis due to latex2html dual conflict +\subsection{Overlay (Video)}% \label{sub:overlay} \index{overlay video} diff --git a/parts/Real-World.tex b/parts/Real-World.tex index 50eff95..8102ce4 100644 --- a/parts/Real-World.tex +++ b/parts/Real-World.tex @@ -176,7 +176,14 @@ More on the multi-cam can be found in section \nameref{sec:multicamera_mixer} Let's take the case of a professional magician filmed in multicam while performing. Camera 1 records the magician's face; camera 2 the whole person and camera 3 the detail of the hands. There is also an external audio recorder to record the artist's voice in mono. So we will have three video tracks with their respective embedded audio tracks, plus an external audio track of good quality. -You can find the files to test the workflow that is described next at the following address: \small{\url{https://cinelerra-gg.org/download/testing/cinelerra-forum.zip}} +You can find the files to test the workflow that is described next at the following address: +%begin{latexonly} +\small{\url{https://cinelerra-gg.org/download/testing/cinelerra-forum.zip}} +%end{latexonly} +\begin{htmlonly} +\url{https://cinelerra-gg.org/download/testing/cinelerra-forum.zip} + +\end{htmlonly} [Media files are licensed under a \href{https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode}{CC 4.0 BY, NC, SA license}.] diff --git a/parts/Recording.tex b/parts/Recording.tex index c4ebb94..9d31516 100644 --- a/parts/Recording.tex +++ b/parts/Recording.tex @@ -436,7 +436,7 @@ Figure~\ref{fig:two-monitors04} shows 2 monitors with Compositor window on the 2 \label{sub:remote_control_dvb} \index{capture!remote control for DVB} -\CGG{} DVB recording/playback can now easily be done in \textit{couch potato} mode using a remote control. This comes in handy when you want to playback on a big TV screen for multiple person viewing. You can use the Application/Menu key on the keyboard to toggle between standard \CGG{} usage or a Dispatcher methodology through use of a remote control, an Android programmed device such as a tablet, or keyboard. The Application/Menu key on most keyboards is between the Alt and Ctrl keys on the right hand side bottom and depicts a menu on it either with or without a pointer (see image below). An ati-x10 Remote Control device (figure~\ref{fig:remote01}) is currently working with \CGG{} and other remote controls may work but have never been tried. The red/orange box on the top left main screen of \CGG{} indicates Dispatcher Method access is activated which allows for keyboard grab which routes all key strokes until toggled off. Below are the currently defined operations. +\CGG{} DVB recording/playback can now easily be done in \textit{couch potato} mode using a remote control. This comes in handy when you want to playback on a big TV screen for multiple person viewing. You can use the Application/Menu key on the keyboard to toggle between standard \CGG{} usage or a Dispatcher methodology through use of a remote control, an Android programmed device such as a tablet, or keyboard. The Application/Menu key on most keyboards is between the Alt and Ctrl keys on the right hand side bottom and depicts a menu on it either with or without a pointer (see image below). THe Menu key is keycode 135. An ati-x10 Remote Control device (figure~\ref{fig:remote01}) is currently working with \CGG{} and other remote controls may work but have never been tried. The red box on the top left main screen of \CGG{} indicates Dispatcher Method access is activated which allows for keyboard grab which routes all key strokes until toggled off. Below are the currently defined operations. \begin{figure}[htpb] \centering @@ -536,7 +536,7 @@ is used to get into remote control mode, even if there is no remote control hard \item After you install the new phone/tablet app in step 1, start it up from your apps menu. \end{enumerate} -Before you can use it, the Android device must have the ip address of your computer entered into the configuration menu. The PC you are running \CGG{} on and the Android device have to be on the same network. You can tell it is in communication by tapping the \texttt{Power} (menu) button. When the remote is operated with the \textit{Power} (menu) button, there is a little orange box on the upper left corner of the display to indicate the remote state is active. If you do not see the little orange box when the menu key is tapped, the communication is broken and must be fixed before proceeding. Follow the directions in the paragraph below. +Before you can use it, the Android device must have the ip address of your computer entered into the configuration menu. The PC you are running \CGG{} on and the Android device have to be on the same network. You can tell it is in communication by tapping the \texttt{Power} (menu) button. When the remote is operated with the \textit{Power} (menu) button, there is a little red box on the upper left corner of the display to indicate the remote state is active. If you do not see the little red box when the menu key is tapped, the communication is broken and must be fixed before proceeding. Follow the directions in the paragraph below. BIG NOTICE: the firewalls in your computer and wifi router can stop this thing dead. Re-configuring a firewall is tricky and varies from distro to distro. If possible, during setup it is suggested that you disable the firewall temporarily. For those with advanced skills, use tcpdump or wireshark to look for udp messages from the IP address of the device. diff --git a/translate_manual b/translate_manual index 5d8b4a1..055e2f0 100755 --- a/translate_manual +++ b/translate_manual @@ -3,9 +3,12 @@ # First build PDF version, 3 times to be completely sure. # The various auxiliary files will be needed later. -pdflatex CinelerraGG_Manual -pdflatex CinelerraGG_Manual -pdflatex CinelerraGG_Manual +pdflatex CinelerraGG_Manual.tex +makeindex CinelerraGG_Manual.idx +makeindex CinelerraGG_Manual.nlo -s nomencl.ist -o CinelerraGG_Manual.nls +pdflatex CinelerraGG_Manual.tex +makeindex CinelerraGG_Manual.idx +pdflatex CinelerraGG_Manual.tex # Now build HTML version, using auxiliary files created by pdflatex. @@ -13,18 +16,18 @@ pdflatex CinelerraGG_Manual rm -rf CinelerraGG_Manual # latex2html does not know documentclass memoir. It does work nevertheless -# but produces slightly better results if we temporarily switch to book. -mv -f CinelerraGG_Manual.tex CinelerraGG_tmp.tex -sed -e 's/{memoir}/{book}/' CinelerraGG_Manual.tex +# but may produce slightly better results if we temporarily switch to book. +#mv -f CinelerraGG_Manual.tex CinelerraGG_tmp.tex +#sed -e 's/{memoir}/{book}/' CinelerraGG_Manual.tex # translate document -#latex2html -html_version 4.0,math -use_pdftex -nouse_dvipng -image_type gif -nofootnode -split +3 -link 3 -bottom_navigation -local_icons -t 'Cinelerra-GG Infinity' CinelerraGG_Manual.tex +#latex2html -html_version 4.0,math -use_pdftex -nouse_dvipng -image_type gif -nofootnode -numbered_footnotes -split +3 -link 3 -bottom_navigation -local_icons -t 'Cinelerra-GG Infinity' CinelerraGG_Manual.tex # another alternative options combination -latex2html -html_version 4.0,math -use_pdftex -use_dvipng -image_type png -nofootnode -split +3 -link 3 -bottom_navigation -local_icons -t 'Cinelerra-GG Infinity' CinelerraGG_Manual.tex +latex2html -html_version 4.0,math -use_pdftex -use_dvipng -image_type png -nofootnode -numbered_footnotes -cut_ref_name -split +3 -link 3 -bottom_navigation -local_icons -t 'Cinelerra-GG Infinity' CinelerraGG_Manual.tex # revert back to the original documentclass -mv -f CinelerraGG_tmp.tex CinelerraGG_Manual.tex +#mv -f CinelerraGG_tmp.tex CinelerraGG_Manual.tex # this single image has to be copied explicitly cp images/cin-big.png CinelerraGG_Manual -- 2.26.2